October 2008 - kune-commits - lists.ourproject.org

21 Oct '08

Author: vjrj Date: 2008-10-21 21:26:47 +0200 (Tue, 21 Oct 2008) New Revision: 917 Added: trunk/img/entitylogo.svg trunk/src/main/java/gwt-module.dtd trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/AbstractUploader.java trunk/src/main/java/org/ourproject/kune/platf/client/utils/Url.java trunk/src/main/java/org/ourproject/kune/platf/client/utils/UrlParam.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/ 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/FileDownloadManagerAbstract.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/FileManagerDefault.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/file/ImageUtilsDefault.java trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelector.java trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelectorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelectorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelectorView.java trunk/src/test/java/org/ourproject/kune/platf/client/utils/ trunk/src/test/java/org/ourproject/kune/platf/client/utils/UrlTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUtilsTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/ImageUtilsDefaultTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/orig.gif trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/orig.jpg trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/orig.png trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/orig.tiff Removed: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUtils.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUtilsTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.gif trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.jpg trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.png trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.tiff Modified: trunk/dev-utils/kune.formatter.eclipse.preferences.xml trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java trunk/src/main/java/org/ourproject/kune/app/server/AbstractExtendedModule.java trunk/src/main/java/org/ourproject/kune/app/server/KuneContainerListener.java trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java trunk/src/main/java/org/ourproject/kune/chat/Kune-Chat.gwt.xml trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatContentPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/RoomViewPanel.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/info/ui/ChatInfoPanel.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ChatRoomControlPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ChatRoomPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ui/ChatRoomControlPanel.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ui/ChatRoomPanel.java trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/ctx/rooms/RoomsAdmin.java trunk/src/main/java/org/ourproject/kune/chat/client/ctx/rooms/RoomsAdminPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ui/TempPanel.java trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerModule.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatException.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppConnection.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppRoom.java trunk/src/main/java/org/ourproject/kune/docs/Kune-Docs.gwt.xml trunk/src/main/java/org/ourproject/kune/docs/client/Document.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/DocumentContentPanel.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/folder/viewer/FolderViewerPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderView.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/ui/DocumentReaderPanel.java trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContext.java trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPanel.java trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/AdminContextPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/ui/AdminContextPanel.java trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerModule.java trunk/src/main/java/org/ourproject/kune/platf/Kune-Platform.gwt.xml 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/ActionManager.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.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/ActionToolbarMenuDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ContentIconsRegistry.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/DragDropContentRegistry.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationComponentGroup.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/app/ToolGroup.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessListsDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/ChatUserParamsDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContainerDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContainerSimpleDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContentSimpleDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/LicenseDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/ParticipationDataDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/RoomDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkResultDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateToken.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagResultDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserSimpleDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.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/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/I18nNotFoundException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.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/SiteService.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/services/I18nTranslationService.java trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/services/Images.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java trunk/src/main/java/org/ourproject/kune/platf/client/tool/AbstractClientTool.java trunk/src/main/java/org/ourproject/kune/platf/client/tool/ClientTool.java trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelector.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractLabel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/DropDownPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/EditableIconLabel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/HasColor.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/HorizontalLine.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/MenuItemCollection.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/QuickTipsHelper.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/RoundedBorderDecorator.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/RoundedPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/SplitterListenerCollection.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/TitledPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/UIConstants.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/UnknowComponent.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultTabbedForm.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/TwoButtonsDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/AbstractFormPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/FormListener.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridButton.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDragConfiguration.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridGroup.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridItem.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/imgchooser/ImageChooser.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/imgchooser/ImageChooserCallback.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/imgchooser/ImageData.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePaletteView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateIt.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/utils/Convert.java trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java trunk/src/main/java/org/ourproject/kune/platf/server/KunePersistenceService.java trunk/src/main/java/org/ourproject/kune/platf/server/LoggerMethodInterceptor.java trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java trunk/src/main/java/org/ourproject/kune/platf/server/access/Access.java trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.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/content/ContainerManagerDefault.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/content/CreationServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/AccessLists.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/BasicMimeType.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/ChatUserParams.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/CustomProperties.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupList.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupListMode.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasId.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nCountry.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nTranslation.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/License.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/Rate.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/SocialNetwork.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/Tag.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/TagResult.java trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/FileManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/Manager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/DefaultManager.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/LicenseManagerDefault.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/ToolConfigurationManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java trunk/src/main/java/org/ourproject/kune/platf/server/properties/ChatProperties.java trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java trunk/src/main/java/org/ourproject/kune/platf/server/properties/KunePropertiesDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/TestJSONService.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/sn/ParticipationData.java trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java trunk/src/main/java/org/ourproject/kune/rack/ContainerListener.java trunk/src/main/java/org/ourproject/kune/rack/Rack.java trunk/src/main/java/org/ourproject/kune/rack/RackBuilder.java trunk/src/main/java/org/ourproject/kune/rack/RackModule.java trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java trunk/src/main/java/org/ourproject/kune/rack/dock/AbstractDock.java trunk/src/main/java/org/ourproject/kune/rack/dock/Dock.java trunk/src/main/java/org/ourproject/kune/rack/dock/RegexMatcher.java trunk/src/main/java/org/ourproject/kune/rack/dock/RequestMatcher.java trunk/src/main/java/org/ourproject/kune/rack/filters/ApplicationListener.java trunk/src/main/java/org/ourproject/kune/rack/filters/InjectedFilter.java trunk/src/main/java/org/ourproject/kune/rack/filters/ListenerFilter.java trunk/src/main/java/org/ourproject/kune/rack/filters/LogFilter.java trunk/src/main/java/org/ourproject/kune/rack/filters/RedirectFilter.java trunk/src/main/java/org/ourproject/kune/rack/filters/gwts/DelegatedRemoteServlet.java trunk/src/main/java/org/ourproject/kune/rack/filters/gwts/GWTServiceFilter.java trunk/src/main/java/org/ourproject/kune/rack/filters/rest/DefaultRESTMethodFinder.java trunk/src/main/java/org/ourproject/kune/rack/filters/rest/JSONLibRESTSerializer.java trunk/src/main/java/org/ourproject/kune/rack/filters/rest/Parameters.java trunk/src/main/java/org/ourproject/kune/rack/filters/rest/ParametersAdapter.java trunk/src/main/java/org/ourproject/kune/rack/filters/rest/REST.java trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTMethod.java trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTMethodFinder.java trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTSerializer.java trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTServiceDefinition.java trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTServicesModule.java trunk/src/main/java/org/ourproject/kune/rack/filters/rest/TransactionalServiceExecutor.java trunk/src/main/java/org/ourproject/kune/rack/filters/rest/XStreamRESTSerializer.java trunk/src/main/java/org/ourproject/kune/workspace/Kune-Workspace.gwt.xml trunk/src/main/java/org/ourproject/kune/workspace/client/component/WorkspaceDeckPanel.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/editor/TextEditorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplIE6.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplMozilla.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplOpera.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplSafari.java trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogo.java trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoView.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nUITranslationService.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/ui/I18nTranslatorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensechoose/LicenseChoosePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensechoose/LicenseChoosePresenter.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/newgroup/NewGroupPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.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/GroupLiveSearcherPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteBottomTrayButton.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcher.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcher.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java trunk/src/main/java/org/ourproject/kune/workspace/client/site/Site.java trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/MessagePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SimpleMessagePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteMessagePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteMessagePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteMessageView.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/sitenewgroup/SiteNewGroupLinkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkView.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/siteoptions/SiteOptionsView.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPresenter.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/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/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/SiteUserMenuPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/AbstractBar.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SimpleToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsTheme.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java trunk/src/main/resources/dozerBeanMapping.xml trunk/src/test/java/org/ourproject/kune/chat/ChatToolTest.java trunk/src/test/java/org/ourproject/kune/docs/DocumentToolTest.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/dto/BasicMimeTypeDTOTest.java trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/client/state/StateTokenTest.java trunk/src/test/java/org/ourproject/kune/platf/client/tool/ToolSelectorPresenterTest.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.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/socialnet/SocialNetworkMembersTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/server/TestDomainHelper.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/domain/GroupListTest.java trunk/src/test/java/org/ourproject/kune/platf/server/finders/GroupFinderTest.java trunk/src/test/java/org/ourproject/kune/platf/server/finders/RateFinderTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.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/platf/server/properties/KunePropertiesTest.java trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTMethodFinder.java trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java trunk/src/test/java/org/ourproject/kune/testhelper/ctx/SocialNetworkOperator.java trunk/src/test/java/org/ourproject/kune/workspace/client/sitebar/msg/SiteMessagePresenterTest.java trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java Log: Incomplete - task EntityLogo revisited Incomplete - task NPE finding a non existent content Modified: trunk/dev-utils/kune.formatter.eclipse.preferences.xml =================================================================== --- trunk/dev-utils/kune.formatter.eclipse.preferences.xml 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/dev-utils/kune.formatter.eclipse.preferences.xml 2008-10-21 19:26:47 UTC (rev 917) @@ -39,7 +39,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="18"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="0"/> @@ -59,7 +59,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="2"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/> Added: trunk/img/entitylogo.svg =================================================================== --- trunk/img/entitylogo.svg 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/img/entitylogo.svg 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,229 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="210mm" + height="297mm" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="entitylogo.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <defs + id="defs4"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 526.18109 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective10" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.5" + inkscape:cx="163.61744" + inkscape:cy="979.47576" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:window-width="1280" + inkscape:window-height="727" + inkscape:window-x="0" + inkscape:window-y="25" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Capa 1" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> + <rect + y="223.25554" + x="41.560001" + height="26.879999" + width="26.879999" + id="rect3738" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#c6e9af;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <flowRoot + xml:space="preserve" + id="flowRoot3193" + style="font-size:48.6047821px;font-style:oblique;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Oblique"><flowRegion + id="flowRegion3195"><rect + id="rect3197" + width="33" + height="1053" + x="-324" + y="-1120.6378" + style="font-style:oblique;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Oblique" /></flowRegion><flowPara + id="flowPara3199"></flowPara></flowRoot> <text + xml:space="preserve" + style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#250000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans" + x="112.83789" + y="170.64734" + id="text3203" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + x="112.83789" + y="170.64734" + id="tspan3207">Bajo el Asfalto está la Huerta</tspan></text> + <text + xml:space="preserve" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#250000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans" + x="73.837891" + y="241.35104" + id="text3215" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan3217" + x="73.837891" + y="241.35104">Bajo el Asfalto está la Huerta</tspan></text> + <rect + y="382.37564" + x="36.013458" + height="56.973083" + width="56.973083" + id="rect3223" + style="opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.02691722;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + y="471.42218" + x="37.060001" + height="26.879999" + width="26.879999" + id="rect3227" + style="opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.12;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <text + sodipodi:linespacing="100%" + id="text3233" + y="418.64734" + x="103.83789" + style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#250000;fill-opacity:0.94117647;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans" + xml:space="preserve"><tspan + id="tspan3237" + y="418.64734" + x="103.83789" + sodipodi:role="line">Asociación La Claqueta</tspan></text> + <text + sodipodi:linespacing="100%" + id="text3239" + y="491.35104" + x="66.837891" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#250000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans" + xml:space="preserve"><tspan + y="491.35104" + x="66.837891" + id="tspan3241" + sodipodi:role="line">Asociación La Claqueta</tspan></text> + <text + sodipodi:linespacing="100%" + id="text3481" + y="565.2157" + x="105.59271" + style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#250000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans" + xml:space="preserve"><tspan + id="tspan3483" + y="565.2157" + x="105.59271" + sodipodi:role="line">Luther Blisset</tspan></text> + <g + id="g4530" + transform="matrix(0.7058824,0,0,0.7058824,-242.43824,296.00256)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person6-85.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + transform="matrix(3.1844753,0,0,3.3202165,614.65933,-434.25909)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path3603" + style="fill:#abc837;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 437.92095,330.6613 C 427.73175,330.6613 417.49371,334.50632 409.72508,342.28206 C 394.30176,357.71958 394.19614,382.65026 409.39336,398.22771 C 407.23073,388.75054 409.98472,378.37855 417.35455,371.00193 C 428.75019,359.59579 447.09171,359.59579 458.48735,371.00193 C 465.85713,378.37855 468.61117,388.75054 466.44854,398.22771 C 481.64581,382.65021 481.54025,357.71958 466.11683,342.28206 C 458.34825,334.50632 448.11016,330.6613 437.92095,330.6613 z" + id="path3605" /> + <path + sodipodi:nodetypes="csssc" + id="path3607" + d="M 460.05116,364.96552 C 455.38897,371.83641 432.14686,380.28156 424.78848,372.95567 C 417.51844,365.71771 417.5378,353.91825 424.78848,346.6609 C 432.03916,339.40354 443.80837,339.40354 451.05905,346.6609 C 458.30973,353.91826 455.3126,357.26255 460.05116,364.96552 z" + style="fill:#ffe680;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:5.30990171;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + <path + id="path2116" + d="M 49.32599,146.74252 C 45.94103,146.74252 45.41828,146.76418 45.26552,146.91694 C 45.10808,147.07438 45.08762,148.4179 45.08762,160.02624 C 45.08762,171.93618 45.10506,172.97507 45.27599,173.14601 C 45.4453,173.31531 45.91361,173.32451 50.60623,173.27508 C 53.43576,173.24527 55.89878,173.18464 56.08297,173.13903 L 56.41785,173.05531 L 56.18762,173.32391 C 55.79378,173.77907 55.56257,174.21561 55.62599,174.38089 C 55.69846,174.56973 56.04438,174.59042 56.21902,174.41577 C 56.28736,174.34742 56.5505,174.31126 56.80506,174.33554 C 57.22839,174.37591 57.26244,174.35813 57.19576,174.15066 C 56.91003,173.26165 57.02113,173.03655 57.78878,172.93322 C 58.93447,172.77899 59.9295,172.08429 60.42948,171.09136 C 60.69437,170.56529 61.05041,169.19103 61.05041,168.69833 C 61.05041,168.43696 61.36697,168.10068 62.26088,167.42158 L 62.59227,167.17391 L 62.60622,169.77973 C 62.6208,172.56453 62.57947,172.83171 62.07599,173.32391 C 61.91106,173.48514 61.68547,173.75037 61.57366,173.91345 C 61.46186,174.07652 61.16047,174.34567 60.9039,174.50996 C 60.25165,174.92762 60.61461,174.97318 61.5632,174.59368 C 61.96867,174.43147 62.32685,174.32477 62.35855,174.35647 C 62.39025,174.38817 62.35894,174.67967 62.28878,175.00531 C 62.21863,175.33095 62.10625,175.86163 62.03762,176.18089 C 61.93198,176.67236 61.94003,176.80142 62.09343,177.03554 C 62.19309,177.18762 62.38983,177.32952 62.52948,177.3495 C 62.88268,177.4 63.0564,176.79773 63.03878,175.59135 C 63.02811,174.85981 63.06519,174.60686 63.20971,174.44717 C 63.31166,174.33452 63.3946,174.13102 63.3946,173.99368 C 63.3946,173.56395 63.60249,173.30996 63.95274,173.30996 C 64.37941,173.30996 64.45506,173.4571 64.45506,174.25879 C 64.45506,174.84463 64.48304,174.9315 64.67832,174.95647 C 65.11957,175.01289 65.23696,174.82858 65.08297,174.31461 C 65.0064,174.05907 64.91459,173.51343 64.88064,173.10415 C 64.8255,172.43929 64.8464,172.33881 65.06204,172.14484 C 65.2721,171.95589 65.36094,171.94259 65.75273,172.04717 C 66.10756,172.14187 66.21422,172.13827 66.25855,172.02275 C 66.33715,171.81792 65.91685,171.28029 65.33413,170.84368 C 64.60957,170.30079 64.48733,169.78966 64.58413,167.73903 C 64.65825,166.16889 64.66542,166.12544 64.9853,165.76112 C 65.38064,165.31086 65.72872,165.2074 67.60157,164.99019 C 68.3884,164.89893 69.40338,164.7153 69.85506,164.58205 C 70.45167,164.40605 70.72647,164.37298 70.85971,164.45647 C 71.1583,164.64357 71.14149,164.9955 70.82483,165.20298 C 70.55013,165.38297 70.43205,165.71926 70.64343,165.71926 C 70.70013,165.71926 70.98896,165.53453 71.2853,165.30763 C 71.84591,164.87837 72.43203,164.61835 72.85157,164.60996 C 73.22853,164.60242 73.62855,165.04758 73.76553,165.62856 C 74.12941,167.17195 73.55954,168.58125 71.89227,170.26112 C 71.09603,171.06338 70.95157,171.30066 71.26437,171.30066 C 71.49674,171.30066 71.4732,171.62357 71.20855,172.05763 C 70.92243,172.52691 70.92898,172.57679 71.27483,172.73438 C 71.52064,172.84637 71.55661,172.92661 71.52599,173.28205 C 71.49847,173.60149 71.53467,173.70765 71.67948,173.73554 C 71.8847,173.77506 71.87301,173.81116 72.10506,171.97043 C 72.24784,170.83787 72.54553,170.0508 72.92832,169.78322 C 74.04639,169.00162 74.71196,168.79287 75.2132,169.06112 C 75.43086,169.17761 75.45041,169.27986 75.45041,170.18786 C 75.45041,171.31935 75.2616,171.95273 74.68995,172.74136 C 74.26274,173.3307 74.25313,173.42159 74.60622,173.42159 C 74.81989,173.42159 74.90595,173.50943 75.01437,173.84019 C 75.17575,174.33255 75.43653,174.76112 75.57599,174.76112 C 75.63033,174.76112 75.67367,174.59177 75.67367,174.38438 C 75.67367,174.12253 75.74795,173.95766 75.91436,173.84717 C 76.11662,173.71287 76.16713,173.53821 76.23181,172.72391 C 76.30595,171.79037 76.44934,171.41229 76.73064,171.41229 C 76.94257,171.41229 77.57134,172.46991 77.57134,172.82508 C 77.57134,173.00109 77.6305,173.31874 77.70041,173.53322 C 77.77032,173.74769 77.85823,174.42624 77.89576,175.04019 L 77.96204,176.15647 L 78.58994,176.13554 L 79.21786,176.11461 L 79.39227,176.55414 C 79.5079,176.84849 79.63184,176.99368 79.7725,176.99368 C 79.88795,176.99368 80.04418,177.05605 80.11785,177.12973 C 80.21859,177.23046 80.2832,177.22949 80.37948,177.13322 C 80.47576,177.03694 80.39049,176.80444 80.03065,176.19135 C 79.76747,175.74298 79.46289,175.24483 79.3539,175.08554 C 79.1896,174.84543 79.15655,174.56872 79.16553,173.46693 C 79.17148,172.736 79.10885,171.62236 79.02599,170.99019 C 78.88638,169.92503 78.89016,169.82686 79.07134,169.65065 C 79.25628,169.4708 79.29528,169.49133 79.81436,170.06578 L 80.36204,170.67275 L 80.36204,171.81694 C 80.36203,173.21004 80.42815,173.30996 81.34925,173.30996 L 81.98762,173.30996 L 82.20739,173.78438 C 82.48555,174.38322 82.71802,174.39285 82.88064,173.81229 L 83.00623,173.36577 L 85.09228,173.30996 C 86.7832,173.26475 87.2009,173.22234 87.28646,173.0867 C 87.34899,172.98757 87.39359,170.74481 87.3946,167.58903 L 87.3946,162.25879 L 88.34344,162.25879 L 89.29227,162.25879 L 89.29227,167.60996 C 89.29227,172.32491 89.31559,172.98095 89.47018,173.13554 C 89.6214,173.28676 90.07971,173.30996 92.80855,173.30996 C 95.5374,173.30996 95.99919,173.28676 96.15041,173.13554 C 96.30787,172.97809 96.32483,171.63457 96.32483,160.02624 C 96.32483,148.41791 96.30787,147.07438 96.15041,146.91694 C 95.99919,146.76571 95.53739,146.74252 92.80855,146.74252 C 90.07971,146.74252 89.6214,146.76571 89.47018,146.91694 C 89.31642,147.07069 89.29227,147.65653 89.29227,151.66112 L 89.29227,156.23089 L 88.34344,156.23089 L 87.3946,156.23089 L 87.3946,151.66112 C 87.3946,147.65653 87.37393,147.07069 87.22018,146.91694 C 87.06896,146.76571 86.60716,146.74252 83.87832,146.74252 C 81.14948,146.74252 80.69117,146.76571 80.53994,146.91694 C 80.3839,147.07298 80.36404,147.94517 80.36204,154.81461 L 80.35855,162.53786 L 79.76553,161.92391 C 79.30267,161.44422 79.09308,161.10246 78.80971,160.36112 C 78.41745,159.33486 78.13688,158.45622 77.86437,157.40298 C 77.25294,155.03989 76.73841,153.60403 75.68762,151.3367 C 74.99696,149.84644 74.86462,149.45499 74.66901,148.32275 C 74.51501,147.43128 74.38591,146.97765 74.25739,146.88205 C 74.1202,146.78001 73.389,146.74252 71.53297,146.74252 C 68.7584,146.74252 68.64388,146.76691 68.64111,147.39136 C 68.63855,147.96958 68.32881,148.84454 67.78995,149.79833 C 67.49057,150.32823 67.06728,151.10383 66.84808,151.52508 C 66.26816,152.63959 65.28596,154.16272 64.57018,155.0588 C 64.22688,155.48856 63.73878,156.19182 63.48529,156.62159 C 63.23181,157.05135 62.88192,157.5874 62.70738,157.81112 C 62.34835,158.27134 62.30271,158.49908 62.57832,158.446 C 62.68141,158.42615 62.9876,158.08112 63.25855,157.68205 C 63.77547,156.92072 64.38312,156.23089 64.53529,156.23089 C 64.67593,156.23089 64.63897,156.61187 64.45855,157.04368 C 64.12306,157.84663 63.62083,160.13487 63.39808,161.8681 C 63.27185,162.85042 63.1232,163.75883 63.07018,163.88438 C 63.01716,164.00992 62.57979,164.53239 62.09692,165.04601 L 61.21785,165.9774 L 61.14809,164.48089 C 60.98997,161.19211 60.2165,159.91965 57.9318,159.17856 C 57.36435,158.9945 57.34252,158.97678 57.59692,158.87507 C 60.2357,157.82012 60.54808,157.30822 60.54808,154.05414 C 60.54808,151.20002 60.12706,149.76611 58.92948,148.54949 C 57.47287,147.06973 55.73539,146.74252 49.32599,146.74252 z M 101.57135,146.7495 C 98.8425,146.7495 98.38419,146.76755 98.23297,146.87856 C 98.07922,146.99144 98.05506,147.42014 98.05506,150.35996 L 98.05506,153.71577 L 98.05506,158.13903 L 98.05506,162.06694 C 98.05506,165.52823 98.07838,166.01043 98.23297,166.12391 C 98.38419,166.23493 98.8425,166.25298 101.57135,166.25298 C 104.30019,166.25298 104.76199,166.23493 104.9132,166.12391 C 105.07065,166.00833 105.08762,165.02479 105.08762,156.50298 C 105.08762,147.98117 105.07065,146.99415 104.9132,146.87856 C 104.76198,146.76756 104.30019,146.7495 101.57135,146.7495 z M 52.00855,151.43089 L 52.55971,151.43089 C 53.39081,151.43089 53.66418,151.57941 53.92716,152.17391 C 54.13747,152.64936 54.15029,152.84609 54.09809,154.49019 C 54.0667,155.47857 54.00683,156.40076 53.96204,156.54135 C 53.846,156.90553 53.34705,157.12392 52.62948,157.12392 L 52.00855,157.12392 L 52.00855,154.2774 L 52.00855,151.43089 z M 70.43413,155.5088 C 70.56795,155.5915 70.89934,156.21355 71.47018,157.4588 C 71.78408,158.14354 71.91881,158.60959 71.95855,159.13322 C 72.01144,159.83004 71.99678,159.88032 71.61669,160.37507 C 71.15212,160.97979 70.25405,161.65391 69.6039,161.88554 C 69.12608,162.05577 66.20608,162.81694 66.0318,162.81694 C 65.9773,162.81694 65.96082,162.65368 65.99343,162.45414 C 66.09517,161.83184 66.84424,160.42509 67.62251,159.39484 C 68.03299,158.85145 68.80754,157.74069 69.34576,156.92507 C 69.88398,156.10946 70.37428,155.47181 70.43413,155.5088 z M 52.39227,161.3588 C 52.54051,161.3612 52.74477,161.42734 53.02715,161.48089 C 54.09996,161.68434 54.07366,161.60248 54.07366,164.93089 C 54.07366,167.81817 54.07293,167.82389 53.80855,168.10531 C 53.56205,168.3677 52.78403,168.62158 52.22832,168.62158 C 52.01685,168.62159 52.00855,168.51665 52.00855,164.99368 C 52.00855,161.90433 51.94755,161.35157 52.39227,161.3588 z M 78.62832,163.16229 C 78.66932,163.09593 78.96704,163.2432 79.34692,163.5181 C 79.70485,163.77711 80.08185,164.03926 80.18413,164.10066 C 80.34886,164.19954 80.36585,164.44812 80.33762,166.2774 L 80.30622,168.34252 L 79.87716,167.61694 C 79.64125,167.21787 79.36018,166.79089 79.24925,166.6681 C 79.13832,166.54531 78.9705,166.2188 78.87948,165.94252 C 78.69938,165.39581 78.51473,163.34608 78.62832,163.16229 z M 101.57135,167.69717 C 98.8425,167.69717 98.38419,167.70033 98.23297,167.73205 C 98.07922,167.7643 98.05506,167.8864 98.05506,168.72624 L 98.05506,169.68554 L 98.05506,170.94833 L 98.05506,172.07159 C 98.05506,173.06039 98.07838,173.19731 98.23297,173.22973 C 98.38419,173.26144 98.8425,173.2681 101.57135,173.2681 C 104.30019,173.2681 104.76199,173.26144 104.9132,173.22973 C 105.07065,173.19671 105.08762,172.91538 105.08762,170.48089 C 105.08762,168.0464 105.07065,167.76507 104.9132,167.73205 C 104.76198,167.70034 104.30019,167.69717 101.57135,167.69717 z" + style="fill:#1fbc13;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.58090181pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path3714" + d="M 42.977908,229.38252 C 41.398253,229.38252 41.154303,229.39262 41.08302,229.46392 C 41.009543,229.53738 41,230.16436 41,235.58159 C 41,241.13956 41.008143,241.62438 41.087908,241.70414 C 41.166915,241.78315 41.385467,241.78744 43.575347,241.76438 C 44.895803,241.75047 46.045203,241.72218 46.131163,241.70089 L 46.287438,241.66181 L 46.18,241.78716 C 45.996203,241.99958 45.88831,242.20329 45.917908,242.28043 C 45.95173,242.36855 46.11315,242.37821 46.194653,242.2967 C 46.22655,242.26481 46.349342,242.24792 46.468143,242.25926 C 46.665695,242.27809 46.681585,242.2698 46.65047,242.17298 C 46.51712,241.75811 46.568967,241.65306 46.927203,241.60485 C 47.461863,241.53287 47.926208,241.20868 48.15953,240.7453 C 48.28315,240.49981 48.449307,239.85849 48.449307,239.62856 C 48.449307,239.50658 48.59703,239.34966 49.014183,239.03274 L 49.168837,238.91716 L 49.175347,240.13321 C 49.182148,241.43279 49.162863,241.55747 48.927908,241.78716 C 48.850943,241.86241 48.745663,241.98618 48.69349,242.06228 C 48.641317,242.13839 48.500663,242.26399 48.380928,242.34065 C 48.076545,242.53557 48.245933,242.55682 48.688602,242.37972 C 48.877823,242.30403 49.044972,242.25424 49.059765,242.26903 C 49.074558,242.28382 49.059952,242.41986 49.027203,242.57181 C 48.994467,242.72378 48.942025,242.97143 48.91,243.12043 C 48.860697,243.34977 48.864453,243.41001 48.93604,243.51926 C 48.982555,243.59023 49.07436,243.65645 49.13953,243.66577 C 49.304357,243.68934 49.385428,243.40828 49.377203,242.8453 C 49.372233,242.50391 49.389535,242.38587 49.45698,242.31136 C 49.504557,242.25879 49.543255,242.16382 49.543255,242.09972 C 49.543255,241.89918 49.640275,241.78065 49.803725,241.78065 C 50.00284,241.78065 50.038143,241.84932 50.038143,242.22345 C 50.038143,242.49683 50.051198,242.53737 50.142327,242.54903 C 50.348243,242.57536 50.40303,242.48934 50.331163,242.24949 C 50.295428,242.13024 50.252588,241.87561 50.236745,241.68461 C 50.211008,241.37435 50.220762,241.32745 50.321398,241.23694 C 50.419422,241.14876 50.460885,241.14255 50.643713,241.19136 C 50.80931,241.23555 50.85908,241.23387 50.879765,241.17996 C 50.916445,241.08437 50.720305,240.83348 50.448367,240.62972 C 50.110243,240.37638 50.053193,240.13784 50.098367,239.18089 C 50.132958,238.44816 50.136307,238.42788 50.285582,238.25787 C 50.470078,238.04774 50.632513,237.99946 51.50651,237.8981 C 51.873695,237.85551 52.34735,237.76981 52.558143,237.70763 C 52.836557,237.6255 52.964797,237.61006 53.02698,237.64903 C 53.166315,237.73634 53.158475,237.90057 53.010693,237.9974 C 52.8825,238.0814 52.827398,238.23832 52.92604,238.23832 C 52.9525,238.23832 53.087297,238.15212 53.225582,238.04623 C 53.487207,237.84592 53.76072,237.72457 53.95651,237.72065 C 54.13242,237.71714 54.319098,237.92488 54.38302,238.196 C 54.55284,238.91625 54.286898,239.57392 53.508837,240.35787 C 53.137253,240.73225 53.069843,240.84298 53.215817,240.84298 C 53.324258,240.84298 53.313268,240.99368 53.189765,241.19623 C 53.05624,241.41523 53.059297,241.43851 53.220693,241.51205 C 53.335412,241.56432 53.3522,241.60175 53.337908,241.76763 C 53.325063,241.91671 53.341957,241.96624 53.40953,241.97926 C 53.505302,241.9977 53.499853,242.01454 53.608143,241.15554 C 53.674772,240.62702 53.813687,240.25971 53.992327,240.13485 C 54.514095,239.7701 54.824697,239.67268 55.058602,239.79787 C 55.160183,239.85222 55.169307,239.89994 55.169307,240.32367 C 55.169307,240.8517 55.081188,241.14728 54.814418,241.5153 C 54.615058,241.79033 54.610567,241.83275 54.775347,241.83275 C 54.875062,241.83275 54.915218,241.87374 54.965817,242.0281 C 55.041125,242.25786 55.16282,242.45787 55.227908,242.45787 C 55.25326,242.45787 55.27349,242.37884 55.27349,242.28205 C 55.27349,242.15985 55.308152,242.08291 55.385817,242.03136 C 55.4802,241.96868 55.503767,241.88717 55.53396,241.50716 C 55.568552,241.07152 55.635472,240.89508 55.766745,240.89508 C 55.865643,240.89508 56.159072,241.38863 56.159072,241.55438 C 56.159072,241.63652 56.186675,241.78476 56.219307,241.88485 C 56.251927,241.98493 56.292947,242.30159 56.31047,242.5881 L 56.341398,243.10903 L 56.634418,243.09926 L 56.92745,243.08949 L 57.008837,243.29461 C 57.062795,243.43197 57.120638,243.49972 57.186275,243.49972 C 57.240152,243.49972 57.313057,243.52883 57.347438,243.56321 C 57.394455,243.61022 57.424602,243.60977 57.46953,243.56485 C 57.51447,243.51992 57.474675,243.41142 57.306745,243.1253 C 57.18393,242.91606 57.041795,242.68359 56.990928,242.60926 C 56.914255,242.49721 56.898832,242.36808 56.90302,241.85391 C 56.905797,241.51281 56.876572,240.9931 56.837908,240.6981 C 56.77275,240.20102 56.774523,240.1552 56.859072,240.07298 C 56.94537,239.98905 56.96357,239.99863 57.205817,240.2667 L 57.461398,240.54996 L 57.461398,241.08392 C 57.461387,241.73403 57.492245,241.78065 57.922092,241.78065 L 58.22,241.78065 L 58.322562,242.00205 C 58.452365,242.28151 58.560853,242.286 58.636745,242.01508 L 58.695347,241.8067 L 59.668837,241.78065 C 60.457935,241.75956 60.652862,241.73977 60.692797,241.67647 C 60.721975,241.63021 60.742788,240.58358 60.743255,239.11089 L 60.743255,236.62345 L 61.186052,236.62345 L 61.628837,236.62345 L 61.628837,239.12065 C 61.628837,241.32096 61.639722,241.62712 61.711857,241.69926 C 61.782428,241.76982 61.996313,241.78065 63.269765,241.78065 C 64.543228,241.78065 64.758735,241.76982 64.829307,241.69926 C 64.902783,241.62579 64.910693,240.99881 64.910693,235.58159 C 64.910693,230.16436 64.902783,229.53738 64.829307,229.46392 C 64.758735,229.39333 64.543228,229.38252 63.269765,229.38252 C 61.996313,229.38252 61.782428,229.39333 61.711857,229.46392 C 61.640107,229.53567 61.628837,229.80905 61.628837,231.67787 L 61.628837,233.81043 L 61.186052,233.81043 L 60.743255,233.81043 L 60.743255,231.67787 C 60.743255,229.80905 60.733607,229.53567 60.661857,229.46392 C 60.591297,229.39333 60.37579,229.38252 59.102327,229.38252 C 57.828863,229.38252 57.61499,229.39333 57.544418,229.46392 C 57.471595,229.53673 57.462332,229.94376 57.461398,233.14949 L 57.459765,236.75367 L 57.18302,236.46716 C 56.967023,236.24331 56.86921,236.08382 56.73698,235.73787 C 56.553918,235.25894 56.422983,234.84891 56.295817,234.3574 C 56.010485,233.25463 55.770373,232.58455 55.28,231.52647 C 54.957697,230.83102 54.895933,230.64834 54.804653,230.11996 C 54.732787,229.70394 54.67254,229.49224 54.612562,229.44763 C 54.548535,229.40001 54.207308,229.38252 53.341163,229.38252 C 52.046362,229.38252 51.992917,229.39389 51.991633,229.6853 C 51.990432,229.95514 51.845893,230.36346 51.594418,230.80856 C 51.45471,231.05585 51.25717,231.41779 51.154877,231.61438 C 50.884257,232.13449 50.425897,232.84528 50.091857,233.26345 C 49.93165,233.464 49.70387,233.79219 49.585582,233.99275 C 49.467293,234.1933 49.304007,234.44346 49.22255,234.54787 C 49.055005,234.76264 49.033713,234.86891 49.162327,234.84414 C 49.21044,234.83488 49.353322,234.67387 49.479765,234.48763 C 49.720997,234.13235 50.004567,233.81043 50.075582,233.81043 C 50.141207,233.81043 50.123963,233.98822 50.039765,234.18972 C 49.88321,234.56443 49.648827,235.63228 49.544877,236.44112 C 49.485972,236.89954 49.416602,237.32346 49.391857,237.38205 C 49.367123,237.44064 49.163015,237.68446 48.937673,237.92414 L 48.527438,238.35879 L 48.494888,237.66043 C 48.421097,236.12565 48.060142,235.53184 46.993948,235.186 C 46.729138,235.10011 46.718953,235.09184 46.837673,235.04438 C 48.069102,234.55207 48.214877,234.31318 48.214877,232.79461 C 48.214877,231.46269 48.01841,230.79352 47.45953,230.22577 C 46.779783,229.53521 45.968962,229.38252 42.977908,229.38252 z M 67.359072,229.38577 C 66.085608,229.38577 65.871735,229.3942 65.801163,229.446 C 65.729413,229.49868 65.718143,229.69874 65.718143,231.07065 L 65.718143,232.6367 L 65.718143,234.70089 L 65.718143,236.53392 C 65.718143,238.14918 65.729017,238.37421 65.801163,238.42716 C 65.871735,238.47897 66.085608,238.4874 67.359072,238.4874 C 68.632535,238.4874 68.848042,238.47897 68.918602,238.42716 C 68.992078,238.37323 69,237.91425 69,233.9374 C 69,229.96056 68.992078,229.49994 68.918602,229.446 C 68.84803,229.3942 68.632535,229.38577 67.359072,229.38577 z M 44.229765,231.57043 L 44.48698,231.57043 C 44.874827,231.57043 45.00239,231.63973 45.125123,231.91716 C 45.223263,232.13904 45.229248,232.23085 45.204888,232.9981 C 45.190235,233.45934 45.162293,233.88969 45.141398,233.9553 C 45.087242,234.12525 44.854398,234.22717 44.51953,234.22717 L 44.229765,234.22717 L 44.229765,232.89879 L 44.229765,231.57043 z M 52.828367,233.47345 C 52.890818,233.51204 53.045472,233.80233 53.311857,234.38345 C 53.458343,234.703 53.521227,234.92049 53.539765,235.16485 C 53.564452,235.49003 53.557603,235.51349 53.380235,235.74438 C 53.163433,236.02658 52.744332,236.34116 52.440928,236.44926 C 52.217943,236.5287 50.855277,236.88392 50.773948,236.88392 C 50.748515,236.88392 50.740827,236.80772 50.75604,236.71461 C 50.803523,236.4242 51.153092,235.76772 51.516287,235.28694 C 51.707842,235.03335 52.069298,234.515 52.32047,234.13438 C 52.57163,233.75375 52.800437,233.45618 52.828367,233.47345 z M 44.408837,236.20345 C 44.47802,236.20457 44.573337,236.23544 44.705112,236.26043 C 45.205763,236.35537 45.19349,236.31716 45.19349,237.87043 C 45.19349,239.21782 45.19314,239.22049 45.069765,239.35181 C 44.954732,239.47427 44.591653,239.59274 44.332327,239.59274 C 44.233638,239.59275 44.229765,239.54378 44.229765,237.89972 C 44.229765,236.45803 44.201298,236.20008 44.408837,236.20345 z M 56.652327,237.04508 C 56.67146,237.01411 56.810398,237.08283 56.987673,237.21112 C 57.154705,237.33199 57.330638,237.45432 57.378367,237.48298 C 57.45525,237.52913 57.463172,237.64513 57.45,238.49879 L 57.435347,239.46252 L 57.235123,239.12392 C 57.125025,238.93768 56.993857,238.73843 56.942092,238.68112 C 56.890327,238.62381 56.812008,238.47145 56.76953,238.34252 C 56.685483,238.08738 56.599313,237.13084 56.652327,237.04508 z M 67.359072,239.16136 C 66.085608,239.16136 65.871735,239.16283 65.801163,239.17763 C 65.729413,239.19268 65.718143,239.24966 65.718143,239.64159 L 65.718143,240.08926 L 65.718143,240.67856 L 65.718143,241.20275 C 65.718143,241.66419 65.729017,241.72808 65.801163,241.74321 C 65.871735,241.75802 66.085608,241.76112 67.359072,241.76112 C 68.632535,241.76112 68.848042,241.75802 68.918602,241.74321 C 68.992078,241.7278 69,241.59652 69,240.46043 C 69,239.32433 68.992078,239.19304 68.918602,239.17763 C 68.84803,239.16284 68.632535,239.16136 67.359072,239.16136 z" + style="fill:#1fbc13;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.58090181pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="borders" + style="display:inline"> + <rect + y="132.35645" + x="37.292313" + height="59.01149" + width="467.01147" + id="rect3159" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.98851103;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.67290944;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3165" + width="467.32709" + height="27.327091" + x="38.33646" + y="222.69864" /> + <rect + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.98851103;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3221" + width="467.01147" + height="59.01149" + x="35.292313" + y="381.35645" /> + <rect + y="471.69864" + x="36.33646" + height="27.327091" + width="467.32709" + id="rect3225" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.67290944;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.98851103;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3477" + width="467.01147" + height="59.01149" + x="37.047119" + y="527.9248" /> + </g> +</svg> Added: trunk/src/main/java/gwt-module.dtd =================================================================== --- trunk/src/main/java/gwt-module.dtd 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/gwt-module.dtd 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,161 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + + + + +<!ELEMENT module (inherits | source | public | super-source | entry-point | + stylesheet | script | servlet | replace-with | generate-with | + define-property | extend-property | set-property | property-provider | + define-linker | add-linker)*> +<!ATTLIST module + rename-to CDATA #IMPLIED +> + +<!ELEMENT inherits EMPTY> +<!ATTLIST inherits + name CDATA #REQUIRED +> + +<!ELEMENT source (include | exclude)*> +<!ATTLIST source + path CDATA #REQUIRED + includes CDATA #IMPLIED + excludes CDATA #IMPLIED + defaultexcludes (yes | no) "yes" + casesensitive (true | false) "true" +> + +<!ELEMENT public (include | exclude)*> +<!ATTLIST public + path CDATA #REQUIRED + includes CDATA #IMPLIED + excludes CDATA #IMPLIED + defaultexcludes (yes | no) "yes" + casesensitive (true | false) "true" +> + +<!ELEMENT super-source (include | exclude)*> +<!ATTLIST super-source + path CDATA #REQUIRED + includes CDATA #IMPLIED + excludes CDATA #IMPLIED + defaultexcludes (yes | no) "yes" + casesensitive (true | false) "true" +> +<!ELEMENT include EMPTY> +<!ATTLIST include + name CDATA #REQUIRED +> +<!ELEMENT exclude EMPTY> +<!ATTLIST exclude + name CDATA #REQUIRED +> + + +<!ELEMENT entry-point EMPTY> +<!ATTLIST entry-point + class CDATA #REQUIRED +> + + +<!ELEMENT stylesheet EMPTY> +<!ATTLIST stylesheet + src CDATA #REQUIRED +> + +<!ELEMENT script (#PCDATA)> +<!ATTLIST script + src CDATA #REQUIRED +> + +<!ELEMENT servlet EMPTY> +<!ATTLIST servlet + path CDATA #REQUIRED + class CDATA #REQUIRED +> + + +<!ELEMENT add-linker EMPTY> + +<!ATTLIST add-linker + name CDATA #REQUIRED +> + + +<!ELEMENT define-linker EMPTY> +<!ATTLIST define-linker + class CDATA #REQUIRED + name CDATA #REQUIRED +> + + + + + +<!ELEMENT define-property EMPTY> +<!ATTLIST define-property + name CDATA #REQUIRED + values CDATA #REQUIRED +> + +<!ELEMENT set-property EMPTY> +<!ATTLIST set-property + name CDATA #REQUIRED + value CDATA #REQUIRED +> + +<!ELEMENT extend-property EMPTY> +<!ATTLIST extend-property + name CDATA #REQUIRED + values CDATA #REQUIRED +> + +<!ELEMENT property-provider (#PCDATA)> +<!ATTLIST property-provider + name CDATA #REQUIRED +> + +<!ENTITY % predicates "when-property-is | when-type-assignable | when-type-is | all | any | none"> + +<!ELEMENT replace-with (%predicates;)*> +<!ATTLIST replace-with + class CDATA #REQUIRED +> + +<!ELEMENT generate-with (%predicates;)*> +<!ATTLIST generate-with + class CDATA #REQUIRED +> + +<!ELEMENT when-property-is EMPTY> +<!ATTLIST when-property-is + name CDATA #REQUIRED + value CDATA #REQUIRED +> + +<!ELEMENT when-type-assignable EMPTY> +<!ATTLIST when-type-assignable + class CDATA #REQUIRED +> + +<!ELEMENT when-type-is EMPTY> +<!ATTLIST when-type-is + class CDATA #REQUIRED +> + +<!ELEMENT all (%predicates;)*> + +<!ELEMENT any (%predicates;)*> + +<!ELEMENT none (%predicates;)*> Modified: trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2008-10-21 19:26:47 UTC (rev 917) @@ -1,13 +1,13 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/releases/1.5/distro-source/cor…"> +<!DOCTYPE document SYSTEM "src/main/java/gwt-module.dtd"> <module> - <inherits name='com.google.gwt.i18n.I18N' /> - <inherits name='com.google.gwt.user.User' /> + <inherits name='com.google.gwt.i18n.I18N' /> + <inherits name='com.google.gwt.user.User' /> -  - <inherits name="com.google.gwt.user.Debug"/> +  + <inherits name="com.google.gwt.user.Debug"/> -  - <set-property name="gwt.suppressNonStaticFinalFieldWarnings" value="true" /> +  + <set-property name="gwt.suppressNonStaticFinalFieldWarnings" value="true" /> <inherits name="com.calclab.suco.Suco" /> @@ -15,36 +15,36 @@ <inherits name='org.ourproject.kune.docs.Kune-Docs' /> <inherits name='org.ourproject.kune.chat.Kune-Chat' /> -  - <inherits name='com.gwtext.GwtExt' /> - <script src="js/ext/adapter/ext/ext-base.js" /> - <script src="js/ext/ext-all.js" /> +  + <inherits name='com.gwtext.GwtExt' /> + <script src="js/ext/adapter/ext/ext-base.js" /> + <script src="js/ext/ext-all.js" /> - <inherits name="com.gwtextux.GwtExtUx" /> - <inherits name="com.gwtextux.UploadDialog"/> - <script src="js/UploadDialog/Ext.ux.UploadDialog.packed.js" /> + <inherits name="com.gwtextux.GwtExtUx" /> + <inherits name="com.gwtextux.UploadDialog"/> + <script src="js/UploadDialog/Ext.ux.UploadDialog.packed.js" /> <stylesheet src="js/UploadDialog/css/Ext.ux.UploadDialog.css" /> <script src="js/ext-ux-all-min.js" /> -  - <stylesheet src="css/all.css" /> +  + <stylesheet src="css/all.css" /> - <inherits name="com.allen_sauer.gwt.log.gwt-log" /> - <extend-property name="log_level" values="DEBUG" /> - <set-property name="log_level" value="DEBUG" /> - <set-property name="log_DivLogger" value="DISABLED" /> - <set-property name="log_FirebugLogger" value="ENABLED" /> + <inherits name="com.allen_sauer.gwt.log.gwt-log" /> + <extend-property name="log_level" values="DEBUG" /> + <set-property name="log_level" value="DEBUG" /> + <set-property name="log_DivLogger" value="DISABLED" /> + <set-property name="log_FirebugLogger" value="ENABLED" /> -  +  -  - <entry-point class='org.ourproject.kune.app.client.KuneEntryPoint' /> +  + <entry-point class='org.ourproject.kune.app.client.KuneEntryPoint' /> -  +  -  +  </module> Modified: trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2008-10-21 19:26:47 UTC (rev 917) @@ -39,20 +39,20 @@ } public void onModuleLoad() { - Log.setUncaughtExceptionHandler(); + Log.setUncaughtExceptionHandler(); - // At the moment, in runtime: - Log.setCurrentLogLevel(Log.LOG_LEVEL_DEBUG); + // At the moment, in runtime: + Log.setCurrentLogLevel(Log.LOG_LEVEL_DEBUG); - DeferredCommand.addCommand(new Command() { - public void execute() { - onModuleLoadCont(); - } - }); + DeferredCommand.addCommand(new Command() { + public void execute() { + onModuleLoadCont(); + } + }); } public void onModuleLoadCont() { - Suco.install(new KuneCoreModule(), new KunePlatformModule(), new KuneWorkspaceModule(), new EmiteUIModule(), - new DocumentClientModule(), new ChatClientModule(), new KuneModule()); + Suco.install(new KuneCoreModule(), new KunePlatformModule(), new KuneWorkspaceModule(), new EmiteUIModule(), + new DocumentClientModule(), new ChatClientModule(), new KuneModule()); } } Modified: trunk/src/main/java/org/ourproject/kune/app/server/AbstractExtendedModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/AbstractExtendedModule.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/app/server/AbstractExtendedModule.java 2008-10-21 19:26:47 UTC (rev 917) @@ -42,7 +42,8 @@ /* * See: - * http://tembrel.blogspot.com/2007/09/injecting-method-interceptors-in-guice.… + * http://tembrel.blogspot.com/2007/09/injecting-method-interceptors-in-guice + * .html */ public abstract class AbstractExtendedModule extends AbstractModule { @@ -99,7 +100,7 @@ * Hack to ensure unique Keys for binding different instances of * ExtendedModule. The prefix is chosen to reduce the chances of a conflict * with some other use of - * + * * @Named. A better solution would be to invent an Annotation for just this * purpose. */ Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneContainerListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/KuneContainerListener.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/app/server/KuneContainerListener.java 2008-10-21 19:26:47 UTC (rev 917) @@ -37,41 +37,42 @@ import com.google.inject.Inject; class KuneContainerListener implements ContainerListener { - KunePersistenceService persistenceService; - ServerToolRegistry toolRegistry; - DocumentServerTool documentTool; - Logger logger; + KunePersistenceService persistenceService; + ServerToolRegistry toolRegistry; + DocumentServerTool documentTool; + Logger logger; - @Inject - public KuneContainerListener(KunePersistenceService persistenceService, ServerToolRegistry toolRegistry, DocumentServerTool documentTool, Logger logger) { - this.persistenceService = persistenceService; - this.toolRegistry = toolRegistry; - this.documentTool = documentTool; - this.logger = logger; - } - - public void start() { - configureLog4j(); - logger.log(Level.INFO, "starting Kune..."); - toolRegistry.register(documentTool); - persistenceService.start(); - logger.log(Level.INFO, "started"); - } + @Inject + public KuneContainerListener(KunePersistenceService persistenceService, ServerToolRegistry toolRegistry, + DocumentServerTool documentTool, Logger logger) { + this.persistenceService = persistenceService; + this.toolRegistry = toolRegistry; + this.documentTool = documentTool; + this.logger = logger; + } - private void configureLog4j() { - try { - Properties properties = new Properties(); - InputStream input = Thread.currentThread().getContextClassLoader().getResourceAsStream( - "log4j.dev.properties"); - properties.load(input); - PropertyConfigurator.configure(properties); - } catch (IOException e) { - e.printStackTrace(); - } - } + public void start() { + configureLog4j(); + logger.log(Level.INFO, "starting Kune..."); + toolRegistry.register(documentTool); + persistenceService.start(); + logger.log(Level.INFO, "started"); + } - public void stop() { - logger.log(Level.INFO, "stoping Kune..."); - logger.log(Level.INFO, "stoped"); - } + private void configureLog4j() { + try { + Properties properties = new Properties(); + InputStream input = Thread.currentThread().getContextClassLoader().getResourceAsStream( + "log4j.dev.properties"); + properties.load(input); + PropertyConfigurator.configure(properties); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void stop() { + logger.log(Level.INFO, "stoping Kune..."); + logger.log(Level.INFO, "stoped"); + } } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2008-10-21 19:26:47 UTC (rev 917) @@ -28,8 +28,10 @@ import org.ourproject.kune.platf.client.rpc.SocialNetworkService; import org.ourproject.kune.platf.server.LoggerMethodInterceptor; import org.ourproject.kune.platf.server.PlatformServerModule; -import org.ourproject.kune.platf.server.manager.impl.FileDownloadManager; -import org.ourproject.kune.platf.server.manager.impl.FileUploadManager; +import org.ourproject.kune.platf.server.manager.file.EntityLogoDownloadManager; +import org.ourproject.kune.platf.server.manager.file.EntityLogoUploadManager; +import org.ourproject.kune.platf.server.manager.file.FileDownloadManager; +import org.ourproject.kune.platf.server.manager.file.FileUploadManager; import org.ourproject.kune.platf.server.properties.PropertiesFileName; import org.ourproject.kune.platf.server.rest.ContentJSONService; import org.ourproject.kune.platf.server.rest.GroupJSONService; @@ -59,56 +61,57 @@ private final Module configModule; public KuneRackModule() { - this("development", "kune.properties", null); + this("development", "kune.properties", null); } public KuneRackModule(final String jpaUnit, final String propertiesFileName, final Scope sessionScope) { - configModule = new AbstractModule() { - @Override - public void configure() { - bindInterceptor(Matchers.any(), new NotInObject(), new LoggerMethodInterceptor()); - bindConstant().annotatedWith(JpaUnit.class).to(jpaUnit); - bindConstant().annotatedWith(PropertiesFileName.class).to(propertiesFileName); - if (sessionScope != null) { - bindScope(SessionScoped.class, sessionScope); - } - } - }; + configModule = new AbstractModule() { + @Override + public void configure() { + bindInterceptor(Matchers.any(), new NotInObject(), new LoggerMethodInterceptor()); + bindConstant().annotatedWith(JpaUnit.class).to(jpaUnit); + bindConstant().annotatedWith(PropertiesFileName.class).to(propertiesFileName); + if (sessionScope != null) { + bindScope(SessionScoped.class, sessionScope); + } + } + }; } @SuppressWarnings("unchecked") public void configure(final RackBuilder builder) { - installGuiceModules(builder); + installGuiceModules(builder); - builder.add(KuneContainerListener.class); + builder.add(KuneContainerListener.class); - builder.exclude("/http-bind.*"); - builder.exclude("/services/fileupload.*"); - builder.at(".*").install(new LogFilter()); - builder.at(".*").install(new GuiceFilter()); + builder.exclude("/http-bind.*"); + builder.exclude("/services/fileupload.*"); + builder.at(".*").install(new LogFilter()); + builder.at(".*").install(new GuiceFilter()); - builder.at("^/$").install(new RedirectFilter("/kune/")); - builder.at("^/kune$").install(new RedirectFilter("/kune/")); + builder.at("^/$").install(new RedirectFilter("/kune/")); + builder.at("^/kune$").install(new RedirectFilter("/kune/")); - builder.at("^/kune/$").install(new ListenerFilter(KuneApplicationListener.class), - new ForwardFilter("/gwt/org.ourproject.kune.app.Kune/Kune.html")); + builder.at("^/kune/$").install(new ListenerFilter(KuneApplicationListener.class), + new ForwardFilter("/gwt/org.ourproject.kune.app.Kune/Kune.html")); - builder.installGWTServices("^/kune/", SiteService.class, GroupService.class, ContentService.class, - UserService.class, SocialNetworkService.class, I18nService.class); - builder.installRESTServices("^/kune/json/", TestJSONService.class, GroupJSONService.class, - UserJSONService.class, I18nTranslationJSONService.class, ContentJSONService.class); - builder.installServlet("^/kune/servlets/", FileUploadManager.class, FileDownloadManager.class); + builder.installGWTServices("^/kune/", SiteService.class, GroupService.class, ContentService.class, + UserService.class, SocialNetworkService.class, I18nService.class); + builder.installRESTServices("^/kune/json/", TestJSONService.class, GroupJSONService.class, + UserJSONService.class, I18nTranslationJSONService.class, ContentJSONService.class); + builder.installServlet("^/kune/servlets/", FileUploadManager.class, FileDownloadManager.class, + EntityLogoUploadManager.class, EntityLogoDownloadManager.class); - builder.at("^/kune/(.*)$").install(new ForwardFilter("^/kune/(.*)$", "/gwt/org.ourproject.kune.app.Kune/{0}")); + builder.at("^/kune/(.*)$").install(new ForwardFilter("^/kune/(.*)$", "/gwt/org.ourproject.kune.app.Kune/{0}")); } private void installGuiceModules(final RackBuilder builder) { - builder.use(new ServletModule()); - builder.use(new PlatformServerModule()); - builder.use(new DocumentServerModule()); - builder.use(new ChatServerModule()); - builder.use(new RESTServicesModule()); - builder.use(configModule); + builder.use(new ServletModule()); + builder.use(new PlatformServerModule()); + builder.use(new DocumentServerModule()); + builder.use(new ChatServerModule()); + builder.use(new RESTServicesModule()); + builder.use(configModule); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/Kune-Chat.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/Kune-Chat.gwt.xml 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/Kune-Chat.gwt.xml 2008-10-21 19:26:47 UTC (rev 917) @@ -1,4 +1,4 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/releases/1.5/distro-source/cor…"> +<!DOCTYPE document SYSTEM "src/main/java/gwt-module.dtd"> <module> <inherits name='org.ourproject.kune.platf.Kune-Platform' /> <inherits name='org.ourproject.kune.workspace.Kune-Workspace' /> Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2008-10-21 19:26:47 UTC (rev 917) @@ -21,32 +21,32 @@ private final ContentActionRegistry contentActionRegistry; public ChatClientActions(final I18nUITranslationService i18n, final Session session, - final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, - final Provider<ChatClientTool> chatClientToolProvider) { - this.session = session; - this.contentActionRegistry = contentActionRegistry; - this.chatClientToolProvider = chatClientToolProvider; - createActions(); + final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, + final Provider<ChatClientTool> chatClientToolProvider) { + this.session = session; + this.contentActionRegistry = contentActionRegistry; + this.chatClientToolProvider = chatClientToolProvider; + createActions(); } private void createActions() { - final ActionToolbarButtonDescriptor<StateToken> chatAbout = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Viewer, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken token) { - chatClientToolProvider.get().getChat().joinRoom(token.toString().replaceAll("\\.", "-"), - session.getCurrentUserInfo().getShortName()); - chatClientToolProvider.get().getChat().show(); - } - }); - // chatAbout.setTextDescription(i18n.t("Chat about")); - chatAbout.setIconUrl("images/emite-room.png"); - chatAbout.setToolTip("Chat and comment this"); - chatAbout.setLeftSeparator(ActionToolbarButtonSeparator.fill); + final ActionToolbarButtonDescriptor<StateToken> chatAbout = new ActionToolbarButtonDescriptor<StateToken>( + AccessRolDTO.Viewer, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken token) { + chatClientToolProvider.get().getChat().joinRoom(token.toString().replaceAll("\\.", "-"), + session.getCurrentUserInfo().getShortName()); + chatClientToolProvider.get().getChat().show(); + } + }); + // chatAbout.setTextDescription(i18n.t("Chat about")); + chatAbout.setIconUrl("images/emite-room.png"); + chatAbout.setToolTip("Chat and comment this"); + chatAbout.setLeftSeparator(ActionToolbarButtonSeparator.fill); - contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_DOCUMENT); - contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_GALLERY); - contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_WIKIPAGE); - contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_POST); - contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_UPLOADEDFILE); + contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_DOCUMENT); + contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_GALLERY); + contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_WIKIPAGE); + contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_POST); + contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_UPLOADEDFILE); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2008-10-21 19:26:47 UTC (rev 917) @@ -54,75 +54,78 @@ private final Provider<ChatContent> chatContentProvider; public ChatClientTool(final Session session, final Application application, final I18nTranslationService i18n, - final EmiteUIDialog emiteUIDialog, final WorkspaceSkeleton ws, - final Provider<GroupMembersSummary> groupMembersSummaryProvider, final ToolSelector toolSelector, - final WsThemePresenter wsThemePresenter, final Provider<ChatContent> chatContentProvider, - final Provider<ChatContext> chatContextProvider) { - super(NAME, i18n.t("chat rooms"), toolSelector, wsThemePresenter, ws); - this.chatContentProvider = chatContentProvider; - this.chatContextProvider = chatContextProvider; - session.onInitDataReceived(new Listener<InitDataDTO>() { - public void onEvent(final InitDataDTO initData) { - checkChatDomain(initData.getChatDomain()); - final ChatOptions chatOptions = new ChatOptions(initData.getChatHttpBase(), initData.getChatDomain(), - initData.getChatRoomHost()); - chat = new ChatEngineXmpp(emiteUIDialog, chatOptions, i18n, ws); - groupMembersSummaryProvider.get().addUserOperation( - new MenuItem<GroupDTO>("images/new-chat.gif", i18n.t("Start a chat with this member"), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO group) { - emiteUIDialog.show(); - if (emiteUIDialog.isLoggedIn()) { - emiteUIDialog.chat(XmppURI.jid(group.getShortName() + "@" - + initData.getChatDomain())); - } else { - ws.showAlertMessage(i18n.t("Error"), i18n - .t("To start a chat you need to be 'online'.")); - } - } - }), true); - } + final EmiteUIDialog emiteUIDialog, final WorkspaceSkeleton ws, + final Provider<GroupMembersSummary> groupMembersSummaryProvider, final ToolSelector toolSelector, + final WsThemePresenter wsThemePresenter, final Provider<ChatContent> chatContentProvider, + final Provider<ChatContext> chatContextProvider) { + super(NAME, i18n.t("chat rooms"), toolSelector, wsThemePresenter, ws); + this.chatContentProvider = chatContentProvider; + this.chatContextProvider = chatContextProvider; + session.onInitDataReceived(new Listener<InitDataDTO>() { + public void onEvent(final InitDataDTO initData) { + checkChatDomain(initData.getChatDomain()); + final ChatOptions chatOptions = new ChatOptions(initData.getChatHttpBase(), initData.getChatDomain(), + initData.getChatRoomHost()); + chat = new ChatEngineXmpp(emiteUIDialog, chatOptions, i18n, ws); + groupMembersSummaryProvider.get().addUserOperation( + new MenuItem<GroupDTO>("images/new-chat.gif", + i18n.t("Start a chat with this member"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO group) { + emiteUIDialog.show(); + if (emiteUIDialog.isLoggedIn()) { + emiteUIDialog.chat(XmppURI.jid(group.getShortName() + + "@" + + initData.getChatDomain())); + } else { + ws.showAlertMessage( + i18n.t("Error"), + i18n.t("To start a chat you need to be 'online'.")); + } + } + }), true); + } - private void checkChatDomain(final String chatDomain) { - final String httpDomain = WindowUtils.getLocation().getHostName(); - if (!chatDomain.equals(httpDomain)) { - Log.error("Your http domain (" + httpDomain + ") is different from the chat domain (" + chatDomain - + "). This will produce problems with the chat functionality. " - + "Check kune.properties on the server."); - } - } - }); - application.onApplicationStop(new Listener0() { - public void onEvent() { - chat.stop(); - } - }); - session.onUserSignOut(new Listener0() { - public void onEvent() { - chat.logout(); - } - }); - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO user) { - chat.login(user.getChatName(), user.getChatPassword()); - } - }); + private void checkChatDomain(final String chatDomain) { + final String httpDomain = WindowUtils.getLocation().getHostName(); + if (!chatDomain.equals(httpDomain)) { + Log.error("Your http domain (" + httpDomain + ") is different from the chat domain (" + chatDomain + + "). This will produce problems with the chat functionality. " + + "Check kune.properties on the server."); + } + } + }); + application.onApplicationStop(new Listener0() { + public void onEvent() { + chat.stop(); + } + }); + session.onUserSignOut(new Listener0() { + public void onEvent() { + chat.logout(); + } + }); + session.onUserSignIn(new Listener<UserInfoDTO>() { + public void onEvent(final UserInfoDTO user) { + chat.login(user.getChatName(), user.getChatPassword()); + } + }); } public ChatEngine getChat() { - return chat; + return chat; } public String getName() { - return NAME; + return NAME; } public void setContent(final StateDTO state) { - chatContentProvider.get().setState(state); + chatContentProvider.get().setState(state); } public void setContext(final StateDTO state) { - chatContextProvider.get().setState(state); + chatContextProvider.get().setState(state); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java 2008-10-21 19:26:47 UTC (rev 917) @@ -83,7 +83,7 @@ chatOptions.userOptions = userChatOptions; if (emiteDialog.isDialogNotStarted()) { emiteDialog.start(userChatOptions, chatOptions.httpBase, chatOptions.roomHost, initialWindowTitle, - avatarProvider, i18n.t("Chat")); + avatarProvider, i18n.t("Chat")); } else { emiteDialog.setEnableStatusUI(true); emiteDialog.refreshUserInfo(chatOptions.userOptions); Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatContentPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatContentPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -41,31 +41,31 @@ private final Provider<ChatRoom> chatRoomProvider; public ChatContentPresenter(final EmiteUIDialog emiteUIDialog, final WorkspaceDeckView view, - final Provider<ChatInfo> chatInfoProvider, final Provider<ChatRoom> chatRoomProvider) { - this.emiteUIDialog = emiteUIDialog; - this.view = view; - this.chatInfoProvider = chatInfoProvider; - this.chatRoomProvider = chatRoomProvider; + final Provider<ChatInfo> chatInfoProvider, final Provider<ChatRoom> chatRoomProvider) { + this.emiteUIDialog = emiteUIDialog; + this.view = view; + this.chatInfoProvider = chatInfoProvider; + this.chatRoomProvider = chatRoomProvider; } public View getView() { - return view; + return view; } public void onEnterRoom() { - final String roomName = state.getContainer().getName(); - emiteUIDialog.joinRoom(XmppURI.uri(roomName)); + final String roomName = state.getContainer().getName(); + emiteUIDialog.joinRoom(XmppURI.uri(roomName)); } public void setState(final StateDTO state) { - this.state = state; - final String typeId = state.getTypeId(); - if (typeId.equals(ChatClientTool.TYPE_ROOT)) { - chatInfoProvider.get().show(); - } else if (typeId.equals(ChatClientTool.TYPE_ROOM)) { - chatRoomProvider.get().show(); - } else { - Log.error("Programming error: unknown component!! please contact kune-devel(a)lists-ourproject.org"); - } + this.state = state; + final String typeId = state.getTypeId(); + if (typeId.equals(ChatClientTool.TYPE_ROOT)) { + chatInfoProvider.get().show(); + } else if (typeId.equals(ChatClientTool.TYPE_ROOM)) { + chatRoomProvider.get().show(); + } else { + Log.error("Programming error: unknown component!! please contact kune-devel(a)lists-ourproject.org"); + } } } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/RoomViewPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/RoomViewPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/RoomViewPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -32,16 +32,16 @@ public class RoomViewPanel extends VerticalPanel implements View { public RoomViewPanel(final RoomViewListener listener) { - FlowPanel flow = new FlowPanel(); - Button btnEnter = new Button("entrar", new ClickListener() { - public void onClick(Widget arg0) { - listener.onEnterRoom(); - } - }); - flow.add(btnEnter); - Label label = new Label("panel del chat: contenido por defecto"); + FlowPanel flow = new FlowPanel(); + Button btnEnter = new Button("entrar", new ClickListener() { + public void onClick(Widget arg0) { + listener.onEnterRoom(); + } + }); + flow.add(btnEnter); + Label label = new Label("panel del chat: contenido por defecto"); - add(flow); - add(label); + add(flow); + add(label); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/info/ui/ChatInfoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/info/ui/ChatInfoPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/info/ui/ChatInfoPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -28,10 +28,10 @@ private final VerticalPanel stateArea; public ChatInfoPanel() { - final FlowPanel flow = new FlowPanel(); - add(flow); - stateArea = new VerticalPanel(); - add(stateArea); + final FlowPanel flow = new FlowPanel(); + add(flow); + stateArea = new VerticalPanel(); + add(stateArea); } public void show() { Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ChatRoomControlPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ChatRoomControlPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ChatRoomControlPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -26,15 +26,15 @@ private ChatRoomControlView view; public View getView() { - return view; + return view; } public void init(final ChatRoomControlView view) { - this.view = view; + this.view = view; } public void onEnterRoom() { - // TODO Auto-generated method stub + // TODO Auto-generated method stub } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ChatRoomPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ChatRoomPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ChatRoomPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -26,11 +26,11 @@ private final ChatRoomView view; public ChatRoomPresenter(final ChatRoomView view) { - this.view = view; + this.view = view; } public View getView() { - return view; + return view; } public void show() { Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ui/ChatRoomControlPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ui/ChatRoomControlPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ui/ChatRoomControlPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -33,17 +33,17 @@ private final CustomPushButton enterRoomBtn; public ChatRoomControlPanel(final I18nTranslationService i18n, final ChatRoomControlPresenter presenter) { - enterRoomBtn = new CustomPushButton(i18n.t("Enter room"), new ClickListener() { - public void onClick(final Widget sender) { - presenter.onEnterRoom(); - } - }); - add(enterRoomBtn); - setEnterRoomEnabled(true); + enterRoomBtn = new CustomPushButton(i18n.t("Enter room"), new ClickListener() { + public void onClick(final Widget sender) { + presenter.onEnterRoom(); + } + }); + add(enterRoomBtn); + setEnterRoomEnabled(true); } public void setEnterRoomEnabled(final boolean isEnabled) { - enterRoomBtn.setEnabled(isEnabled); + enterRoomBtn.setEnabled(isEnabled); } } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ui/ChatRoomPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ui/ChatRoomPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/room/ui/ChatRoomPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -29,7 +29,7 @@ public class ChatRoomPanel implements ChatRoomView { public ChatRoomPanel(final WorkspaceSkeleton ws) { - ws.getEntityWorkspace().setContent(new Label("History of room conversations." + Site.IN_DEVELOPMENT)); + ws.getEntityWorkspace().setContent(new Label("History of room conversations." + Site.IN_DEVELOPMENT)); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -33,17 +33,17 @@ private final Provider<RoomsAdmin> roomAdminsProvider; public ChatContextPresenter(final WorkspaceDeckView view, final Provider<RoomsAdmin> roomAdminsProvider) { - this.view = view; - this.roomAdminsProvider = roomAdminsProvider; + this.view = view; + this.roomAdminsProvider = roomAdminsProvider; } public View getView() { - return view; + return view; } public void setState(final StateDTO state) { - final RoomsAdmin rooms = roomAdminsProvider.get(); - rooms.showRoom(state.getStateToken(), state.getContainer(), state.getContainerRights()); - view.show(rooms.getView()); + final RoomsAdmin rooms = roomAdminsProvider.get(); + rooms.showRoom(state.getStateToken(), state.getContainer(), state.getContainerRights()); + view.show(rooms.getView()); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/rooms/RoomsAdmin.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/rooms/RoomsAdmin.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/rooms/RoomsAdmin.java 2008-10-21 19:26:47 UTC (rev 917) @@ -28,5 +28,5 @@ public interface RoomsAdmin { View getView(); - public void showRoom(final StateToken token, final ContainerDTO container, final AccessRightsDTO rights); + void showRoom(final StateToken token, final ContainerDTO container, final AccessRightsDTO rights); } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/rooms/RoomsAdminPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/rooms/RoomsAdminPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/rooms/RoomsAdminPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -36,48 +36,48 @@ private final ContextNavigator contextNavigator; public RoomsAdminPresenter(final ContextNavigator contextNavigator, final I18nTranslationService i18n, - final Provider<StateManager> stateManagerProvider, final Session session, - final Provider<ContentServiceAsync> contentServiceProvider) { - this.contextNavigator = contextNavigator; - // final ContextNavigatorImages images = - // ContextNavigatorImages.App.getInstance(); - // contextNavigator.registerType(ChatClientTool.TYPE_CHAT, - // images.page()); - // contextNavigator.registerType(ChatClientTool.TYPE_ROOM, - // images.chatGreen()); - // contextNavigator.canCreate(i18n.t("New chat room"), i18n.t("Add a - // chat room"), new Listener<String>() { - // public void onEvent(final String name) { - // Site.showProgressProcessing(); - // final String groupShortName = - // session.getCurrentState().getGroup().getShortName(); - // final Long containerId = - // session.getCurrentState().getFolder().getId(); - // contentServiceProvider.get().addRoom(session.getUserHash(), - // groupShortName, containerId, - // groupShortName + "-" + name, new AsyncCallbackSimple<StateDTO>() { - // public void onSuccess(final StateDTO state) { - // final StateManager stateManager = stateManagerProvider.get(); - // stateManager.setRetrievedState(state); - // // FIXME: Isn't using cache (same in Add folder) - // stateManager.reloadContextAndTitles(); - // Site.hideProgress(); - // } - // }); - // } - // }); + final Provider<StateManager> stateManagerProvider, final Session session, + final Provider<ContentServiceAsync> contentServiceProvider) { + this.contextNavigator = contextNavigator; + // final ContextNavigatorImages images = + // ContextNavigatorImages.App.getInstance(); + // contextNavigator.registerType(ChatClientTool.TYPE_CHAT, + // images.page()); + // contextNavigator.registerType(ChatClientTool.TYPE_ROOM, + // images.chatGreen()); + // contextNavigator.canCreate(i18n.t("New chat room"), i18n.t("Add a + // chat room"), new Listener<String>() { + // public void onEvent(final String name) { + // Site.showProgressProcessing(); + // final String groupShortName = + // session.getCurrentState().getGroup().getShortName(); + // final Long containerId = + // session.getCurrentState().getFolder().getId(); + // contentServiceProvider.get().addRoom(session.getUserHash(), + // groupShortName, containerId, + // groupShortName + "-" + name, new AsyncCallbackSimple<StateDTO>() { + // public void onSuccess(final StateDTO state) { + // final StateManager stateManager = stateManagerProvider.get(); + // stateManager.setRetrievedState(state); + // // FIXME: Isn't using cache (same in Add folder) + // stateManager.reloadContextAndTitles(); + // Site.hideProgress(); + // } + // }); + // } + // }); } public View getView() { - return contextNavigator.getView(); + return contextNavigator.getView(); } public void showRoom(final StateToken token, final ContainerDTO container, final AccessRightsDTO rights) { - // contextNavigator.showContainer(token, container, rights); - // final String type = container.getTypeId(); - // if (type.equals(ChatClientTool.TYPE_ROOM)) { - // contextNavigator.setControlsVisible(false); - // } + // contextNavigator.showContainer(token, container, rights); + // final String type = container.getTypeId(); + // if (type.equals(ChatClientTool.TYPE_ROOM)) { + // contextNavigator.setControlsVisible(false); + // } } } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ui/TempPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ui/TempPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ui/TempPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -27,7 +27,7 @@ public class TempPanel extends Label implements View { public TempPanel() { - super("chat context: por defexto"); + super("chat context: por defexto"); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerModule.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerModule.java 2008-10-21 19:26:47 UTC (rev 917) @@ -25,11 +25,11 @@ public class ChatServerModule extends AbstractModule { public void configure() { - // To debug Smack, descomment this - // XMPPConnection.DEBUG_ENABLED = true; + // To debug Smack, descomment this + // XMPPConnection.DEBUG_ENABLED = true; - // FIXME: Dani: check this please - bind(ChatServerTool.class).asEagerSingleton(); + // FIXME: Dani: check this please + bind(ChatServerTool.class).asEagerSingleton(); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatException.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/ChatException.java 2008-10-21 19:26:47 UTC (rev 917) @@ -27,10 +27,10 @@ private static final long serialVersionUID = 1L; public ChatException(final XMPPException cause) { - super(cause); + super(cause); } public ChatException() { - super(""); + super(""); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppConnection.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppConnection.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppConnection.java 2008-10-21 19:26:47 UTC (rev 917) @@ -27,16 +27,16 @@ private final String userName; public XmppConnection(final String userName, final XMPPConnection conn) { - this.userName = userName; - this.conn = conn; + this.userName = userName; + this.conn = conn; } public XMPPConnection getConn() { - return conn; + return conn; } public String getUserName() { - return userName; + return userName; } } Modified: trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppRoom.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppRoom.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppRoom.java 2008-10-21 19:26:47 UTC (rev 917) @@ -31,30 +31,30 @@ private final MultiUserChat muc; public XmppRoom(final MultiUserChat muc, final String alias) { - this.muc = muc; - this.alias = alias; + this.muc = muc; + this.alias = alias; } public String getAlias() { - return alias; + return alias; } public void processPacket(final Packet packet) { - if (packet instanceof Message) { - processMessage((Message) packet); - } + if (packet instanceof Message) { + processMessage((Message) packet); + } } private void processMessage(final Message message) { - listener.onMessage(message.getFrom(), message.getTo(), message.getBody()); + listener.onMessage(message.getFrom(), message.getTo(), message.getBody()); } public void setListener(final RoomListener listener) { - this.listener = listener; + this.listener = listener; } public MultiUserChat getMuc() { - return muc; + return muc; } } Modified: trunk/src/main/java/org/ourproject/kune/docs/Kune-Docs.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/Kune-Docs.gwt.xml 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/Kune-Docs.gwt.xml 2008-10-21 19:26:47 UTC (rev 917) @@ -1,4 +1,4 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/releases/1.5/distro-source/cor…"> +<!DOCTYPE document SYSTEM "src/main/java/gwt-module.dtd"> <module> <inherits name='org.ourproject.kune.platf.Kune-Platform' /> <inherits name='org.ourproject.kune.workspace.Kune-Workspace' /> Modified: trunk/src/main/java/org/ourproject/kune/docs/client/Document.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/Document.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/Document.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.docs.client; - public interface Document { } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-10-21 19:26:47 UTC (rev 917) @@ -92,27 +92,39 @@ } private void createActions() { - final ActionToolbarMenuAndItemDescriptor<StateToken> addFolder = createFolderAction(TYPE_FOLDER, - "images/nav/folder_add.png", i18n.t("New folder"), i18n.t("Folder"), i18n.t("New"), i18n - .t("New folder")); - final ActionToolbarMenuAndItemDescriptor<StateToken> addGallery = createFolderAction(TYPE_GALLERY, - "images/nav/gallery_add.png", i18n.t("New gallery"), i18n.t("Folder"), i18n.t("New"), i18n - .t("New gallery")); + final ActionToolbarMenuAndItemDescriptor<StateToken> addFolder = createFolderAction( + TYPE_FOLDER, + "images/nav/folder_add.png", + i18n.t("New folder"), + i18n.t("Folder"), + i18n.t("New"), + i18n.t("New folder")); + final ActionToolbarMenuAndItemDescriptor<StateToken> addGallery = createFolderAction( + TYPE_GALLERY, + "images/nav/gallery_add.png", + i18n.t("New gallery"), + i18n.t("Folder"), + i18n.t("New"), + i18n.t("New gallery")); final ActionToolbarMenuAndItemDescriptor<StateToken> addWiki = createFolderAction(TYPE_WIKI, - "images/nav/wiki_add.png", i18n.t("New wiki"), i18n.t("Folder"), i18n.t("New"), i18n.t("wiki")); + "images/nav/wiki_add.png", + i18n.t("New wiki"), + i18n.t("Folder"), + i18n.t("New"), i18n.t("wiki")); final ActionToolbarMenuAndItemDescriptor<StateToken> addDoc = new ActionToolbarMenuAndItemDescriptor<StateToken>( AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { public void onEvent(final StateToken token) { Site.showProgressProcessing(); contentServiceProvider.get().addContent(session.getUserHash(), - session.getCurrentState().getStateToken(), i18n.t("New document"), - new AsyncCallbackSimple<StateDTO>() { - public void onSuccess(final StateDTO state) { - contextNavigator.setEditOnNextStateChange(true); - stateManager.setRetrievedState(state); - } - }); + session.getCurrentState().getStateToken(), + i18n.t("New document"), + new AsyncCallbackSimple<StateDTO>() { + public void onSuccess(final StateDTO state) { + contextNavigator.setEditOnNextStateChange(true); + stateManager.setRetrievedState(state); + } + }); } }); addDoc.setTextDescription(i18n.t("New document")); @@ -136,12 +148,12 @@ AccessRolDTO.Administrator, ActionToolbarPosition.topbar, new Listener<StateToken>() { public void onEvent(final StateToken token) { contentServiceProvider.get().delContent(session.getUserHash(), token, - new AsyncCallbackSimple<String>() { - public void onSuccess(final String result) { - final StateToken parent = token.clone().clearDocument(); - stateManager.gotoToken(parent); - } - }); + new AsyncCallbackSimple<String>() { + public void onSuccess(final String result) { + final StateToken parent = token.clone().clearDocument(); + stateManager.gotoToken(parent); + } + }); } }); delContent.setParentMenuTitle(i18n.t("File")); @@ -151,8 +163,7 @@ delContent.setConfirmationText(i18n.t("Are you sure?")); delContent.setEnableCondition(new ActionEnableCondition<StateToken>() { public boolean mustBeEnabled(final StateToken itemToken) { - final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent() - .getStateToken(); + final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent().getStateToken(); return !itemToken.equals(defContentToken); } }); @@ -200,8 +211,7 @@ goGroupHome.setIconUrl("images/group-home.png"); goGroupHome.setEnableCondition(new ActionEnableCondition<StateToken>() { public boolean mustBeEnabled(final StateToken itemToken) { - final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent() - .getStateToken(); + final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent().getStateToken(); return !itemToken.equals(defContentToken); } }); @@ -238,14 +248,19 @@ refreshCnt.setTextDescription(i18n.t("Refresh")); refreshCnt.setIconUrl("images/nav/refresh.png"); - final ActionToolbarButtonAndItemDescriptor<StateToken> uploadFile = createUploadAction(i18n.t("Upload file"), - "images/nav/upload.png", i18n.t("Upload some files (images, PDFs, ...)"), null); + final ActionToolbarButtonAndItemDescriptor<StateToken> uploadFile = createUploadAction( + i18n.t("Upload file"), + "images/nav/upload.png", + i18n.t("Upload some files (images, PDFs, ...)"), + null); session.onInitDataReceived(new Listener<InitDataDTO>() { public void onEvent(final InitDataDTO parameter) { - final ActionToolbarButtonAndItemDescriptor<StateToken> uploadMedia = createUploadAction(i18n - .t("Upload media"), "images/nav/upload.png", i18n.t("Upload some media (images, videos)"), - session.getGalleryPermittedExtensions()); + final ActionToolbarButtonAndItemDescriptor<StateToken> uploadMedia = createUploadAction( + i18n.t("Upload media"), + "images/nav/upload.png", + i18n.t("Upload some media (images, videos)"), + session.getGalleryPermittedExtensions()); contextActionRegistry.addAction(uploadMedia, TYPE_GALLERY); } }); @@ -274,17 +289,18 @@ final ActionToolbarMenuAndItemDescriptor<StateToken> setGroupLogo = new ActionToolbarMenuAndItemDescriptor<StateToken>( AccessRolDTO.Administrator, ActionToolbarPosition.topbar, new Listener<StateToken>() { public void onEvent(final StateToken token) { - groupServiceProvider.get().setGroupLogo(session.getUserHash(), token, - new AsyncCallbackSimple<GroupDTO>() { - public void onSuccess(GroupDTO newGroup) { - Site.info("Logo selected"); - if (session.getCurrentState().getGroup().getShortName().equals( - newGroup.getShortName())) { - session.getCurrentState().setGroup(newGroup); - } - entityLogo.refreshGroupLogo(); - } - }); + groupServiceProvider.get().setGroupFullLogo(session.getUserHash(), token, + new AsyncCallbackSimple<GroupDTO>() { + public void onSuccess(GroupDTO newGroup) { + Site.info("Logo selected"); + if (session.getCurrentState().getGroup().getShortName().equals( + newGroup.getShortName())) { + session.getCurrentState().setGroup( + newGroup); + } + entityLogo.refreshGroupLogo(); + } + }); } }); setGroupLogo.setParentMenuTitle(i18n.t("File")); @@ -298,15 +314,25 @@ }); final ActionToolbarMenuDescriptor<StateToken> setPublishStatus = createSetStatusAction( - AccessRolDTO.Administrator, i18n.t("Published online"), ContentStatusDTO.publishedOnline); + AccessRolDTO.Administrator, + i18n.t("Published online"), + ContentStatusDTO.publishedOnline); final ActionToolbarMenuDescriptor<StateToken> setEditionInProgressStatus = createSetStatusAction( - AccessRolDTO.Administrator, i18n.t("Editing in progress"), ContentStatusDTO.editingInProgress); + AccessRolDTO.Administrator, + i18n.t("Editing in progress"), + ContentStatusDTO.editingInProgress); final ActionToolbarMenuDescriptor<StateToken> setRejectStatus = createSetStatusAction( - AccessRolDTO.Administrator, i18n.t("Rejected"), ContentStatusDTO.rejected); + AccessRolDTO.Administrator, + i18n.t("Rejected"), + ContentStatusDTO.rejected); final ActionToolbarMenuDescriptor<StateToken> setSubmittedForPublishStatus = createSetStatusAction( - AccessRolDTO.Administrator, i18n.t("Submitted for publish"), ContentStatusDTO.publishedOnline); + AccessRolDTO.Administrator, + i18n.t("Submitted for publish"), + ContentStatusDTO.publishedOnline); final ActionToolbarMenuDescriptor<StateToken> setInTheDustBinStatus = createSetStatusAction( - AccessRolDTO.Administrator, i18n.t("In the dustbin"), ContentStatusDTO.inTheDustbin); + AccessRolDTO.Administrator, + i18n.t("In the dustbin"), + ContentStatusDTO.inTheDustbin); final ActionToolbarButtonDescriptor<StateToken> translateContent = new ActionToolbarButtonDescriptor<StateToken>( AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { @@ -330,27 +356,31 @@ public void onEvent(final String html) { Site.showProgressSaving(); contentServiceProvider.get().save(session.getUserHash(), stateToken, html, - new AsyncCallback<Integer>() { - public void onFailure(final Throwable caught) { - Site.hideProgress(); - try { - throw caught; - } catch (final SessionExpiredException e) { - errorHandler.doSessionExpired(); - } catch (final Throwable e) { - Site.error(i18n.t("Error saving document. Retrying...")); - errorHandler.process(caught); - editor.onSaveFailed(); - } - } + new AsyncCallback<Integer>() { + public void onFailure( + final Throwable caught) { + Site.hideProgress(); + try { + throw caught; + } catch (final SessionExpiredException e) { + errorHandler.doSessionExpired(); + } catch (final Throwable e) { + Site.error(i18n.t("Error saving document. Retrying...")); + errorHandler.process(caught); + editor.onSaveFailed(); + } + } - public void onSuccess(final Integer newVersion) { - Site.hideProgress(); - session.getCurrentState().setVersion(newVersion); - session.getCurrentState().setContent(html); - editor.onSaved(); - } - }); + public void onSuccess( + final Integer newVersion) { + Site.hideProgress(); + session.getCurrentState().setVersion( + newVersion); + session.getCurrentState().setContent( + html); + editor.onSaved(); + } + }); } }, new Listener0() { public void onEvent() { @@ -396,11 +426,11 @@ contentActionRegistry.addAction(setAsDefGroupCnt, TYPE_DOCUMENT, TYPE_UPLOADEDFILE); contentActionRegistry.addAction(setAsDefGroupCxt, TYPE_BLOG); contextActionRegistry.addAction(goGroupHome, containers); - contentActionRegistry.addAction(setGroupLogo, TYPE_UPLOADEDFILE); + // contentActionRegistry.addAction(setGroupLogo, TYPE_UPLOADEDFILE); contextActionRegistry.addAction(downloadCtx, TYPE_UPLOADEDFILE); contentActionRegistry.addAction(editContent, TYPE_DOCUMENT, TYPE_POST, TYPE_WIKIPAGE); contentActionRegistry.addAction(translateContent, TYPE_DOCUMENT, TYPE_FOLDER, TYPE_GALLERY, TYPE_UPLOADEDFILE, - TYPE_WIKI, TYPE_WIKIPAGE); + TYPE_WIKI, TYPE_WIKIPAGE); } private ActionToolbarMenuAndItemDescriptor<StateToken> createFolderAction(final String contentTypeId, @@ -412,12 +442,12 @@ public void onEvent(final StateToken stateToken) { Site.showProgressProcessing(); contentServiceProvider.get().addFolder(session.getUserHash(), stateToken, defaultName, - contentTypeId, new AsyncCallbackSimple<StateDTO>() { - public void onSuccess(final StateDTO state) { - contextNavigator.setEditOnNextStateChange(true); - stateManager.setRetrievedState(state); - } - }); + contentTypeId, new AsyncCallbackSimple<StateDTO>() { + public void onSuccess(final StateDTO state) { + contextNavigator.setEditOnNextStateChange(true); + stateManager.setRetrievedState(state); + } + }); } }); addFolder.setTextDescription(textDescription); @@ -434,21 +464,22 @@ public void onEvent(final StateToken token) { Site.showProgressProcessing(); contentServiceProvider.get().setAsDefaultContent(session.getUserHash(), token, - new AsyncCallbackSimple<ContentSimpleDTO>() { - public void onSuccess(final ContentSimpleDTO defContent) { - session.getCurrentState().getGroup().setDefaultContent(defContent); - Site.hideProgress(); - Site.info(i18n.t("Document selected as the group homepage")); - } - }); + new AsyncCallbackSimple<ContentSimpleDTO>() { + public void onSuccess( + final ContentSimpleDTO defContent) { + session.getCurrentState().getGroup().setDefaultContent( + defContent); + Site.hideProgress(); + Site.info(i18n.t("Document selected as the group homepage")); + } + }); } }); setAsDefGroupContent.setTextDescription(i18n.t("Set this as the group default page")); setAsDefGroupContent.setIconUrl("images/group-home.png"); setAsDefGroupContent.setEnableCondition(new ActionEnableCondition<StateToken>() { public boolean mustBeEnabled(final StateToken itemToken) { - final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent() - .getStateToken(); + final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent().getStateToken(); return !itemToken.equals(defContentToken); } }); @@ -467,7 +498,7 @@ }; if (status.equals(ContentStatusDTO.publishedOnline) || status.equals(ContentStatusDTO.rejected)) { contentServiceProvider.get().setStatusAsAdmin(session.getUserHash(), stateToken, status, - callback); + callback); } else { contentServiceProvider.get().setStatus(session.getUserHash(), stateToken, status, callback); } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-10-21 19:26:47 UTC (rev 917) @@ -30,6 +30,7 @@ import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; +import org.ourproject.kune.platf.client.services.I18nTranslationService; import org.ourproject.kune.platf.client.services.KuneErrorHandler; import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; @@ -123,7 +124,8 @@ register(Singleton.class, new Factory<DocumentReader>(DocumentReader.class) { @Override public DocumentReader create() { - final DocumentReaderView view = new DocumentReaderPanel($(WorkspaceSkeleton.class)); + final DocumentReaderView view = new DocumentReaderPanel($(WorkspaceSkeleton.class), + $(I18nTranslationService.class)); final DocumentReaderPresenter presenter = new DocumentReaderPresenter(view, $$(FileDownloadUtils.class)); return presenter; } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2008-10-21 19:26:47 UTC (rev 917) @@ -52,69 +52,69 @@ private final ContentIconsRegistry contentIconsRegistry; public DocumentClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector, - final WsThemePresenter wsThemePresenter, final WorkspaceSkeleton ws, - final Provider<DocumentContext> documentContextProvider, - final Provider<ContentServiceAsync> contentServiceProvider, - final ContentActionRegistry contentActionRegistry, final DragDropContentRegistry dragDropContentRegistry, - final ContentIconsRegistry contentIconsRegistry) { - super(NAME, i18n.t("documents"), toolSelector, wsThemePresenter, ws); - this.documentContextProvider = documentContextProvider; - this.dragDropContentRegistry = dragDropContentRegistry; - this.contentIconsRegistry = contentIconsRegistry; - registerDragDropTypes(); - registerIcons(); + final WsThemePresenter wsThemePresenter, final WorkspaceSkeleton ws, + final Provider<DocumentContext> documentContextProvider, + final Provider<ContentServiceAsync> contentServiceProvider, + final ContentActionRegistry contentActionRegistry, final DragDropContentRegistry dragDropContentRegistry, + final ContentIconsRegistry contentIconsRegistry) { + super(NAME, i18n.t("documents"), toolSelector, wsThemePresenter, ws); + this.documentContextProvider = documentContextProvider; + this.dragDropContentRegistry = dragDropContentRegistry; + this.contentIconsRegistry = contentIconsRegistry; + registerDragDropTypes(); + registerIcons(); } public String getName() { - return NAME; + return NAME; } @Deprecated public void onCancel() { - documentContextProvider.get().showFolders(); + documentContextProvider.get().showFolders(); } @Deprecated public void onEdit() { - documentContextProvider.get().showAdmin(); + documentContextProvider.get().showAdmin(); } private void registerDragDropTypes() { - dragDropContentRegistry.registerDraggableType(TYPE_DOCUMENT); - dragDropContentRegistry.registerDraggableType(TYPE_FOLDER); - dragDropContentRegistry.registerDraggableType(TYPE_UPLOADEDFILE); + dragDropContentRegistry.registerDraggableType(TYPE_DOCUMENT); + dragDropContentRegistry.registerDraggableType(TYPE_FOLDER); + dragDropContentRegistry.registerDraggableType(TYPE_UPLOADEDFILE); - dragDropContentRegistry.registerDroppableType(TYPE_ROOT); - dragDropContentRegistry.registerDroppableType(TYPE_FOLDER); - dragDropContentRegistry.registerDroppableType(TYPE_GALLERY); + dragDropContentRegistry.registerDroppableType(TYPE_ROOT); + dragDropContentRegistry.registerDroppableType(TYPE_FOLDER); + dragDropContentRegistry.registerDroppableType(TYPE_GALLERY); } private void registerIcons() { - contentIconsRegistry.registerContentTypeIcon(TYPE_FOLDER, "images/nav/folder.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_BLOG, "images/nav/blog.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_GALLERY, "images/nav/gallery.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_DOCUMENT, "images/nav/page.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_POST, "images/nav/post.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_WIKI, "images/nav/wiki.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_WIKIPAGE, "images/nav/wikipage.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("image"), - "images/nav/picture.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("video"), - "images/nav/film.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("application", "pdf"), - "images/nav/page_pdf.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("application", "zip"), - "images/nav/page_zip.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("application", "zip"), - "images/nav/page_zip.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("text"), - "images/nav/page_text.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("application", "msword"), - "images/nav/page_word.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("application", "excel"), - "images/nav/page_excel.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("application", - "mspowerpoint"), "images/nav/page_pps.png"); - contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, "images/nav/page.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_FOLDER, "images/nav/folder.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_BLOG, "images/nav/blog.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_GALLERY, "images/nav/gallery.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_DOCUMENT, "images/nav/page.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_POST, "images/nav/post.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_WIKI, "images/nav/wiki.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_WIKIPAGE, "images/nav/wikipage.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("image"), + "images/nav/picture.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("video"), + "images/nav/film.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("application", "pdf"), + "images/nav/page_pdf.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("application", "zip"), + "images/nav/page_zip.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("application", "zip"), + "images/nav/page_zip.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("text"), + "images/nav/page_text.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("application", "msword"), + "images/nav/page_word.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("application", "excel"), + "images/nav/page_excel.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, new BasicMimeTypeDTO("application", + "mspowerpoint"), "images/nav/page_pps.png"); + contentIconsRegistry.registerContentTypeIcon(TYPE_UPLOADEDFILE, "images/nav/page.png"); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -10,10 +10,10 @@ private final WorkspaceSkeleton ws; public DocumentContentPanel(final WorkspaceSkeleton ws) { - this.ws = ws; + this.ws = ws; } public void setContent(final View view) { - ws.getEntityWorkspace().setContent((Widget) view); + ws.getEntityWorkspace().setContent((Widget) view); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -47,71 +47,71 @@ private final ActionRegistry<StateToken> actionRegistry; public DocumentContentPresenter(final StateManager stateManager, final Session session, - final Provider<DocumentReader> docReaderProvider, final Provider<TextEditor> textEditorProvider, - final Provider<FolderViewer> folderViewerProvider, final ActionToolbar<StateToken> toolbar, - final ActionRegistry<StateToken> actionRegistry) { - this.session = session; - this.docReaderProvider = docReaderProvider; - this.textEditorProvider = textEditorProvider; - this.folderViewerProvider = folderViewerProvider; - this.toolbar = toolbar; - this.actionRegistry = actionRegistry; - stateManager.onStateChanged(new Listener<StateDTO>() { - public void onEvent(final StateDTO state) { - if (state.getToolName().equals(DocumentClientTool.NAME)) { - setState(state); - } - } - }); - stateManager.onToolChanged(new Listener2<String, String>() { - public void onEvent(final String oldTool, final String newTool) { - if (oldTool != null && oldTool.equals(DocumentClientTool.NAME)) { - toolbar.detach(); - } - } - }); + final Provider<DocumentReader> docReaderProvider, final Provider<TextEditor> textEditorProvider, + final Provider<FolderViewer> folderViewerProvider, final ActionToolbar<StateToken> toolbar, + final ActionRegistry<StateToken> actionRegistry) { + this.session = session; + this.docReaderProvider = docReaderProvider; + this.textEditorProvider = textEditorProvider; + this.folderViewerProvider = folderViewerProvider; + this.toolbar = toolbar; + this.actionRegistry = actionRegistry; + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(final StateDTO state) { + if (state.getToolName().equals(DocumentClientTool.NAME)) { + setState(state); + } + } + }); + stateManager.onToolChanged(new Listener2<String, String>() { + public void onEvent(final String oldTool, final String newTool) { + if (oldTool != null && oldTool.equals(DocumentClientTool.NAME)) { + toolbar.detach(); + } + } + }); } public void detach() { - toolbar.detach(); + toolbar.detach(); } public void init(final DocumentContentView view) { - this.view = view; + this.view = view; } public void refreshState() { - setState(session.getCurrentState()); + setState(session.getCurrentState()); } private void setState(final StateDTO state) { - content = state; - final String typeId = content.getTypeId(); - ActionItemCollection<StateToken> collection; - if (content.hasDocument()) { - collection = actionRegistry.getCurrentActions(content.getStateToken(), typeId, session.isLogged(), content - .getContentRights(), true); - } else { - collection = actionRegistry.getCurrentActions(content.getStateToken(), typeId, session.isLogged(), content - .getContainerRights(), true); - } - toolbar.disableMenusAndClearButtons(); - toolbar.setActions(collection); - toolbar.attach(); - showContent(); + content = state; + final String typeId = content.getTypeId(); + ActionItemCollection<StateToken> collection; + if (content.hasDocument()) { + collection = actionRegistry.getCurrentActions(content.getStateToken(), typeId, session.isLogged(), + content.getContentRights(), true); + } else { + collection = actionRegistry.getCurrentActions(content.getStateToken(), typeId, session.isLogged(), + content.getContainerRights(), true); + } + toolbar.disableMenusAndClearButtons(); + toolbar.setActions(collection); + toolbar.attach(); + showContent(); } private void showContent() { - // textEditorProvider.get().setToolbarVisible(false); - if (content.hasDocument()) { - docReaderProvider.get().showDocument(content.getStateToken(), content.getContent(), content.getTypeId(), - content.getMimeType()); - textEditorProvider.get().reset(); - } else { - final FolderViewer viewer = folderViewerProvider.get(); - viewer.setFolder(content.getContainer()); - view.setContent(viewer.getView()); - } + // textEditorProvider.get().setToolbarVisible(false); + if (content.hasDocument()) { + docReaderProvider.get().showDocument(content.getStateToken(), content.getContent(), content.getTypeId(), + content.getMimeType()); + textEditorProvider.get().reset(); + } else { + final FolderViewer viewer = folderViewerProvider.get(); + viewer.setFolder(content.getContainer()); + view.setContent(viewer.getView()); + } } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/folder/viewer/FolderViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/folder/viewer/FolderViewerPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/folder/viewer/FolderViewerPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -28,11 +28,11 @@ private final FolderViewerView view; public FolderViewerPresenter(final FolderViewerView view) { - this.view = view; + this.view = view; } public View getView() { - return view; + return view; } public void setFolder(final ContainerDTO folder) { Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -48,8 +48,8 @@ if (mimeType != null) { FileDownloadUtils fileDownloadUtils = downloadProvider.get(); if (mimeType.getType().equals("image")) { - view.showImage(fileDownloadUtils.getImageUrl(token), fileDownloadUtils.getImageResizedUrl(token, - ImageSize.sized)); + view.showImage(fileDownloadUtils.getImageUrl(token), + fileDownloadUtils.getImageResizedUrl(token, ImageSize.sized)); } else if (mimeType.toString().equals("text/plain") || mimeType.toString().equals("application/pdf")) { view.setContent(text); } else { Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderView.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderView.java 2008-10-21 19:26:47 UTC (rev 917) @@ -24,8 +24,8 @@ public interface DocumentReaderView extends View { - public void setContent(String content); + void setContent(String content); - public void showImage(String imageUrl, String imageResizedUrl); + void showImage(String imageUrl, String imageResizedUrl); } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/ui/DocumentReaderPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/ui/DocumentReaderPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/ui/DocumentReaderPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -21,6 +21,8 @@ package org.ourproject.kune.docs.client.cnt.reader.ui; import org.ourproject.kune.docs.client.cnt.reader.DocumentReaderView; +import org.ourproject.kune.platf.client.services.I18nTranslationService; +import org.ourproject.kune.platf.client.ui.KuneUiUtils; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.google.gwt.user.client.ui.ClickListener; @@ -31,9 +33,11 @@ public class DocumentReaderPanel implements DocumentReaderView { private final WorkspaceSkeleton ws; + private final I18nTranslationService i18n; - public DocumentReaderPanel(final WorkspaceSkeleton ws) { + public DocumentReaderPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { this.ws = ws; + this.i18n = i18n; } public void setContent(final String content) { @@ -45,6 +49,8 @@ public void showImage(String imageUrl, String imageResizedUrl) { final Image imgOrig = new Image(imageUrl); final Image imgResized = new Image(imageResizedUrl); + KuneUiUtils.setQuickTip(imgOrig, i18n.t("Click to zoom out")); + KuneUiUtils.setQuickTip(imgResized, i18n.t("Click to zoom in")); setDefStyle(imgOrig); setDefStyle(imgResized); imgOrig.addStyleName("kune-pointer"); Modified: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContext.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContext.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContext.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.docs.client.ctx; - public interface DocumentContext { void showAdmin(); Modified: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -10,7 +10,7 @@ @Deprecated public void setContainer(final View view) { - // ws.getEntityWorkspace().setContext((Widget) view); + // ws.getEntityWorkspace().setContext((Widget) view); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -35,34 +35,34 @@ private final Provider<AdminContext> adminContextProvider; public DocumentContextPresenter(final StateManager stateManager, - final Provider<ContextNavigator> contextNavigatorProvider, final Provider<AdminContext> adminContextProvider) { - this.contextNavigatorProvider = contextNavigatorProvider; - this.adminContextProvider = adminContextProvider; - stateManager.onStateChanged(new Listener<StateDTO>() { - public void onEvent(final StateDTO state) { - if (DocumentClientTool.NAME.equals(state.getToolName())) { - setState(state); - } - } - }); + final Provider<ContextNavigator> contextNavigatorProvider, final Provider<AdminContext> adminContextProvider) { + this.contextNavigatorProvider = contextNavigatorProvider; + this.adminContextProvider = adminContextProvider; + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(final StateDTO state) { + if (DocumentClientTool.NAME.equals(state.getToolName())) { + setState(state); + } + } + }); } public void init(final DocumentContextView view) { - this.view = view; + this.view = view; } public void showAdmin() { - final AdminContext adminContext = adminContextProvider.get(); - view.setContainer(adminContext.getView()); + final AdminContext adminContext = adminContextProvider.get(); + view.setContainer(adminContext.getView()); } public void showFolders() { - view.setContainer(contextNavigatorProvider.get().getView()); + view.setContainer(contextNavigatorProvider.get().getView()); } private void setState(final StateDTO state) { - contextNavigatorProvider.get().setState(state, true); - adminContextProvider.get().setState(state); - showFolders(); + contextNavigatorProvider.get().setState(state, true); + adminContextProvider.get().setState(state); + showFolders(); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/AdminContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/AdminContextPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/AdminContextPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -51,121 +51,121 @@ private final StateManager stateManager; public AdminContextPresenter(final Session session, final StateManager stateManager, - final Provider<TagsSummary> tagsSummaryProvider, - final Provider<ContentServiceAsync> contentServiceProvider, final EntityTitle entityTitle, - final EntitySubTitle entitySubTitle) { - this.session = session; - this.stateManager = stateManager; - this.tagsSummaryProvider = tagsSummaryProvider; - this.contentServiceProvider = contentServiceProvider; - this.entityTitle = entityTitle; - this.entitySubTitle = entitySubTitle; + final Provider<TagsSummary> tagsSummaryProvider, + final Provider<ContentServiceAsync> contentServiceProvider, final EntityTitle entityTitle, + final EntitySubTitle entitySubTitle) { + this.session = session; + this.stateManager = stateManager; + this.tagsSummaryProvider = tagsSummaryProvider; + this.contentServiceProvider = contentServiceProvider; + this.entityTitle = entityTitle; + this.entitySubTitle = entitySubTitle; } public void addAuthor(final String authorShortName) { - Site.showProgressProcessing(); - final StateDTO currentState = session.getCurrentState(); - contentServiceProvider.get().addAuthor(session.getUserHash(), currentState.getStateToken(), authorShortName, - new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - Site.hideProgress(); - stateManager.reload(); - } - }); + Site.showProgressProcessing(); + final StateDTO currentState = session.getCurrentState(); + contentServiceProvider.get().addAuthor(session.getUserHash(), currentState.getStateToken(), authorShortName, + new AsyncCallbackSimple<Object>() { + public void onSuccess(final Object result) { + Site.hideProgress(); + stateManager.reload(); + } + }); } public void delAuthor(final String authorShortName) { - Site.showProgressProcessing(); - final StateDTO currentState = session.getCurrentState(); - contentServiceProvider.get().removeAuthor(session.getUserHash(), currentState.getStateToken(), authorShortName, - new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - Site.hideProgress(); - stateManager.reload(); - } - }); + Site.showProgressProcessing(); + final StateDTO currentState = session.getCurrentState(); + contentServiceProvider.get().removeAuthor(session.getUserHash(), currentState.getStateToken(), authorShortName, + new AsyncCallbackSimple<Object>() { + public void onSuccess(final Object result) { + Site.hideProgress(); + stateManager.reload(); + } + }); } public void doChangeLanguage(final String langCode) { - Site.showProgressProcessing(); - final StateDTO currentState = session.getCurrentState(); - contentServiceProvider.get().setLanguage(session.getUserHash(), currentState.getStateToken(), langCode, - new AsyncCallbackSimple<I18nLanguageDTO>() { - public void onSuccess(final I18nLanguageDTO lang) { - Site.hideProgress(); - entitySubTitle.setContentLanguage(lang.getEnglishName()); - } - }); + Site.showProgressProcessing(); + final StateDTO currentState = session.getCurrentState(); + contentServiceProvider.get().setLanguage(session.getUserHash(), currentState.getStateToken(), langCode, + new AsyncCallbackSimple<I18nLanguageDTO>() { + public void onSuccess(final I18nLanguageDTO lang) { + Site.hideProgress(); + entitySubTitle.setContentLanguage(lang.getEnglishName()); + } + }); } public View getView() { - return view; + return view; } public void init(final AdminContextView view) { - this.view = view; + this.view = view; } public void setPublishedOn(final Date publishedOn) { - Site.showProgressProcessing(); - final StateDTO currentState = session.getCurrentState(); - contentServiceProvider.get().setPublishedOn(session.getUserHash(), currentState.getStateToken(), publishedOn, - new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - Site.hideProgress(); - entityTitle.setContentDate(publishedOn); - } - }); + Site.showProgressProcessing(); + final StateDTO currentState = session.getCurrentState(); + contentServiceProvider.get().setPublishedOn(session.getUserHash(), currentState.getStateToken(), publishedOn, + new AsyncCallbackSimple<Object>() { + public void onSuccess(final Object result) { + Site.hideProgress(); + entityTitle.setContentDate(publishedOn); + } + }); } public void setState(final StateDTO content) { - // In the future check the use of these components by each tool - final I18nLanguageDTO language = content.getLanguage(); - final AccessListsDTO accessLists = content.getAccessLists(); - final Date publishedOn = content.getPublishedOn(); - final String tags = content.getTags(); - final List<UserSimpleDTO> authors = content.getAuthors(); + // In the future check the use of these components by each tool + final I18nLanguageDTO language = content.getLanguage(); + final AccessListsDTO accessLists = content.getAccessLists(); + final Date publishedOn = content.getPublishedOn(); + final String tags = content.getTags(); + final List<UserSimpleDTO> authors = content.getAuthors(); - if (content.hasDocument()) { - if (tags != null) { - view.setTags(tags); - } else { - view.removeTagsComponent(); - } - if (language != null) { - view.setLanguage(language); - } else { - view.removeLangComponent(); - } - if (authors != null) { - view.setAuthors(authors); - } else { - view.removeAuthorsComponent(); - } - if (publishedOn != null) { - view.setPublishedOn(publishedOn); - } else { - view.removePublishedOnComponent(); - } - if (accessLists != null) { - view.setAccessLists(accessLists); - } else { - view.removeAccessListComponent(); - } - } + if (content.hasDocument()) { + if (tags != null) { + view.setTags(tags); + } else { + view.removeTagsComponent(); + } + if (language != null) { + view.setLanguage(language); + } else { + view.removeLangComponent(); + } + if (authors != null) { + view.setAuthors(authors); + } else { + view.removeAuthorsComponent(); + } + if (publishedOn != null) { + view.setPublishedOn(publishedOn); + } else { + view.removePublishedOnComponent(); + } + if (accessLists != null) { + view.setAccessLists(accessLists); + } else { + view.removeAccessListComponent(); + } + } } public void setTags(final String tagsString) { - Site.showProgressProcessing(); - final StateDTO currentState = session.getCurrentState(); - contentServiceProvider.get().setTags(session.getUserHash(), currentState.getStateToken(), tagsString, - new AsyncCallbackSimple<List<TagResultDTO>>() { - public void onSuccess(final List<TagResultDTO> result) { - tagsSummaryProvider.get().setGroupTags(result); - Site.hideProgress(); - } - }); + Site.showProgressProcessing(); + final StateDTO currentState = session.getCurrentState(); + contentServiceProvider.get().setTags(session.getUserHash(), currentState.getStateToken(), tagsString, + new AsyncCallbackSimple<List<TagResultDTO>>() { + public void onSuccess(final List<TagResultDTO> result) { + tagsSummaryProvider.get().setGroupTags(result); + Site.hideProgress(); + } + }); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/ui/AdminContextPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/ui/AdminContextPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/ui/AdminContextPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -57,140 +57,140 @@ // private final String tags_item; public AdminContextPanel(final AdminContextPresenter presenter, final I18nTranslationService i18n) { - // this.presenter = presenter; - // this.i18n = i18n; - // //options = new IndexedStackPanelWithSubItems(); - // //options.addStyleName("kune-AdminContextPanel"); - // - // //add(options); - // //setCellWidth(options, "100%"); - // setWidth("100%"); - // authors_item = i18n.t("Authors"); - // publication_item = i18n.t("Publication"); - // perms_item = i18n.t("Permissions"); - // language_item = i18n.t("Language"); - // tags_item = i18n.t("Tags"); + // this.presenter = presenter; + // this.i18n = i18n; + // //options = new IndexedStackPanelWithSubItems(); + // //options.addStyleName("kune-AdminContextPanel"); + // + // //add(options); + // //setCellWidth(options, "100%"); + // setWidth("100%"); + // authors_item = i18n.t("Authors"); + // publication_item = i18n.t("Publication"); + // perms_item = i18n.t("Permissions"); + // language_item = i18n.t("Language"); + // tags_item = i18n.t("Tags"); } public void removeAccessListComponent() { - // if (options.containsItem(perms_item)) { - // removeComponent(perms_item); - // } + // if (options.containsItem(perms_item)) { + // removeComponent(perms_item); + // } } public void removeAuthorsComponent() { - // if (options.containsItem(authors_item)) { - // removeComponent(authors_item); - // } + // if (options.containsItem(authors_item)) { + // removeComponent(authors_item); + // } } public void removeLangComponent() { - // if (options.containsItem(language_item)) { - // removeComponent(language_item); - // } + // if (options.containsItem(language_item)) { + // removeComponent(language_item); + // } } public void removePublishedOnComponent() { - // if (options.containsItem(publication_item)) { - // removeComponent(publication_item); - // } + // if (options.containsItem(publication_item)) { + // removeComponent(publication_item); + // } } public void removeTagsComponent() { - // if (options.containsItem(tags_item)) { - // removeComponent(tags_item); - // } + // if (options.containsItem(tags_item)) { + // removeComponent(tags_item); + // } } public void reset() { - // options.clear(); + // options.clear(); } public void setAccessLists(final AccessListsDTO accessLists) { - // if (accessListsPanel == null) { - // accessListsPanel = new AccessListsPanel(i18n); - // } - // if (!options.containsItem(perms_item)) { - // addComponent(perms_item, i18n.t("Who can admin/edit/view this work"), - // accessListsPanel); - // } - // accessListsPanel.setAccessLists(accessLists); + // if (accessListsPanel == null) { + // accessListsPanel = new AccessListsPanel(i18n); + // } + // if (!options.containsItem(perms_item)) { + // addComponent(perms_item, i18n.t("Who can admin/edit/view this work"), + // accessListsPanel); + // } + // accessListsPanel.setAccessLists(accessLists); } public void setAuthors(final List<UserSimpleDTO> authors) { - // if (authorsComponent == null) { - // authorsComponent = new VerticalPanel(); - // addAuthorLabel = new IconLabel(IMG.addGreen(), i18n.t("Add author")); - // addAuthorLabel.addClickListener(new ClickListener() { - // public void onClick(final Widget sender) { - // presenter.doAction(DocsEvents.ADD_AUTHOR, null); - // } - // }); - // } else { - // if (options.containsItem(authors_item)) { - // options.removeStackItem(authors_item); - // } - // authorsComponent.clear(); - // } - // if (!options.containsItem(authors_item)) { - // addComponent(authors_item, i18n.t("Authors of this work"), - // authorsComponent); - // } - // for (final Iterator<UserSimpleDTO> iterator = authors.iterator(); - // iterator.hasNext();) { - // final UserSimpleDTO author = iterator.next(); - // final StackSubItemAction[] authorActions = { new - // StackSubItemAction(IMG.del(), i18n.t("Remove author"), - // DocsEvents.REMOVE_AUTHOR) }; - // options.addStackSubItem(authors_item, IMG.personDef(), - // author.getShortName(), author.getName(), - // authorActions, presenter); - // } - // authorsComponent.add(addAuthorLabel); + // if (authorsComponent == null) { + // authorsComponent = new VerticalPanel(); + // addAuthorLabel = new IconLabel(IMG.addGreen(), i18n.t("Add author")); + // addAuthorLabel.addClickListener(new ClickListener() { + // public void onClick(final Widget sender) { + // presenter.doAction(DocsEvents.ADD_AUTHOR, null); + // } + // }); + // } else { + // if (options.containsItem(authors_item)) { + // options.removeStackItem(authors_item); + // } + // authorsComponent.clear(); + // } + // if (!options.containsItem(authors_item)) { + // addComponent(authors_item, i18n.t("Authors of this work"), + // authorsComponent); + // } + // for (final Iterator<UserSimpleDTO> iterator = authors.iterator(); + // iterator.hasNext();) { + // final UserSimpleDTO author = iterator.next(); + // final StackSubItemAction[] authorActions = { new + // StackSubItemAction(IMG.del(), i18n.t("Remove author"), + // DocsEvents.REMOVE_AUTHOR) }; + // options.addStackSubItem(authors_item, IMG.personDef(), + // author.getShortName(), author.getName(), + // authorActions, presenter); + // } + // authorsComponent.add(addAuthorLabel); } public void setLanguage(final I18nLanguageDTO language) { - // if (langComponent == null) { - // langPresenter = WorkspaceFactory.createLanguageSelectorComponent(); - // langComponent = new VerticalPanel(); - // final LanguageSelectorPanel view = (LanguageSelectorPanel) - // langPresenter.getView(); - // view.setWidth("" + FORMS_WIDTH); - // langComponent.add(view); - // view.addChangeListener(new ComboBoxListenerAdapter() { - // public void onSelect(final ComboBox comboBox, final Record record, - // final int index) { - // presenter.doChangeLanguage(record.getAsString(LanguageSelectorPanel.LANG_ID)); - // } - // }); - // } - // if (!options.containsItem(language_item)) { - // addComponent(language_item, i18n.t("The language of this work"), - // langComponent); - // } - // langPresenter.setLanguage(language); + // if (langComponent == null) { + // langPresenter = WorkspaceFactory.createLanguageSelectorComponent(); + // langComponent = new VerticalPanel(); + // final LanguageSelectorPanel view = (LanguageSelectorPanel) + // langPresenter.getView(); + // view.setWidth("" + FORMS_WIDTH); + // langComponent.add(view); + // view.addChangeListener(new ComboBoxListenerAdapter() { + // public void onSelect(final ComboBox comboBox, final Record record, + // final int index) { + // presenter.doChangeLanguage(record.getAsString(LanguageSelectorPanel.LANG_ID)); + // } + // }); + // } + // if (!options.containsItem(language_item)) { + // addComponent(language_item, i18n.t("The language of this work"), + // langComponent); + // } + // langPresenter.setLanguage(language); } public void setPublishedOn(final Date publishedOn) { - // if (publishedOnField == null) { - // publishedOnComponent = createPublicationComponent(); - // } - // if (!options.containsItem(publication_item)) { - // addComponent(publication_item, i18n.t("Date of publication of this - // work"), publishedOnComponent); - // } - // // publishedOnField.setValue(publishedOn); + // if (publishedOnField == null) { + // publishedOnComponent = createPublicationComponent(); + // } + // if (!options.containsItem(publication_item)) { + // addComponent(publication_item, i18n.t("Date of publication of this + // work"), publishedOnComponent); + // } + // // publishedOnField.setValue(publishedOn); } public void setTags(final String tags) { - // if (tagsComponent == null) { - // tagsComponent = createTagsComponent(); - // } - // if (!options.containsItem(tags_item)) { - // addComponent(tags_item, i18n.t("Keywords or terms associated with - // this work"), tagsComponent); - // } - // tagsField.setValue(tags); + // if (tagsComponent == null) { + // tagsComponent = createTagsComponent(); + // } + // if (!options.containsItem(tags_item)) { + // addComponent(tags_item, i18n.t("Keywords or terms associated with + // this work"), tagsComponent); + // } + // tagsField.setValue(tags); } // private void addComponent(final String header, final String headerTitle, Modified: trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerModule.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerModule.java 2008-10-21 19:26:47 UTC (rev 917) @@ -25,6 +25,6 @@ public class DocumentServerModule implements Module { public void configure(final Binder binder) { - binder.bind(DocumentServerTool.class).asEagerSingleton(); + binder.bind(DocumentServerTool.class).asEagerSingleton(); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/Kune-Platform.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/Kune-Platform.gwt.xml 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/Kune-Platform.gwt.xml 2008-10-21 19:26:47 UTC (rev 917) @@ -1,4 +1,4 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/releases/1.5/distro-source/cor…"> +<!DOCTYPE document SYSTEM "src/main/java/gwt-module.dtd"> <module>  <inherits name='com.google.gwt.user.User' /> 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java 2008-10-21 19:26:47 UTC (rev 917) @@ -26,109 +26,109 @@ private ActionEnableCondition<T> enableCondition; public ActionDescriptor(final AccessRolDTO accessRolDTO, final Listener<T> onPerformCall) { - this.accessRol = accessRolDTO; - this.onPerformCall = onPerformCall; - this.mustBeConfirmed = false; - this.onNotConfirmed = null; - this.mustBeAuthenticated = true; + this.accessRol = accessRolDTO; + this.onPerformCall = onPerformCall; + this.mustBeConfirmed = false; + this.onNotConfirmed = null; + this.mustBeAuthenticated = true; } public ActionDescriptor(final AccessRolDTO accessRolDTO, final Listener<T> onPerformCall, - final ActionEnableCondition<T> enableCondition) { - this(accessRolDTO, onPerformCall); - this.enableCondition = enableCondition; + final ActionEnableCondition<T> enableCondition) { + this(accessRolDTO, onPerformCall); + this.enableCondition = enableCondition; } @SuppressWarnings("unchecked") public void fireOnNotConfirmed(final Object parameter) { - if (onNotConfirmed != null) { - onNotConfirmed.onEvent((T) parameter); - } + if (onNotConfirmed != null) { + onNotConfirmed.onEvent((T) parameter); + } } @SuppressWarnings("unchecked") public void fireOnPerformCall(final Object parameter) { - onPerformCall.onEvent((T) parameter); + onPerformCall.onEvent((T) parameter); } public AccessRolDTO getAccessRol() { - return accessRol; + return accessRol; } public String getConfirmationText() { - return confirmationText; + return confirmationText; } public String getConfirmationTitle() { - return confirmationTitle; + return confirmationTitle; } public ActionEnableCondition<T> getEnableCondition() { - return enableCondition; + return enableCondition; } public ImageDescriptor getIconDescriptor() { - return iconDescriptor; + return iconDescriptor; } public String getIconUrl() { - return iconUrl; + return iconUrl; } public String getText() { - return textDescription; + return textDescription; } public String getToolTip() { - return toolTip; + return toolTip; } public boolean isMustBeConfirmed() { - return mustBeConfirmed; + return mustBeConfirmed; } public boolean mustBeAuthenticated() { - return mustBeAuthenticated; + return mustBeAuthenticated; } public void setAccessRol(final AccessRolDTO accessRol) { - this.accessRol = accessRol; + this.accessRol = accessRol; } public void setConfirmationText(final String confirmationText) { - this.confirmationText = confirmationText; + this.confirmationText = confirmationText; } public void setConfirmationTitle(final String confirmationTitle) { - this.confirmationTitle = confirmationTitle; + this.confirmationTitle = confirmationTitle; } public void setEnableCondition(final ActionEnableCondition<T> enableCondition) { - this.enableCondition = enableCondition; + this.enableCondition = enableCondition; } public void setIconDescriptor(final ImageDescriptor iconDescriptor) { - this.iconDescriptor = iconDescriptor; + this.iconDescriptor = iconDescriptor; } public void setIconUrl(final String iconUrl) { - this.iconUrl = iconUrl; + this.iconUrl = iconUrl; } public void setMustBeAuthenticated(final boolean mustBeAuthenticated) { - this.mustBeAuthenticated = mustBeAuthenticated; + this.mustBeAuthenticated = mustBeAuthenticated; } public void setMustBeConfirmed(final boolean mustBeConfirmed) { - this.mustBeConfirmed = mustBeConfirmed; + this.mustBeConfirmed = mustBeConfirmed; } public void setTextDescription(final String textDescription) { - this.textDescription = textDescription; + this.textDescription = textDescription; } public void setToolTip(final String toolTip) { - this.toolTip = toolTip; + this.toolTip = toolTip; } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionItem.java 2008-10-21 19:26:47 UTC (rev 917) @@ -12,20 +12,20 @@ T item; public ActionItem(final ActionDescriptor<T> action, final T item) { - this.action = action; - this.item = item; + this.action = action; + this.item = item; } public boolean checkEnabling() { - final ActionEnableCondition<T> enableCondition = action.getEnableCondition(); - return enableCondition != null ? enableCondition.mustBeEnabled(getItem()) : true; + final ActionEnableCondition<T> enableCondition = action.getEnableCondition(); + return enableCondition != null ? enableCondition.mustBeEnabled(getItem()) : true; } public ActionDescriptor<T> getAction() { - return action; + return action; } public T getItem() { - return item; + return item; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java 2008-10-21 19:26:47 UTC (rev 917) @@ -9,29 +9,29 @@ private final WorkspaceSkeleton ws; public ActionManager(final WorkspaceSkeleton ws) { - this.ws = ws; + this.ws = ws; } public void doAction(final ActionItem<?> actionItem) { - final ActionDescriptor<?> action = actionItem.getAction(); - final Object item = actionItem.getItem(); - if (action.isMustBeConfirmed()) { - ws.askConfirmation(action.getConfirmationTitle(), action.getConfirmationText(), new Listener0() { - public void onEvent() { - fire(action, item); - } - }, new Listener0() { - public void onEvent() { - action.fireOnNotConfirmed(item); - } - }); - } else { - fire(action, item); - } + final ActionDescriptor<?> action = actionItem.getAction(); + final Object item = actionItem.getItem(); + if (action.isMustBeConfirmed()) { + ws.askConfirmation(action.getConfirmationTitle(), action.getConfirmationText(), new Listener0() { + public void onEvent() { + fire(action, item); + } + }, new Listener0() { + public void onEvent() { + action.fireOnNotConfirmed(item); + } + }); + } else { + fire(action, item); + } } private void fire(final ActionDescriptor<?> action, final Object parameter) { - action.fireOnPerformCall(parameter); + action.fireOnPerformCall(parameter); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.java 2008-10-21 19:26:47 UTC (rev 917) @@ -7,12 +7,12 @@ public class ActionMenuItemDescriptor<T> extends ActionDescriptor<T> { public ActionMenuItemDescriptor(final AccessRolDTO accessRolDTO, final Listener<T> onPerformCall) { - super(accessRolDTO, onPerformCall); + super(accessRolDTO, onPerformCall); } public ActionMenuItemDescriptor(final AccessRolDTO accessRolDTO, final Listener<T> onPerformCall, - final ActionEnableCondition<T> enableCondition) { - super(accessRolDTO, onPerformCall, enableCondition); + final ActionEnableCondition<T> enableCondition) { + super(accessRolDTO, onPerformCall, enableCondition); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonAndItemDescriptor.java 2008-10-21 19:26:47 UTC (rev 917) @@ -6,14 +6,15 @@ public class ActionToolbarButtonAndItemDescriptor<T> extends ActionToolbarButtonDescriptor<T> { - public ActionToolbarButtonAndItemDescriptor(final AccessRolDTO accessRolDTO, final ActionToolbarPosition actionToolbarPosition, - final Listener<T> onPerformCall) { - super(accessRolDTO, actionToolbarPosition, onPerformCall); + public ActionToolbarButtonAndItemDescriptor(final AccessRolDTO accessRolDTO, + final ActionToolbarPosition actionToolbarPosition, final Listener<T> onPerformCall) { + super(accessRolDTO, actionToolbarPosition, onPerformCall); } - public ActionToolbarButtonAndItemDescriptor(final AccessRolDTO accessRolDTO, final ActionToolbarPosition actionToolbarPosition, - final Listener<T> onPerformCall, final ActionEnableCondition<T> enableCondition) { - super(accessRolDTO, actionToolbarPosition, onPerformCall, enableCondition); + public ActionToolbarButtonAndItemDescriptor(final AccessRolDTO accessRolDTO, + final ActionToolbarPosition actionToolbarPosition, final Listener<T> onPerformCall, + final ActionEnableCondition<T> enableCondition) { + super(accessRolDTO, actionToolbarPosition, onPerformCall, enableCondition); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java 2008-10-21 19:26:47 UTC (rev 917) @@ -9,37 +9,38 @@ private ActionToolbarButtonSeparator leftSeparator; private ActionToolbarButtonSeparator rightSeparator; - public ActionToolbarButtonDescriptor(final AccessRolDTO accessRolDTO, final ActionToolbarPosition actionToolbarPosition, - final Listener<T> onPerformCall) { - super(accessRolDTO, actionToolbarPosition, onPerformCall); + public ActionToolbarButtonDescriptor(final AccessRolDTO accessRolDTO, + final ActionToolbarPosition actionToolbarPosition, final Listener<T> onPerformCall) { + super(accessRolDTO, actionToolbarPosition, onPerformCall); } - public ActionToolbarButtonDescriptor(final AccessRolDTO accessRolDTO, final ActionToolbarPosition actionToolbarPosition, - final Listener<T> onPerformCall, final ActionEnableCondition<T> enableCondition) { - super(accessRolDTO, actionToolbarPosition, onPerformCall, enableCondition); + public ActionToolbarButtonDescriptor(final AccessRolDTO accessRolDTO, + final ActionToolbarPosition actionToolbarPosition, final Listener<T> onPerformCall, + final ActionEnableCondition<T> enableCondition) { + super(accessRolDTO, actionToolbarPosition, onPerformCall, enableCondition); } public ActionToolbarButtonSeparator getLeftSeparator() { - return leftSeparator; + return leftSeparator; } public ActionToolbarButtonSeparator getRightSeparator() { - return rightSeparator; + return rightSeparator; } public boolean hasLeftSeparator() { - return leftSeparator != null; + return leftSeparator != null; } public boolean hasRightSeparator() { - return rightSeparator != null; + return rightSeparator != null; } public void setLeftSeparator(final ActionToolbarButtonSeparator leftSeparator) { - this.leftSeparator = leftSeparator; + this.leftSeparator = leftSeparator; } public void setRightSeparator(final ActionToolbarButtonSeparator rightSeparator) { - this.rightSeparator = rightSeparator; + this.rightSeparator = rightSeparator; } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java 2008-10-21 19:26:47 UTC (rev 917) @@ -9,23 +9,23 @@ private ActionToolbarPosition actionToolbarPosition; public ActionToolbarDescriptor(final AccessRolDTO accessRolDTO, final ActionToolbarPosition actionToolbarPosition, - final Listener<T> onPerformCall) { - super(accessRolDTO, onPerformCall); - this.actionToolbarPosition = actionToolbarPosition; + final Listener<T> onPerformCall) { + super(accessRolDTO, onPerformCall); + this.actionToolbarPosition = actionToolbarPosition; } public ActionToolbarDescriptor(final AccessRolDTO accessRolDTO, final ActionToolbarPosition actionToolbarPosition, - final Listener<T> onPerformCall, final ActionEnableCondition<T> enableCondition) { - super(accessRolDTO, onPerformCall, enableCondition); - this.actionToolbarPosition = actionToolbarPosition; + final Listener<T> onPerformCall, final ActionEnableCondition<T> enableCondition) { + super(accessRolDTO, onPerformCall, enableCondition); + this.actionToolbarPosition = actionToolbarPosition; } public ActionToolbarPosition getActionPosition() { - return actionToolbarPosition; + return actionToolbarPosition; } public void setActionPosition(final ActionToolbarPosition actionToolbarPosition) { - this.actionToolbarPosition = actionToolbarPosition; + this.actionToolbarPosition = actionToolbarPosition; } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuAndItemDescriptor.java 2008-10-21 19:26:47 UTC (rev 917) @@ -6,14 +6,15 @@ public class ActionToolbarMenuAndItemDescriptor<T> extends ActionToolbarMenuDescriptor<T> { - public ActionToolbarMenuAndItemDescriptor(final AccessRolDTO accessRolDTO, final ActionToolbarPosition actionToolbarPosition, - final Listener<T> onPerformCall) { - super(accessRolDTO, actionToolbarPosition, onPerformCall); + public ActionToolbarMenuAndItemDescriptor(final AccessRolDTO accessRolDTO, + final ActionToolbarPosition actionToolbarPosition, final Listener<T> onPerformCall) { + super(accessRolDTO, actionToolbarPosition, onPerformCall); } - public ActionToolbarMenuAndItemDescriptor(final AccessRolDTO accessRolDTO, final ActionToolbarPosition actionToolbarPosition, - final Listener<T> onPerformCall, final ActionEnableCondition<T> enableCondition) { - super(accessRolDTO, actionToolbarPosition, onPerformCall, enableCondition); + public ActionToolbarMenuAndItemDescriptor(final AccessRolDTO accessRolDTO, + final ActionToolbarPosition actionToolbarPosition, final Listener<T> onPerformCall, + final ActionEnableCondition<T> enableCondition) { + super(accessRolDTO, actionToolbarPosition, onPerformCall, enableCondition); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuDescriptor.java 2008-10-21 19:26:47 UTC (rev 917) @@ -11,40 +11,41 @@ private String parentMenuIconUrl; private String parentSubMenuTitle; - public ActionToolbarMenuDescriptor(final AccessRolDTO accessRolDTO, final ActionToolbarPosition actionToolbarPosition, - final Listener<T> onPerformCall) { - super(accessRolDTO, actionToolbarPosition, onPerformCall); + public ActionToolbarMenuDescriptor(final AccessRolDTO accessRolDTO, + final ActionToolbarPosition actionToolbarPosition, final Listener<T> onPerformCall) { + super(accessRolDTO, actionToolbarPosition, onPerformCall); } - public ActionToolbarMenuDescriptor(final AccessRolDTO accessRolDTO, final ActionToolbarPosition actionToolbarPosition, - final Listener<T> onPerformCall, final ActionEnableCondition<T> enableCondition) { - super(accessRolDTO, actionToolbarPosition, onPerformCall, enableCondition); + public ActionToolbarMenuDescriptor(final AccessRolDTO accessRolDTO, + final ActionToolbarPosition actionToolbarPosition, final Listener<T> onPerformCall, + final ActionEnableCondition<T> enableCondition) { + super(accessRolDTO, actionToolbarPosition, onPerformCall, enableCondition); } public String getParentMenuIconUrl() { - return parentMenuIconUrl; + return parentMenuIconUrl; } public String getParentMenuTitle() { - return parentMenuTitle; + return parentMenuTitle; } public String getParentSubMenuTitle() { - return parentSubMenuTitle; + return parentSubMenuTitle; } public void setParentMenuIconUrl(final String parentMenuIconUrl) { - this.parentMenuIconUrl = parentMenuIconUrl; + this.parentMenuIconUrl = parentMenuIconUrl; } public void setParentMenuTitle(final String parentMenuTitle) { - this.parentMenuTitle = parentMenuTitle; + this.parentMenuTitle = parentMenuTitle; } public void setParentSubMenuTitle(final String parentSubMenuTitle) { - if (parentMenuTitle == null) { - Log.warn("Please set parentMenuTitle before"); - } - this.parentSubMenuTitle = parentSubMenuTitle; + if (parentMenuTitle == null) { + Log.warn("Please set parentMenuTitle before"); + } + this.parentSubMenuTitle = parentSubMenuTitle; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ContentIconsRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ContentIconsRegistry.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ContentIconsRegistry.java 2008-10-21 19:26:47 UTC (rev 917) @@ -8,12 +8,12 @@ private final HashMap<String, String> contentTypesIcons; public ContentIconsRegistry() { - contentTypesIcons = new HashMap<String, String>(); + contentTypesIcons = new HashMap<String, String>(); } public String getContentTypeIcon(final String typeId) { - final String icon = contentTypesIcons.get(typeId); - return icon == null ? "" : icon; + final String icon = contentTypesIcons.get(typeId); + return icon == null ? "" : icon; } /** @@ -21,39 +21,39 @@ * icon in defect * * @param typeId - * the kune typeId (see *ClientTool) + * the kune typeId (see *ClientTool) * @param mimeType * @return */ public String getContentTypeIcon(final String typeId, final BasicMimeTypeDTO mimeType) { - String icon = getContentTypeIcon(concatenate(typeId, mimeType)); - if (icon.equals("")) { - if (mimeType == null) { - return getContentTypeIcon(typeId); - } - } else { - return icon; - } - final String subtype = mimeType.getSubtype(); - if (subtype != null && subtype.length() > 0) { - icon = getContentTypeIcon(typeId, new BasicMimeTypeDTO(mimeType.getType())); - } - return icon.equals("") ? getContentTypeIcon(typeId) : icon; + String icon = getContentTypeIcon(concatenate(typeId, mimeType)); + if (icon.equals("")) { + if (mimeType == null) { + return getContentTypeIcon(typeId); + } + } else { + return icon; + } + final String subtype = mimeType.getSubtype(); + if (subtype != null && subtype.length() > 0) { + icon = getContentTypeIcon(typeId, new BasicMimeTypeDTO(mimeType.getType())); + } + return icon.equals("") ? getContentTypeIcon(typeId) : icon; } public void registerContentTypeIcon(final String typeId, final BasicMimeTypeDTO mimeType, final String iconUrl) { - registerContentTypeIcon(concatenate(typeId, mimeType), iconUrl); + registerContentTypeIcon(concatenate(typeId, mimeType), iconUrl); } public void registerContentTypeIcon(final String contentTypeId, final String iconUrl) { - contentTypesIcons.put(contentTypeId, iconUrl); + contentTypesIcons.put(contentTypeId, iconUrl); } private String concatenate(final String typeId, final BasicMimeTypeDTO mimeType) { - if (mimeType != null) { - return typeId + "|" + mimeType; - } else { - return typeId; - } + if (mimeType != null) { + return typeId + "|" + mimeType; + } else { + return typeId; + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/DragDropContentRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/DragDropContentRegistry.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/DragDropContentRegistry.java 2008-10-21 19:26:47 UTC (rev 917) @@ -8,24 +8,24 @@ private final ArrayList<String> droppables; public DragDropContentRegistry() { - draggables = new ArrayList<String>(); - droppables = new ArrayList<String>(); + draggables = new ArrayList<String>(); + droppables = new ArrayList<String>(); } public boolean isDraggable(final String typeId, final boolean administrable) { - return administrable && draggables.contains(typeId); + return administrable && draggables.contains(typeId); } public boolean isDroppable(final String typeId, final boolean administrable) { - return administrable && droppables.contains(typeId); + return administrable && droppables.contains(typeId); } public void registerDraggableType(final String type) { - draggables.add(type); + draggables.add(type); } public void registerDroppableType(final String type) { - droppables.add(type); + droppables.add(type); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -29,7 +29,7 @@ public class ActionToolbarPanel<T> implements ActionToolbarView<T> { public enum Position { - content, context + content, context } private final HashMap<String, Menu> toolbarMenus; @@ -42,237 +42,237 @@ private final WorkspaceSkeleton ws; public ActionToolbarPanel(final Position position, final Provider<ActionManager> actionManagerProvider, - final WorkspaceSkeleton ws) { - this.ws = ws; - topbar = new SimpleToolbar(); - bottombar = new SimpleToolbar(); - this.position = position; - this.actionManagerProvider = actionManagerProvider; + final WorkspaceSkeleton ws) { + this.ws = ws; + topbar = new SimpleToolbar(); + bottombar = new SimpleToolbar(); + this.position = position; + this.actionManagerProvider = actionManagerProvider; - toolbarMenus = new HashMap<String, Menu>(); - toolbarButtons = new HashMap<String, ToolbarButton>(); - menuItems = new HashMap<String, Item>(); + toolbarMenus = new HashMap<String, Menu>(); + toolbarButtons = new HashMap<String, ToolbarButton>(); + menuItems = new HashMap<String, Item>(); } public void addButtonAction(final ActionItem<T> actionItem, final boolean enable) { - final ActionToolbarButtonDescriptor<T> action = (ActionToolbarButtonDescriptor<T>) actionItem.getAction(); - final ActionToolbarPosition pos = action.getActionPosition(); - final ToolbarButton button = new ToolbarButton(); - final String text = action.getText(); - final String iconUrl = action.getIconUrl(); - if (text != null) { - button.setText(text); - } - button.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(final Button button, final EventObject e) { - actionManagerProvider.get().doAction(actionItem); - } - }); - if (iconUrl != null) { - button.setIcon(iconUrl); - } - button.setTooltip(action.getToolTip()); + final ActionToolbarButtonDescriptor<T> action = (ActionToolbarButtonDescriptor<T>) actionItem.getAction(); + final ActionToolbarPosition pos = action.getActionPosition(); + final ToolbarButton button = new ToolbarButton(); + final String text = action.getText(); + final String iconUrl = action.getIconUrl(); + if (text != null) { + button.setText(text); + } + button.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + actionManagerProvider.get().doAction(actionItem); + } + }); + if (iconUrl != null) { + button.setIcon(iconUrl); + } + button.setTooltip(action.getToolTip()); - setEnableButton(button, enable); - final SimpleToolbar toolbar = getToolbar(pos); - if (action.hasLeftSeparator()) { - add(toolbar, action.getLeftSeparator()); - } - toolbar.add(button); - if (action.hasRightSeparator()) { - add(toolbar, action.getRightSeparator()); - } - toolbarButtons.put(genButtonKey(pos, text), button); + setEnableButton(button, enable); + final SimpleToolbar toolbar = getToolbar(pos); + if (action.hasLeftSeparator()) { + add(toolbar, action.getLeftSeparator()); + } + toolbar.add(button); + if (action.hasRightSeparator()) { + add(toolbar, action.getRightSeparator()); + } + toolbarButtons.put(genButtonKey(pos, text), button); } public void addMenuAction(final ActionItem<T> actionItem, final boolean enable) { - final ActionToolbarMenuDescriptor<T> action = (ActionToolbarMenuDescriptor<T>) actionItem.getAction(); - final String menuTitle = action.getParentMenuTitle(); - final String menuSubTitle = action.getParentSubMenuTitle(); - final ActionToolbarPosition pos = action.getActionPosition(); - final String itemKey = genMenuKey(pos, menuTitle, menuSubTitle, action.getText()); - Item item = menuItems.get(itemKey); - if (item == null) { - item = createToolbarMenu(pos, menuTitle, menuSubTitle, actionItem); - menuItems.put(itemKey, item); - } - setEnableMenuItem(item, enable); + final ActionToolbarMenuDescriptor<T> action = (ActionToolbarMenuDescriptor<T>) actionItem.getAction(); + final String menuTitle = action.getParentMenuTitle(); + final String menuSubTitle = action.getParentSubMenuTitle(); + final ActionToolbarPosition pos = action.getActionPosition(); + final String itemKey = genMenuKey(pos, menuTitle, menuSubTitle, action.getText()); + Item item = menuItems.get(itemKey); + if (item == null) { + item = createToolbarMenu(pos, menuTitle, menuSubTitle, actionItem); + menuItems.put(itemKey, item); + } + setEnableMenuItem(item, enable); } public void attach() { - if (!topbar.isAttached()) { - switch (position) { - case content: - ws.getEntityWorkspace().getContentTopBar().add(topbar); - ws.getEntityWorkspace().getContentBottomBar().add(bottombar); - break; - case context: - default: - ws.getEntityWorkspace().getContextTopBar().add(topbar); - ws.getEntityWorkspace().getContextBottomBar().add(bottombar); - } - } + if (!topbar.isAttached()) { + switch (position) { + case content: + ws.getEntityWorkspace().getContentTopBar().add(topbar); + ws.getEntityWorkspace().getContentBottomBar().add(bottombar); + break; + case context: + default: + ws.getEntityWorkspace().getContextTopBar().add(topbar); + ws.getEntityWorkspace().getContextBottomBar().add(bottombar); + } + } } public void clear() { - toolbarMenus.clear(); - menuItems.clear(); - toolbarButtons.clear(); - topbar.removeAll(); - bottombar.removeAll(); - getToolbar(ActionToolbarPosition.topbar).removeAll(); - getToolbar(ActionToolbarPosition.bottombar).removeAll(); + toolbarMenus.clear(); + menuItems.clear(); + toolbarButtons.clear(); + topbar.removeAll(); + bottombar.removeAll(); + getToolbar(ActionToolbarPosition.topbar).removeAll(); + getToolbar(ActionToolbarPosition.bottombar).removeAll(); } public void detach() { - if (topbar.isAttached()) { - switch (position) { - case content: - ws.getEntityWorkspace().getContentTopBar().remove(topbar); - ws.getEntityWorkspace().getContentBottomBar().remove(bottombar); - break; - case context: - default: - ws.getEntityWorkspace().getContextTopBar().remove(topbar); - ws.getEntityWorkspace().getContextBottomBar().remove(bottombar); - } - } + if (topbar.isAttached()) { + switch (position) { + case content: + ws.getEntityWorkspace().getContentTopBar().remove(topbar); + ws.getEntityWorkspace().getContentBottomBar().remove(bottombar); + break; + case context: + default: + ws.getEntityWorkspace().getContextTopBar().remove(topbar); + ws.getEntityWorkspace().getContextBottomBar().remove(bottombar); + } + } } public void disableAllMenuItems() { - for (final Item item : menuItems.values()) { - item.disable(); - } + for (final Item item : menuItems.values()) { + item.disable(); + } } public void setButtonEnable(final ActionDescriptor<T> action, final boolean enable) { - final ActionToolbarPosition pos = ((ActionToolbarDescriptor<T>) action).getActionPosition(); - final ToolbarButton button = toolbarButtons.get(genButtonKey(pos, action.getText())); - if (button != null) { - setEnableButton(button, enable); - } else { - Log.error("Tryng to enable/disable a non existent toolbar button"); - } + final ActionToolbarPosition pos = ((ActionToolbarDescriptor<T>) action).getActionPosition(); + final ToolbarButton button = toolbarButtons.get(genButtonKey(pos, action.getText())); + if (button != null) { + setEnableButton(button, enable); + } else { + Log.error("Tryng to enable/disable a non existent toolbar button"); + } } public void setMenuEnable(final ActionDescriptor<T> action, final boolean enable) { - final Item item = menuItems.get(genMenuKey((ActionToolbarMenuDescriptor<T>) action)); - if (item != null) { - setEnableMenuItem(item, enable); - } else { - Log.error("Tryng to enable/disable a non existent toolbar menu item"); - } + final Item item = menuItems.get(genMenuKey((ActionToolbarMenuDescriptor<T>) action)); + if (item != null) { + setEnableMenuItem(item, enable); + } else { + Log.error("Tryng to enable/disable a non existent toolbar menu item"); + } } private void add(final ActionToolbarPosition toolbar, final Widget widget) { - getToolbar(toolbar).add(widget); + getToolbar(toolbar).add(widget); } private Widget add(final SimpleToolbar toolbar, final ActionToolbarButtonSeparator separator) { - switch (separator) { - case fill: - return toolbar.addFill(); - case separator: - return toolbar.addSeparator(); - case spacer: - default: - return toolbar.addSpacer(); - } + switch (separator) { + case fill: + return toolbar.addFill(); + case separator: + return toolbar.addSeparator(); + case spacer: + default: + return toolbar.addSpacer(); + } } private Item createToolbarMenu(final ActionToolbarPosition toolBarPos, final String menuTitle, - final String menuSubTitle, final ActionItem<T> actionItem) { - final ActionToolbarMenuDescriptor<T> action = (ActionToolbarMenuDescriptor<T>) actionItem.getAction(); - final Item item = new Item(action.getText(), new BaseItemListenerAdapter() { - @Override - public void onClick(BaseItem item, EventObject e) { - actionManagerProvider.get().doAction(actionItem); - } - }); - item.setIcon(action.getIconUrl()); + final String menuSubTitle, final ActionItem<T> actionItem) { + final ActionToolbarMenuDescriptor<T> action = (ActionToolbarMenuDescriptor<T>) actionItem.getAction(); + final Item item = new Item(action.getText(), new BaseItemListenerAdapter() { + @Override + public void onClick(BaseItem item, EventObject e) { + actionManagerProvider.get().doAction(actionItem); + } + }); + item.setIcon(action.getIconUrl()); - final String menuKey = genMenuKey(toolBarPos, menuTitle, null, null); - final String subMenuKey = genMenuKey(toolBarPos, menuTitle, menuSubTitle, null); - Menu menu = toolbarMenus.get(menuKey); - Menu subMenu = toolbarMenus.get(subMenuKey); - if (menuSubTitle != null) { - if (subMenu == null) { - subMenu = new Menu(); - final MenuItem subMenuItem = new MenuItem(menuSubTitle, subMenu); - if (menu == null) { - menu = createToolbarMenu(toolBarPos, action.getParentMenuIconUrl(), menuTitle, menuKey); - } - menu.addItem(subMenuItem); - toolbarMenus.put(subMenuKey, subMenu); - } - subMenu.addItem(item); + final String menuKey = genMenuKey(toolBarPos, menuTitle, null, null); + final String subMenuKey = genMenuKey(toolBarPos, menuTitle, menuSubTitle, null); + Menu menu = toolbarMenus.get(menuKey); + Menu subMenu = toolbarMenus.get(subMenuKey); + if (menuSubTitle != null) { + if (subMenu == null) { + subMenu = new Menu(); + final MenuItem subMenuItem = new MenuItem(menuSubTitle, subMenu); + if (menu == null) { + menu = createToolbarMenu(toolBarPos, action.getParentMenuIconUrl(), menuTitle, menuKey); + } + menu.addItem(subMenuItem); + toolbarMenus.put(subMenuKey, subMenu); + } + subMenu.addItem(item); - } else { - // Menu action without submenu - if (menu == null) { - menu = createToolbarMenu(toolBarPos, action.getParentMenuIconUrl(), menuTitle, menuKey); - } - menu.addItem(item); - } - return item; + } else { + // Menu action without submenu + if (menu == null) { + menu = createToolbarMenu(toolBarPos, action.getParentMenuIconUrl(), menuTitle, menuKey); + } + menu.addItem(item); + } + return item; } private Menu createToolbarMenu(final ActionToolbarPosition barPosition, final String iconUrl, - final String menuTitle, final String menuKey) { - final Menu menu = new Menu(); - final ToolbarButton toolbarMenu = new ToolbarButton(menuTitle); - toolbarMenu.setMenu(menu); - if (iconUrl != null) { - toolbarMenu.setIcon(iconUrl); - } - toolbarMenus.put(menuKey, menu); - add(barPosition, toolbarMenu); - return menu; + final String menuTitle, final String menuKey) { + final Menu menu = new Menu(); + final ToolbarButton toolbarMenu = new ToolbarButton(menuTitle); + toolbarMenu.setMenu(menu); + if (iconUrl != null) { + toolbarMenu.setIcon(iconUrl); + } + toolbarMenus.put(menuKey, menu); + add(barPosition, toolbarMenu); + return menu; } private String genButtonKey(final ActionToolbarPosition pos, final String actionText) { - final String basePart = "km-ctx-btn-" + pos.toString().substring(0, 2) + "-" + actionText; - return basePart; + final String basePart = "km-ctx-btn-" + pos.toString().substring(0, 2) + "-" + actionText; + return basePart; } private String genMenuKey(final ActionToolbarMenuDescriptor<T> action) { - return genMenuKey(action.getActionPosition(), action.getParentMenuTitle(), action.getParentSubMenuTitle(), - action.getText()); + return genMenuKey(action.getActionPosition(), action.getParentMenuTitle(), action.getParentSubMenuTitle(), + action.getText()); } private String genMenuKey(final ActionToolbarPosition pos, final String menuTitle, final String menuSubTitle, - final String actionText) { + final String actionText) { - final String basePart = "km-ctx-menu-" + pos.toString().substring(0, 2) + "-" + menuTitle; - final String subMenuPart = menuSubTitle != null ? "-subm-" + menuSubTitle : ""; - final String itemPart = actionText != null ? "-item-" + actionText : ""; - return basePart + subMenuPart + itemPart; + final String basePart = "km-ctx-menu-" + pos.toString().substring(0, 2) + "-" + menuTitle; + final String subMenuPart = menuSubTitle != null ? "-subm-" + menuSubTitle : ""; + final String itemPart = actionText != null ? "-item-" + actionText : ""; + return basePart + subMenuPart + itemPart; } private SimpleToolbar getToolbar(final ActionToolbarPosition pos) { - switch (pos) { - case bottombar: - return bottombar; - case topbar: - default: - return topbar; - } + switch (pos) { + case bottombar: + return bottombar; + case topbar: + default: + return topbar; + } } private void setEnableButton(final ToolbarButton button, final boolean enable) { - if (enable) { - button.enable(); - } else { - button.disable(); - } + if (enable) { + button.enable(); + } else { + button.disable(); + } } private void setEnableMenuItem(final Item item, final boolean enable) { - if (enable) { - item.enable(); - } else { - item.disable(); - } + if (enable) { + item.enable(); + } else { + item.disable(); + } } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -15,57 +15,57 @@ private final ActionToolbarView<T> view; public ActionToolbarPresenter(final ActionToolbarView<T> toolbar) { - this.view = toolbar; + this.view = toolbar; } public void attach() { - view.attach(); + view.attach(); } public void clear() { - view.clear(); + view.clear(); } public void detach() { - view.detach(); + view.detach(); } public void disableMenusAndClearButtons() { - view.clear(); + view.clear(); } public void setActions(final ActionItemCollection<T> actions) { - for (final ActionItem<T> actionItem : actions) { - final ActionDescriptor<T> action = actionItem.getAction(); - if (isToolbarMenu(action)) { - view.addMenuAction(actionItem, actionItem.checkEnabling()); - } else { - if (isToolbarButton(action)) { - view.addButtonAction(actionItem, actionItem.checkEnabling()); - } else { - Log.error("Code error: Not an ActionMenuDescriptor or ActionButtonDescriptor: " + action.getText()); - } - } - } + for (final ActionItem<T> actionItem : actions) { + final ActionDescriptor<T> action = actionItem.getAction(); + if (isToolbarMenu(action)) { + view.addMenuAction(actionItem, actionItem.checkEnabling()); + } else { + if (isToolbarButton(action)) { + view.addButtonAction(actionItem, actionItem.checkEnabling()); + } else { + Log.error("Code error: Not an ActionMenuDescriptor or ActionButtonDescriptor: " + action.getText()); + } + } + } } public void setEnableAction(final ActionToolbarDescriptor<T> action, final boolean enable) { - if (isToolbarMenu(action)) { - view.setMenuEnable(action, enable); - } else { - if (isToolbarButton(action)) { - view.setButtonEnable(action, enable); - } - } + if (isToolbarMenu(action)) { + view.setMenuEnable(action, enable); + } else { + if (isToolbarButton(action)) { + view.setButtonEnable(action, enable); + } + } } private boolean isToolbarButton(final ActionDescriptor<T> action) { - return action instanceof ActionToolbarButtonDescriptor - || action instanceof ActionToolbarButtonAndItemDescriptor; + return action instanceof ActionToolbarButtonDescriptor + || action instanceof ActionToolbarButtonAndItemDescriptor; } private boolean isToolbarMenu(final ActionDescriptor<T> action) { - return action instanceof ActionToolbarMenuDescriptor || action instanceof ActionToolbarMenuAndItemDescriptor; + return action instanceof ActionToolbarMenuDescriptor || action instanceof ActionToolbarMenuAndItemDescriptor; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationComponentGroup.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationComponentGroup.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationComponentGroup.java 2008-10-21 19:26:47 UTC (rev 917) @@ -8,12 +8,12 @@ public class ApplicationComponentGroup extends ProviderCollection { public ApplicationComponentGroup(final Container container) { - super(container, Singleton.instance); + super(container, Singleton.instance); } public void createAll() { - for (final Provider<?> p : getProviders()) { - p.get(); - } + for (final Provider<?> p : getProviders()) { + p.get(); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapper.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapper.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapper.java 2008-10-21 19:26:47 UTC (rev 917) @@ -21,8 +21,8 @@ public interface HistoryWrapper { - public void newItem(final String historyToken); + String getToken(); - public String getToken(); + void newItem(final String historyToken); } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapperDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapperDefault.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapperDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -24,11 +24,11 @@ public class HistoryWrapperDefault implements HistoryWrapper { public String getToken() { - return History.getToken(); + return History.getToken(); } public void newItem(final String historyToken) { - History.newItem(historyToken); + History.newItem(historyToken); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/ToolGroup.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/ToolGroup.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/ToolGroup.java 2008-10-21 19:26:47 UTC (rev 917) @@ -8,12 +8,12 @@ public class ToolGroup extends ProviderCollection { public ToolGroup(final Container container) { - super(container, Singleton.instance); + super(container, Singleton.instance); } public void createAll() { - for (final Provider<?> p : getProviders()) { - p.get(); - } + for (final Provider<?> p : getProviders()) { + p.get(); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessListsDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessListsDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessListsDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -28,42 +28,42 @@ private GroupListDTO viewers; public AccessListsDTO() { - this(null, null, null); + this(null, null, null); } public AccessListsDTO(final GroupListDTO admins, final GroupListDTO editors, final GroupListDTO viewers) { - this.admins = admins; - this.editors = editors; - this.viewers = viewers; + this.admins = admins; + this.editors = editors; + this.viewers = viewers; } public GroupListDTO getAdmins() { - return admins; + return admins; } public GroupListDTO getEditors() { - return editors; + return editors; } public GroupListDTO getViewers() { - return viewers; + return viewers; } public void setAdmins(final GroupListDTO admins) { - this.admins = admins; + this.admins = admins; } public void setEditors(final GroupListDTO editors) { - this.editors = editors; + this.editors = editors; } public void setViewers(final GroupListDTO viewers) { - this.viewers = viewers; + this.viewers = viewers; } @Override public String toString() { - return "AccessListDTO[admins :" + admins + "; editors: " + editors + "; viewers: " + viewers + "]"; + return "AccessListDTO[admins :" + admins + "; editors: " + editors + "; viewers: " + viewers + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -28,61 +28,72 @@ private boolean isVisible; public AccessRightsDTO() { - this(false, false, false); + this(false, false, false); } public AccessRightsDTO(final boolean isAdministrable, final boolean isEditable, final boolean isVisible) { - this.isAdministrable = isAdministrable; - this.isEditable = isEditable; - this.isVisible = isVisible; + this.isAdministrable = isAdministrable; + this.isEditable = isEditable; + this.isVisible = isVisible; } @Override public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - final AccessRightsDTO other = (AccessRightsDTO) obj; - if (isAdministrable != other.isAdministrable) { - return false; - } - if (isEditable != other.isEditable) { - return false; - } - if (isVisible != other.isVisible) { - return false; - } - return true; + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + final AccessRightsDTO other = (AccessRightsDTO) obj; + if (isAdministrable != other.isAdministrable) { + return false; + } + if (isEditable != other.isEditable) { + return false; + } + if (isVisible != other.isVisible) { + return false; + } + return true; } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + (isAdministrable ? 1231 : 1237); + result = prime * result + (isEditable ? 1231 : 1237); + result = prime * result + (isVisible ? 1231 : 1237); + return result; + } + public boolean isAdministrable() { - return isAdministrable; + return isAdministrable; } public boolean isEditable() { - return isEditable; + return isEditable; } public boolean isVisible() { - return isVisible; + return isVisible; } public void setAdministrable(final boolean isAdministrable) { - this.isAdministrable = isAdministrable; + this.isAdministrable = isAdministrable; } public void setEditable(final boolean isEditable) { - this.isEditable = isEditable; + this.isEditable = isEditable; } public void setVisible(final boolean isVisible) { - this.isVisible = isVisible; + this.isVisible = isVisible; } + @Override public String toString() { - return "AccessRightsDTO[a: " + isAdministrable + ", e: " + isEditable + ", v: " + isVisible + "]"; + return "AccessRightsDTO[a: " + isAdministrable + ", e: " + isEditable + ", v: " + isVisible + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -8,42 +8,42 @@ private String subtype; public BasicMimeTypeDTO() { - this(null, null); + this(null, null); } public BasicMimeTypeDTO(final String mimetype) { - if (mimetype != null) { - final String[] split = mimetype.split("/", 2); - type = split[0]; - if (split.length > 1 && split[1].length() > 0) { - subtype = split[1]; - } - } + if (mimetype != null) { + final String[] split = mimetype.split("/", 2); + type = split[0]; + if (split.length > 1 && split[1].length() > 0) { + subtype = split[1]; + } + } } public BasicMimeTypeDTO(final String type, final String subtype) { - this.type = type; - this.subtype = subtype; + this.type = type; + this.subtype = subtype; } public String getSubtype() { - return subtype; + return subtype; } public String getType() { - return type; + return type; } public void setSubtype(final String subtype) { - this.subtype = subtype; + this.subtype = subtype; } public void setType(final String type) { - this.type = type; + this.type = type; } public String toString() { - return subtype == null ? type : type + "/" + subtype; + return subtype == null ? type : type + "/" + subtype; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/ChatUserParamsDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ChatUserParamsDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/ChatUserParamsDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -14,47 +14,47 @@ private String chatColor; public ChatUserParamsDTO() { - this(null, false, SubscriptionMode.autoAcceptAll, null); + this(null, false, SubscriptionMode.autoAcceptAll, null); }; public ChatUserParamsDTO(final String avatar, final boolean publishRoster, final SubscriptionMode subscriptionMode, - final String chatColor) { - this.avatar = avatar; - this.publishRoster = publishRoster; - this.subscriptionMode = subscriptionMode; - this.chatColor = chatColor; + final String chatColor) { + this.avatar = avatar; + this.publishRoster = publishRoster; + this.subscriptionMode = subscriptionMode; + this.chatColor = chatColor; } public String getAvatar() { - return avatar; + return avatar; } public String getChatColor() { - return chatColor; + return chatColor; } public SubscriptionMode getSubscriptionMode() { - return subscriptionMode; + return subscriptionMode; } public boolean isPublishRoster() { - return publishRoster; + return publishRoster; } public void setAvatar(final String avatar) { - this.avatar = avatar; + this.avatar = avatar; } public void setChatColor(final String chatColor) { - this.chatColor = chatColor; + this.chatColor = chatColor; } public void setPublishRoster(final boolean publishRoster) { - this.publishRoster = publishRoster; + this.publishRoster = publishRoster; } public void setSubscriptionMode(final SubscriptionMode subscriptionMode) { - this.subscriptionMode = subscriptionMode; + this.subscriptionMode = subscriptionMode; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContainerDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContainerDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContainerDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -38,67 +38,67 @@ } public ContainerSimpleDTO[] getAbsolutePath() { - return absolutePath; + return absolutePath; } public List<ContainerSimpleDTO> getChilds() { - return childs; + return childs; } public List<ContentSimpleDTO> getContents() { - return contents; + return contents; } public Long getId() { - return id; + return id; } public String getName() { - return name; + return name; } public Long getParentFolderId() { - return parentFolderId; + return parentFolderId; } public StateToken getStateToken() { - return stateToken; + return stateToken; } public String getTypeId() { - return typeId; + return typeId; } public void setAbsolutePath(final ContainerSimpleDTO[] absolutePath) { - this.absolutePath = absolutePath; + this.absolutePath = absolutePath; } public void setChilds(final List<ContainerSimpleDTO> childs) { - this.childs = childs; + this.childs = childs; } public void setContents(final List<ContentSimpleDTO> contents) { - this.contents = contents; + this.contents = contents; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setName(final String name) { - this.name = name; + this.name = name; } public void setParentFolderId(final Long parentFolderId) { - this.parentFolderId = parentFolderId; + this.parentFolderId = parentFolderId; } public void setStateToken(final StateToken stateToken) { - this.stateToken = stateToken; + this.stateToken = stateToken; } public void setTypeId(final String typeId) { - this.typeId = typeId; + this.typeId = typeId; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContainerSimpleDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContainerSimpleDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContainerSimpleDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -37,43 +37,43 @@ } public Long getId() { - return id; + return id; } public String getName() { - return name; + return name; } public Long getParentFolderId() { - return parentFolderId; + return parentFolderId; } public StateToken getStateToken() { - return stateToken; + return stateToken; } public String getTypeId() { - return typeId; + return typeId; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setName(final String name) { - this.name = name; + this.name = name; } public void setParentFolderId(final Long parentFolderId) { - this.parentFolderId = parentFolderId; + this.parentFolderId = parentFolderId; } public void setStateToken(final StateToken stateToken) { - this.stateToken = stateToken; + this.stateToken = stateToken; } public void setTypeId(final String typeId) { - this.typeId = typeId; + this.typeId = typeId; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContentSimpleDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContentSimpleDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContentSimpleDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -33,59 +33,59 @@ private BasicMimeTypeDTO mimeType; public Long getId() { - return id; + return id; } public BasicMimeTypeDTO getMimeType() { - return mimeType; + return mimeType; } public AccessRightsDTO getRights() { - return rights; + return rights; } public StateToken getStateToken() { - return stateToken; + return stateToken; } public ContentStatusDTO getStatus() { - return status; + return status; } public String getTitle() { - return title; + return title; } public String getTypeId() { - return typeId; + return typeId; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setMimeType(final BasicMimeTypeDTO mimeType) { - this.mimeType = mimeType; + this.mimeType = mimeType; } public void setRights(final AccessRightsDTO rights) { - this.rights = rights; + this.rights = rights; } public void setStateToken(final StateToken stateToken) { - this.stateToken = stateToken; + this.stateToken = stateToken; } public void setStatus(final ContentStatusDTO status) { - this.status = status; + this.status = status; } public void setTitle(final String title) { - this.title = title; + this.title = title; } public void setTypeId(final String typeId) { - this.typeId = typeId; + this.typeId = typeId; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -27,11 +27,12 @@ private Long id; private String shortName; private String longName; - private GroupType type; + private GroupType groupType; private ContentSimpleDTO defaultContent; - private ContentSimpleDTO groupLogo; + private ContentSimpleDTO groupFullLogo; private LicenseDTO defaultLicense; private String workspaceTheme; + private boolean hasLogo; public GroupDTO() { this(null, null, GroupType.ORGANIZATION); @@ -40,7 +41,7 @@ public GroupDTO(final String shortName, final String longName, final GroupType type) { this.shortName = shortName; this.longName = longName; - this.type = type; + this.groupType = type; } @Override @@ -70,10 +71,18 @@ return defaultLicense; } - public ContentSimpleDTO getGroupLogo() { - return groupLogo; + public ContentSimpleDTO getGroupFullLogo() { + return groupFullLogo; } + public GroupType getGroupType() { + return groupType; + } + + public boolean getHasLogo() { + return hasLogo; + } + public Long getId() { return id; } @@ -86,10 +95,6 @@ return shortName; } - public GroupType getType() { - return type; - } - public String getWorkspaceTheme() { return workspaceTheme; } @@ -102,10 +107,14 @@ result = prime * result + (id == null ? 0 : id.hashCode()); result = prime * result + (longName == null ? 0 : longName.hashCode()); result = prime * result + (shortName == null ? 0 : shortName.hashCode()); - result = prime * result + (type == null ? 0 : type.hashCode()); + result = prime * result + (groupType == null ? 0 : groupType.hashCode()); return result; } + public boolean hasLogo() { + return getHasLogo(); + } + public void setDefaultContent(final ContentSimpleDTO defaultContent) { this.defaultContent = defaultContent; } @@ -114,10 +123,18 @@ this.defaultLicense = defaultLicense; } - public void setGroupLogo(final ContentSimpleDTO groupLogo) { - this.groupLogo = groupLogo; + public void setGroupFullLogo(final ContentSimpleDTO groupFullLogo) { + this.groupFullLogo = groupFullLogo; } + public void setGroupType(final GroupType groupType) { + this.groupType = groupType; + } + + public void setHasLogo(boolean hasLogo) { + this.hasLogo = hasLogo; + } + public void setId(final Long id) { this.id = id; } @@ -130,10 +147,6 @@ this.shortName = shortName; } - public void setType(final GroupType type) { - this.type = type; - } - public void setWorkspaceTheme(final String workspaceTheme) { this.workspaceTheme = workspaceTheme; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -31,30 +31,30 @@ private String mode; public GroupListDTO() { - this(null); + this(null); } public GroupListDTO(final List<GroupDTO> list) { - this.list = list; + this.list = list; } public List<GroupDTO> getList() { - return list; + return list; } public String getMode() { - return mode; + return mode; } public void setList(final List<GroupDTO> list) { - this.list = list; + this.list = list; } public void setMode(final String mode) { - this.mode = mode; + this.mode = mode; } public String toString() { - return "GroupListDTO[(" + mode + "): " + list + "]"; + return "GroupListDTO[(" + mode + "): " + list + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/LicenseDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/LicenseDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/LicenseDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -43,93 +43,93 @@ private String imageUrl; public LicenseDTO() { - this(null, null, null, null, false, false, false, null, null); + this(null, null, null, null, false, false, false, null, null); } public LicenseDTO(final String shortName, final String longName, final String description, final String url, - final boolean isCC, final boolean isCopyleft, final boolean isDeprecated, final String rdf, - final String imageUrl) { - this.shortName = shortName; - this.longName = longName; - this.description = description; - this.url = url; - this.isCC = isCC; - this.isCopyleft = isCopyleft; - this.isDeprecated = isDeprecated; - this.rdf = rdf; - this.imageUrl = imageUrl; + final boolean isCC, final boolean isCopyleft, final boolean isDeprecated, final String rdf, + final String imageUrl) { + this.shortName = shortName; + this.longName = longName; + this.description = description; + this.url = url; + this.isCC = isCC; + this.isCopyleft = isCopyleft; + this.isDeprecated = isDeprecated; + this.rdf = rdf; + this.imageUrl = imageUrl; } public String getShortName() { - return shortName; + return shortName; } public void setShortName(final String shortName) { - this.shortName = shortName; + this.shortName = shortName; } public String getLongName() { - return longName; + return longName; } public void setLongName(final String longName) { - this.longName = longName; + this.longName = longName; } public String getDescription() { - return description; + return description; } public void setDescription(final String description) { - this.description = description; + this.description = description; } public String getImageUrl() { - return imageUrl; + return imageUrl; } public void setImageUrl(final String imageUrl) { - this.imageUrl = imageUrl; + this.imageUrl = imageUrl; } public String getRdf() { - return rdf; + return rdf; } public void setRdf(final String rdf) { - this.rdf = rdf; + this.rdf = rdf; } public String getUrl() { - return url; + return url; } public void setUrl(final String url) { - this.url = url; + this.url = url; } public boolean isCC() { - return isCC; + return isCC; } public boolean isCopyleft() { - return isCopyleft; + return isCopyleft; } public boolean isDeprecated() { - return isDeprecated; + return isDeprecated; } public void setCC(final boolean isCC) { - this.isCC = isCC; + this.isCC = isCC; } public void setCopyleft(final boolean isCopyleft) { - this.isCopyleft = isCopyleft; + this.isCopyleft = isCopyleft; } public void setDeprecated(final boolean isDeprecated) { - this.isDeprecated = isDeprecated; + this.isDeprecated = isDeprecated; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -32,62 +32,62 @@ private List<TagDTO> tags; public LinkDTO() { - this(null, null, null, null); + this(null, null, null, null); } public LinkDTO(final String shortName, final String longName, final String iconUrl, final String link) { - this.shortName = shortName; - this.longName = longName; - this.iconUrl = iconUrl; - this.link = link; + this.shortName = shortName; + this.longName = longName; + this.iconUrl = iconUrl; + this.link = link; } public String getIconUrl() { - return iconUrl; + return iconUrl; } public String getLink() { - return link; + return link; } public String getLongName() { - return longName; + return longName; } public Double getRate() { - return rate; + return rate; } public String getShortName() { - return shortName; + return shortName; } public List<TagDTO> getTags() { - return tags; + return tags; } public void setIconUrl(final String iconUrl) { - this.iconUrl = iconUrl; + this.iconUrl = iconUrl; } public void setLink(final String link) { - this.link = link; + this.link = link; } public void setLongName(final String longName) { - this.longName = longName; + this.longName = longName; } public void setRate(final Double rate) { - this.rate = rate; + this.rate = rate; } public void setShortName(final String shortName) { - this.shortName = shortName; + this.shortName = shortName; } public void setTags(final List<TagDTO> tags) { - this.tags = tags; + this.tags = tags; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/ParticipationDataDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ParticipationDataDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/ParticipationDataDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -29,33 +29,33 @@ private List<GroupDTO> groupsIsCollab; public ParticipationDataDTO() { - this(null, null); + this(null, null); } public ParticipationDataDTO(final List<GroupDTO> groupsIsAdmin, final List<GroupDTO> groupsIsCollab) { - this.groupsIsAdmin = groupsIsAdmin; - this.groupsIsCollab = groupsIsCollab; + this.groupsIsAdmin = groupsIsAdmin; + this.groupsIsCollab = groupsIsCollab; } public List<GroupDTO> getGroupsIsAdmin() { - return groupsIsAdmin; + return groupsIsAdmin; } public List<GroupDTO> getGroupsIsCollab() { - return groupsIsCollab; + return groupsIsCollab; } public void setGroupsIsAdmin(final List<GroupDTO> groupsIsAdmin) { - this.groupsIsAdmin = groupsIsAdmin; + this.groupsIsAdmin = groupsIsAdmin; } public void setGroupsIsCollab(final List<GroupDTO> groupsIsCollab) { - this.groupsIsCollab = groupsIsCollab; + this.groupsIsCollab = groupsIsCollab; } @Override public String toString() { - return "ParticipationDataDTO[admin in: " + groupsIsAdmin.toString() + ", collab in: " - + groupsIsCollab.toString() + "]"; + return "ParticipationDataDTO[admin in: " + groupsIsAdmin.toString() + ", collab in: " + + groupsIsCollab.toString() + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/RoomDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/RoomDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/RoomDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -29,24 +29,24 @@ } public RoomDTO(final String name) { - this(); - this.name = name; + this(); + this.name = name; } public String getName() { - return name; + return name; } public void setName(final String name) { - this.name = name; + this.name = name; } public String getSubject() { - return subject; + return subject; } public void setSubject(final String subject) { - this.subject = subject; + this.subject = subject; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -28,28 +28,28 @@ GroupListDTO pendingCollaborators; public SocialNetworkDTO() { - accessLists = new AccessListsDTO(); - pendingCollaborators = new GroupListDTO(); + accessLists = new AccessListsDTO(); + pendingCollaborators = new GroupListDTO(); } public AccessListsDTO getAccessLists() { - return accessLists; + return accessLists; } public GroupListDTO getPendingCollaborators() { - return pendingCollaborators; + return pendingCollaborators; } public void setAccessLists(final AccessListsDTO accessLists) { - this.accessLists = accessLists; + this.accessLists = accessLists; } public void setPendingCollaborators(final GroupListDTO pendingCollaborators) { - this.pendingCollaborators = pendingCollaborators; + this.pendingCollaborators = pendingCollaborators; } public String toString() { - return "SocialNetworkDTO[accessList: " + accessLists + "; pendingsCollabs: " + pendingCollaborators + "]"; + return "SocialNetworkDTO[accessList: " + accessLists + "; pendingsCollabs: " + pendingCollaborators + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkResultDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkResultDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkResultDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -28,31 +28,31 @@ ParticipationDataDTO userParticipation; public SocialNetworkResultDTO() { - this(null, null); + this(null, null); } public SocialNetworkResultDTO(final SocialNetworkDTO groupMembers, final ParticipationDataDTO userParticipation) { - this.groupMembers = groupMembers; - this.userParticipation = userParticipation; + this.groupMembers = groupMembers; + this.userParticipation = userParticipation; } public SocialNetworkDTO getGroupMembers() { - return groupMembers; + return groupMembers; } public ParticipationDataDTO getUserParticipation() { - return userParticipation; + return userParticipation; } public void setGroupMembers(final SocialNetworkDTO groupMembers) { - this.groupMembers = groupMembers; + this.groupMembers = groupMembers; } public void setUserParticipation(final ParticipationDataDTO userParticipation) { - this.userParticipation = userParticipation; + this.userParticipation = userParticipation; } public String toString() { - return "SocialNetworkResultDTO[members: " + groupMembers + "; participation: " + userParticipation + "]"; + return "SocialNetworkResultDTO[members: " + groupMembers + "; participation: " + userParticipation + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateToken.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateToken.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateToken.java 2008-10-21 19:26:47 UTC (rev 917) @@ -29,20 +29,20 @@ private static final String[] EMPTY = new String[0]; public static String encode(final String group, final String tool, final String folder, final String document) { - String encoded = ""; - if (group != null) { - encoded += group; - } - if (tool != null) { - encoded += SEPARATOR + tool; - } - if (folder != null) { - encoded += SEPARATOR + folder; - } - if (document != null) { - encoded += SEPARATOR + document; - } - return encoded; + String encoded = ""; + if (group != null) { + encoded += group; + } + if (tool != null) { + encoded += SEPARATOR + tool; + } + if (folder != null) { + encoded += SEPARATOR + folder; + } + if (document != null) { + encoded += SEPARATOR + document; + } + return encoded; } private String group; private String tool; @@ -52,202 +52,202 @@ private String encoded; public StateToken() { - this(null, null, null, null); + this(null, null, null, null); } public StateToken(final String encoded) { - parse(encoded); + parse(encoded); } public StateToken(final String group, final String tool) { - this(group, tool, null, null); + this(group, tool, null, null); } public StateToken(final String group, final String tool, final Long folder) { - this(group, tool, folder == null ? null : folder.toString(), null); + this(group, tool, folder == null ? null : folder.toString(), null); } public StateToken(final String group, final String tool, final String folder, final String document) { - this.setGroup(group); - this.setTool(tool); - this.setFolder(folder); - this.setDocument(document); - encoded = null; + this.setGroup(group); + this.setTool(tool); + this.setFolder(folder); + this.setDocument(document); + encoded = null; } public StateToken clearDocument() { - this.document = null; - encoded = null; - return this; + this.document = null; + encoded = null; + return this; } public StateToken clearFolder() { - this.folder = null; - encoded = null; - return this; + this.folder = null; + encoded = null; + return this; } public StateToken clone() { - return new StateToken(this.getEncoded()); + return new StateToken(this.getEncoded()); } @Override public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - final StateToken other = (StateToken) obj; - if (getEncoded() == null) { - if (other.getEncoded() != null) { - return false; - } - } else if (!getEncoded().equals(other.getEncoded())) { - return false; - } - return true; + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + final StateToken other = (StateToken) obj; + if (getEncoded() == null) { + if (other.getEncoded() != null) { + return false; + } + } else if (!getEncoded().equals(other.getEncoded())) { + return false; + } + return true; } public String getDocument() { - return document; + return document; } public String getEncoded() { - if (encoded == null) { - encoded = StateToken.encode(getGroup(), getTool(), getFolder(), getDocument()); - } - return encoded; + if (encoded == null) { + encoded = StateToken.encode(getGroup(), getTool(), getFolder(), getDocument()); + } + return encoded; } public String getFolder() { - return folder; + return folder; } public String getGroup() { - return group; + return group; } public String getPublicUrl() { - String publicUrl = "http://"; + String publicUrl = "http://"; - if (group != null) { - publicUrl += group + SEPARATOR; - } + if (group != null) { + publicUrl += group + SEPARATOR; + } - // FIXME: Maybe get from InitData the site.domain - publicUrl += WindowUtils.getLocation().getHostName() + "/"; + // FIXME: Maybe get from InitData the site.domain + publicUrl += WindowUtils.getLocation().getHostName() + "/"; - if (tool != null) { - publicUrl += tool; - } - if (folder != null) { - publicUrl += SEPARATOR + folder; - } - if (document != null) { - publicUrl += SEPARATOR + document; - } + if (tool != null) { + publicUrl += tool; + } + if (folder != null) { + publicUrl += SEPARATOR + folder; + } + if (document != null) { + publicUrl += SEPARATOR + document; + } - return publicUrl; + return publicUrl; } public String getTool() { - return tool; + return tool; } public boolean hasAll() { - return getGroup() != null && getTool() != null && getFolder() != null && getDocument() != null; + return getGroup() != null && getTool() != null && getFolder() != null && getDocument() != null; } public boolean hasGroup() { - return getGroup() != null; + return getGroup() != null; } public boolean hasGroupAndTool() { - return getGroup() != null && getTool() != null; + return getGroup() != null && getTool() != null; } public boolean hasGroupToolAndFolder() { - return getGroup() != null && getTool() != null && getFolder() != null; + return getGroup() != null && getTool() != null && getFolder() != null; } @Override public int hashCode() { - return getEncoded().hashCode(); + return getEncoded().hashCode(); } public boolean hasNothing() { - return getGroup() == null && getTool() == null && getFolder() == null && getDocument() == null; + return getGroup() == null && getTool() == null && getFolder() == null && getDocument() == null; } public boolean isComplete() { - return getDocument() != null; + return getDocument() != null; } public StateToken setDocument(final Long document) { - this.document = document == null ? null : document.toString(); - encoded = null; - return this; + this.document = document == null ? null : document.toString(); + encoded = null; + return this; } public StateToken setDocument(final String document) { - this.document = document; - encoded = null; - return this; + this.document = document; + encoded = null; + return this; } public void setEncoded(final String encoded) { - parse(encoded); + parse(encoded); } public StateToken setFolder(final Long folder) { - this.folder = folder == null ? null : folder.toString(); - encoded = null; - return this; + this.folder = folder == null ? null : folder.toString(); + encoded = null; + return this; } public StateToken setFolder(final String folder) { - this.folder = folder; - encoded = null; - return this; + this.folder = folder; + encoded = null; + return this; } public StateToken setGroup(final String group) { - this.group = group; - encoded = null; - return this; + this.group = group; + encoded = null; + return this; } public StateToken setTool(final String tool) { - this.tool = tool; - encoded = null; - return this; + this.tool = tool; + encoded = null; + return this; } public String toString() { - return getEncoded(); + return getEncoded(); } private String conditionalAssign(final int index, final String[] splitted) { - if (splitted.length > index) { - return splitted[index]; - } else { - return null; - } + if (splitted.length > index) { + return splitted[index]; + } else { + return null; + } } private void parse(final String encoded) { - String[] splitted; - if (encoded != null && encoded.length() > 0) { - splitted = encoded.split("\\."); - } else { - splitted = EMPTY; - } - setGroup(conditionalAssign(0, splitted)); - setTool(conditionalAssign(1, splitted)); - setFolder(conditionalAssign(2, splitted)); - setDocument(conditionalAssign(3, splitted)); + String[] splitted; + if (encoded != null && encoded.length() > 0) { + splitted = encoded.split("\\."); + } else { + splitted = EMPTY; + } + setGroup(conditionalAssign(0, splitted)); + setTool(conditionalAssign(1, splitted)); + setFolder(conditionalAssign(2, splitted)); + setDocument(conditionalAssign(3, splitted)); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -26,23 +26,23 @@ private String name; public TagDTO() { - this(null); + this(null); } public TagDTO(final String name) { - this.name = name; + this.name = name; } public String getName() { - return name; + return name; } public void setName(final String name) { - this.name = name; + this.name = name; } public String toString() { - return name; + return name; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagResultDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagResultDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagResultDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -27,32 +27,32 @@ private Long count; public TagResultDTO() { - this(null, null); + this(null, null); } public TagResultDTO(final String name, final Long count) { - this.name = name; - this.count = count; + this.name = name; + this.count = count; } public Long getCount() { - return count; + return count; } public String getName() { - return name; + return name; } public void setCount(final Long count) { - this.count = count; + this.count = count; } public void setName(final String name) { - this.name = name; + this.name = name; } public String toString() { - return name + "(" + count + ")"; + return name + "(" + count + ")"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -37,124 +37,124 @@ private String chatColor; public UserDTO() { - this(null, null, null, null, null, null, null, null, true, null, null); + this(null, null, null, null, null, null, null, null, true, null, null); } public UserDTO(final String name, final String shortName, final String password, final String email, - final I18nLanguageDTO language, final I18nCountryDTO country, final TimeZoneDTO timezone, - final String avatar, final boolean publishRoster, final SubscriptionMode subscriptionMode, - final String chatColor) { - this.name = name; - this.shortName = shortName; - this.password = password; - this.email = email; - this.language = language; - this.country = country; - this.timezone = timezone; - this.avatar = avatar; - this.publishRoster = publishRoster; - this.subscriptionMode = subscriptionMode; - this.chatColor = chatColor; + final I18nLanguageDTO language, final I18nCountryDTO country, final TimeZoneDTO timezone, + final String avatar, final boolean publishRoster, final SubscriptionMode subscriptionMode, + final String chatColor) { + this.name = name; + this.shortName = shortName; + this.password = password; + this.email = email; + this.language = language; + this.country = country; + this.timezone = timezone; + this.avatar = avatar; + this.publishRoster = publishRoster; + this.subscriptionMode = subscriptionMode; + this.chatColor = chatColor; } public String getAvatar() { - return avatar; + return avatar; } public String getChatColor() { - return chatColor; + return chatColor; } public I18nCountryDTO getCountry() { - return country; + return country; } public String getEmail() { - return email; + return email; } public Long getId() { - return id; + return id; } public I18nLanguageDTO getLanguage() { - return language; + return language; } public String getName() { - return name; + return name; } public String getPassword() { - return password; + return password; } public String getShortName() { - return shortName; + return shortName; } public SubscriptionMode getSubscriptionMode() { - return subscriptionMode; + return subscriptionMode; } public TimeZoneDTO getTimezone() { - return timezone; + return timezone; } public boolean isPublishRoster() { - return publishRoster; + return publishRoster; } public void setAvatar(final String avatar) { - this.avatar = avatar; + this.avatar = avatar; } public void setChatColor(final String chatColor) { - this.chatColor = chatColor; + this.chatColor = chatColor; } public void setCountry(final I18nCountryDTO country) { - this.country = country; + this.country = country; } public void setEmail(final String email) { - this.email = email; + this.email = email; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setLanguage(final I18nLanguageDTO language) { - this.language = language; + this.language = language; } public void setName(final String name) { - this.name = name; + this.name = name; } public void setPassword(final String password) { - this.password = password; + this.password = password; } public void setPublishRoster(final boolean publishRoster) { - this.publishRoster = publishRoster; + this.publishRoster = publishRoster; } public void setShortName(final String shortName) { - this.shortName = shortName; + this.shortName = shortName; } public void setSubscriptionMode(final SubscriptionMode subscriptionMode) { - this.subscriptionMode = subscriptionMode; + this.subscriptionMode = subscriptionMode; } public void setTimezone(final TimeZoneDTO timezone) { - this.timezone = timezone; + this.timezone = timezone; } public String toString() { - return "UserDTO[" + shortName + "]"; + return "UserDTO[" + shortName + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -36,84 +36,84 @@ private List<GroupDTO> groupsIsCollab; public String getChatName() { - return chatName; + return chatName; } public String getChatPassword() { - return chatPassword; + return chatPassword; } public I18nCountryDTO getCountry() { - return country; + return country; } public List<GroupDTO> getGroupsIsAdmin() { - return groupsIsAdmin; + return groupsIsAdmin; } public List<GroupDTO> getGroupsIsCollab() { - return groupsIsCollab; + return groupsIsCollab; } public String getHomePage() { - return homePage; + return homePage; } public I18nLanguageDTO getLanguage() { - return language; + return language; } public String getName() { - return name; + return name; } public String getShortName() { - return shortName; + return shortName; } public String getUserHash() { - return userHash; + return userHash; } public void setChatName(final String chatName) { - this.chatName = chatName; + this.chatName = chatName; } public void setChatPassword(final String password) { - this.chatPassword = password; + this.chatPassword = password; } public void setCountry(final I18nCountryDTO country) { - this.country = country; + this.country = country; } public void setGroupsIsAdmin(final List<GroupDTO> groupsIsAdmin) { - this.groupsIsAdmin = groupsIsAdmin; + this.groupsIsAdmin = groupsIsAdmin; } public void setGroupsIsCollab(final List<GroupDTO> groupsIsCollab) { - this.groupsIsCollab = groupsIsCollab; + this.groupsIsCollab = groupsIsCollab; } public void setHomePage(final String homePage) { - this.homePage = homePage; + this.homePage = homePage; } public void setLanguage(final I18nLanguageDTO language) { - this.language = language; + this.language = language; } public void setName(final String name) { - this.name = name; + this.name = name; } public void setShortName(final String shortName) { - this.shortName = shortName; + this.shortName = shortName; } public void setUserHash(final String userHash) { - this.userHash = userHash; + this.userHash = userHash; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserSimpleDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserSimpleDTO.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserSimpleDTO.java 2008-10-21 19:26:47 UTC (rev 917) @@ -30,27 +30,27 @@ private TimeZoneDTO timezone; public UserSimpleDTO() { - this(null, null, null, null, null); + this(null, null, null, null, null); } public UserSimpleDTO(final String name, final String shortName, final I18nLanguageDTO language, - final I18nCountryDTO country, final TimeZoneDTO timezone) { - this.name = name; - this.shortName = shortName; - this.language = language; - this.country = country; - this.timezone = timezone; + final I18nCountryDTO country, final TimeZoneDTO timezone) { + this.name = name; + this.shortName = shortName; + this.language = language; + this.country = country; + this.timezone = timezone; } @Override public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - final UserSimpleDTO other = (UserSimpleDTO) obj; + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + final UserSimpleDTO other = (UserSimpleDTO) obj; if (id == null) { if (other.id != null) { return false; @@ -58,75 +58,75 @@ } else if (!id.equals(other.id)) { return false; } - if (shortName == null) { - if (other.shortName != null) { - return false; - } - } else if (!shortName.equals(other.shortName)) { - return false; - } - return true; + if (shortName == null) { + if (other.shortName != null) { + return false; + } + } else if (!shortName.equals(other.shortName)) { + return false; + } + return true; } public I18nCountryDTO getCountry() { - return country; + return country; } public Long getId() { - return id; + return id; } public I18nLanguageDTO getLanguage() { - return language; + return language; } public String getName() { - return name; + return name; } public String getShortName() { - return shortName; + return shortName; } public TimeZoneDTO getTimezone() { - return timezone; + return timezone; } @Override public int hashCode() { - final int prime = 31; - int result = 1; + final int prime = 31; + int result = 1; result = prime * result + (id == null ? 0 : id.hashCode()); - result = prime * result + (shortName == null ? 0 : shortName.hashCode()); - return result; + result = prime * result + (shortName == null ? 0 : shortName.hashCode()); + return result; } public void setCountry(final I18nCountryDTO country) { - this.country = country; + this.country = country; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setLanguage(final I18nLanguageDTO language) { - this.language = language; + this.language = language; } public void setName(final String name) { - this.name = name; + this.name = name; } public void setShortName(final String shortName) { - this.shortName = shortName; + this.shortName = shortName; } public void setTimezone(final TimeZoneDTO timezone) { - this.timezone = timezone; + this.timezone = timezone; } public String toString() { - return "UserSimpleDTO(" + shortName + ")"; + return "UserSimpleDTO(" + shortName + ")"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.client.errors; - public class AccessViolationException extends DefaultException { private static final long serialVersionUID = 1L; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyUserMemberException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyUserMemberException.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyUserMemberException.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.client.errors; - public class AlreadyUserMemberException extends DefaultException { private static final long serialVersionUID = 1L; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContainerNotPermittedException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContainerNotPermittedException.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContainerNotPermittedException.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.client.errors; - public class ContainerNotPermittedException extends DefaultException { private static final long serialVersionUID = 1L; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotFoundException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotFoundException.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotFoundException.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.client.errors; - public class ContentNotFoundException extends DefaultException { private static final long serialVersionUID = 1L; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/errors/DefaultException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/DefaultException.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/DefaultException.java 2008-10-21 19:26:47 UTC (rev 917) @@ -7,14 +7,14 @@ private static final long serialVersionUID = 1L; public DefaultException() { - this(0, ""); + this(0, ""); } public DefaultException(final int statusCode, final String message) { - super(statusCode, message); + super(statusCode, message); } public DefaultException(final String message) { - this(0, message); + this(0, message); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/errors/EmailAddressInUseException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/EmailAddressInUseException.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/EmailAddressInUseException.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.client.errors; - public class EmailAddressInUseException extends DefaultException { private static final long serialVersionUID = 1L; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNameInUseException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNameInUseException.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNameInUseException.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.client.errors; - public class GroupNameInUseException extends DefaultException { private static final long serialVersionUID = 1L; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/errors/I18nNotFoundException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/I18nNotFoundException.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/I18nNotFoundException.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.client.errors; - public class I18nNotFoundException extends DefaultException { private static final long serialVersionUID = 1L; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.client.errors; - public class LastAdminInGroupException extends DefaultException { private static final long serialVersionUID = 1L; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.client.errors; - public class NoDefaultContentException extends DefaultException { private static final long serialVersionUID = 1L; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.java 2008-10-21 19:26:47 UTC (rev 917) @@ -19,7 +19,6 @@ */ package org.ourproject.kune.platf.client.errors; - public class ToolNotFoundException extends DefaultException { private static final long serialVersionUID = 1L; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java 2008-10-21 19:26:47 UTC (rev 917) @@ -28,11 +28,11 @@ private static KuneErrorHandler errorHandler; public static void init(KuneErrorHandler kuneErrorHandler) { - errorHandler = kuneErrorHandler; + errorHandler = kuneErrorHandler; } public void onFailure(final Throwable caught) { - errorHandler.process(caught); + errorHandler.process(caught); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java 2008-10-21 19:26:47 UTC (rev 917) @@ -39,7 +39,7 @@ void addAuthor(String userHash, StateToken token, String authorShortName) throws DefaultException; CommentDTO addComment(String userHash, StateToken token, Long parentCommentId, String commentText) - throws DefaultException; + throws DefaultException; CommentDTO addComment(String userHash, StateToken token, String commentText) throws DefaultException; @@ -80,5 +80,5 @@ List<TagResultDTO> setTags(String userHash, StateToken token, String tags) throws DefaultException; CommentDTO voteComment(String userHash, StateToken token, Long commentId, boolean votePositive) - throws DefaultException; + throws DefaultException; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java 2008-10-21 19:26:47 UTC (rev 917) @@ -38,7 +38,7 @@ void addAuthor(String userHash, StateToken token, String authorShortName, AsyncCallback<?> asyncCallback); void addComment(String userHash, StateToken token, Long parentCommentId, String commentText, - AsyncCallback<CommentDTO> asyncCallback); + AsyncCallback<CommentDTO> asyncCallback); void addComment(String userHash, StateToken token, String commentText, AsyncCallback<CommentDTO> asyncCallback); @@ -69,17 +69,17 @@ void setAsDefaultContent(String userHash, StateToken token, AsyncCallback<ContentSimpleDTO> asyncCallback); void setLanguage(String userHash, StateToken token, String languageCode, - AsyncCallback<I18nLanguageDTO> asyncCallback); + AsyncCallback<I18nLanguageDTO> asyncCallback); void setPublishedOn(String userHash, StateToken token, Date publishedOn, AsyncCallback<?> asyncCallback); void setStatus(String userHash, StateToken stateToken, ContentStatusDTO status, AsyncCallback<?> asyncCallback); void setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status, - AsyncCallback<?> asyncCallback); + AsyncCallback<?> asyncCallback); void setTags(String userHash, StateToken token, String tags, AsyncCallback<List<TagResultDTO>> asyncCallback); void voteComment(String userHash, StateToken token, Long commentId, boolean votePositive, - AsyncCallback<CommentDTO> asyncCallback); + AsyncCallback<CommentDTO> asyncCallback); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java 2008-10-21 19:26:47 UTC (rev 917) @@ -33,6 +33,8 @@ StateToken createNewGroup(String userHash, GroupDTO group, String publicDesc, String tags, String[] enabledTools) throws DefaultException; - GroupDTO setGroupLogo(String userHash, StateToken token); + GroupDTO getGroup(String userHash, StateToken token); + GroupDTO setGroupFullLogo(String userHash, StateToken token); + } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java 2008-10-21 19:26:47 UTC (rev 917) @@ -32,6 +32,8 @@ void createNewGroup(String userHash, GroupDTO group, String publicDesc, String tags, String[] enabledTools, AsyncCallback<StateToken> callback); - void setGroupLogo(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback); + void getGroup(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback); + void setGroupFullLogo(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback); + } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteService.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteService.java 2008-10-21 19:26:47 UTC (rev 917) @@ -30,15 +30,15 @@ public interface SiteService extends RemoteService { public class App { - private static SiteServiceAsync ourInstance = null; + private static SiteServiceAsync ourInstance = null; - public static synchronized SiteServiceAsync getInstance() { - if (ourInstance == null) { - ourInstance = (SiteServiceAsync) GWT.create(SiteService.class); - ((ServiceDefTarget) ourInstance).setServiceEntryPoint(GWT.getModuleBaseURL() + "SiteService"); - } - return ourInstance; - } + public static synchronized SiteServiceAsync getInstance() { + if (ourInstance == null) { + ourInstance = (SiteServiceAsync) GWT.create(SiteService.class); + ((ServiceDefTarget) ourInstance).setServiceEntryPoint(GWT.getModuleBaseURL() + "SiteService"); + } + return ourInstance; + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java 2008-10-21 19:26:47 UTC (rev 917) @@ -30,23 +30,23 @@ public interface SocialNetworkService extends RemoteService { - SocialNetworkResultDTO AcceptJoinGroup(String hash, StateToken groupToken, String groupToAcceptShortName) - throws DefaultException; + SocialNetworkResultDTO acceptJoinGroup(String hash, StateToken groupToken, String groupToAcceptShortName) + throws DefaultException; SocialNetworkResultDTO addAdminMember(String hash, StateToken groupToken, String groupToAddShortName) - throws DefaultException; + throws DefaultException; SocialNetworkResultDTO addCollabMember(String hash, StateToken groupToken, String groupToAddShortName) - throws DefaultException; + throws DefaultException; SocialNetworkResultDTO addViewerMember(String hash, StateToken groupToken, String groupToAddShortName) - throws DefaultException; + throws DefaultException; SocialNetworkResultDTO deleteMember(String hash, StateToken groupToken, String groupToDeleteShortName) - throws DefaultException; + throws DefaultException; SocialNetworkResultDTO denyJoinGroup(String hash, StateToken groupToken, String groupToDenyShortName) - throws DefaultException; + throws DefaultException; SocialNetworkDTO getGroupMembers(String hash, StateToken groupToken) throws DefaultException; @@ -55,10 +55,10 @@ SocialNetworkRequestResult requestJoinGroup(String hash, StateToken groupToken) throws DefaultException; SocialNetworkResultDTO setAdminAsCollab(String hash, StateToken groupToken, String groupToSetCollabShortName) - throws DefaultException; + throws DefaultException; SocialNetworkResultDTO setCollabAsAdmin(String hash, StateToken groupToken, String groupToSetAdminShortName) - throws DefaultException; + throws DefaultException; SocialNetworkResultDTO unJoinGroup(String hash, StateToken groupToken) throws DefaultException; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkServiceAsync.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkServiceAsync.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkServiceAsync.java 2008-10-21 19:26:47 UTC (rev 917) @@ -27,23 +27,23 @@ public interface SocialNetworkServiceAsync { - void AcceptJoinGroup(String hash, StateToken groupToken, String groupToAcceptShortName, - AsyncCallback<SocialNetworkResultDTO> callback); + void acceptJoinGroup(String hash, StateToken groupToken, String groupToAcceptShortName, + AsyncCallback<SocialNetworkResultDTO> callback); void addAdminMember(String hash, StateToken groupToken, String groupToAddShortName, - AsyncCallback<SocialNetworkResultDTO> callback); + AsyncCallback<SocialNetworkResultDTO> callback); void addCollabMember(String hash, StateToken groupToken, String groupToAddShortName, - AsyncCallback<SocialNetworkResultDTO> callback); + AsyncCallback<SocialNetworkResultDTO> callback); void addViewerMember(String hash, StateToken groupToken, String groupToAddShortName, - AsyncCallback<SocialNetworkResultDTO> callback); + AsyncCallback<SocialNetworkResultDTO> callback); void deleteMember(String hash, StateToken groupToken, String groupToDeleteShortName, - AsyncCallback<SocialNetworkResultDTO> callback); + AsyncCallback<SocialNetworkResultDTO> callback); void denyJoinGroup(String hash, StateToken groupToken, String groupToDenyShortName, - AsyncCallback<SocialNetworkResultDTO> callback); + AsyncCallback<SocialNetworkResultDTO> callback); void getGroupMembers(String hash, StateToken groupToken, AsyncCallback<SocialNetworkResultDTO> callback); @@ -52,10 +52,10 @@ void requestJoinGroup(String hash, StateToken groupToken, AsyncCallback<?> callback); void setAdminAsCollab(String hash, StateToken groupToken, String groupToSetCollabShortName, - AsyncCallback<SocialNetworkResultDTO> callback); + AsyncCallback<SocialNetworkResultDTO> callback); void setCollabAsAdmin(String hash, StateToken groupToken, String groupToSetAdminShortName, - AsyncCallback<SocialNetworkResultDTO> callback); + AsyncCallback<SocialNetworkResultDTO> callback); void unJoinGroup(String hash, StateToken groupToken, AsyncCallback<SocialNetworkResultDTO> callback); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationService.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationService.java 2008-10-21 19:26:47 UTC (rev 917) @@ -142,11 +142,14 @@ // [month]".t(::Date::MONTHNAMES[mon]) // when '%b'; o << "#{::Date::ABBR_MONTHNAMES[mon]} [abbreviated // month]".t(::Date::ABBR_MONTHNAMES[mon]) - // when '%c'; o << ((Locale.active? && !Locale.active.date_format.nil?) ? + // when '%c'; o << ((Locale.active? && !Locale.active.date_format.nil?) + // ? // localize(Locale.active.date_format) : strftime('%Y-%m-%d')) - // when '%p'; o << if hour < 12 then 'AM [Ante Meridiem]'.t("am") else 'PM [Post + // when '%p'; o << if hour < 12 then 'AM [Ante Meridiem]'.t("am") else + // 'PM [Post // Meridiem]'.t("am") end - // when '%P'; o << if hour < 12 then 'AM [Ante Meridiem]'.t("AM") else 'PM [Post + // when '%P'; o << if hour < 12 then 'AM [Ante Meridiem]'.t("AM") else + // 'PM [Post // Meridiem]'.t("PM") end // else; o << c } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageUtils.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageUtils.java 2008-10-21 19:26:47 UTC (rev 917) @@ -5,398 +5,398 @@ public class ImageUtils { public AbstractImagePrototype getImage(final ImageDescriptor imageDescriptor) { - final Images img = Images.App.getInstance(); - switch (imageDescriptor) { - case accept: { - return img.accept(); - } - case add: { - return img.add(); - } - case addGreen: { - return img.addGreen(); - } - case alert: { - return img.alert(); - } - case anybody: { - return img.anybody(); - } - case arrowDownBlack: { - return img.arrowDownBlack(); - } - case arrowDownGreen: { - return img.arrowDownGreen(); - } - case arrowDownWhite: { - return img.arrowDownWhite(); - } - case arrowLeftGreen: { - return img.arrowLeftGreen(); - } - case arrowRightBlack: { - return img.arrowRightBlack(); - } - case arrowRightGreen: { - return img.arrowRightGreen(); - } - case arrowRightWhite: { - return img.arrowRightWhite(); - } - case arrowUpGreen: { - return img.arrowUpGreen(); - } - case bulletAdd: { - return img.bulletAdd(); - } - case bulletBlack: { - return img.bulletBlack(); - } - case bulletBlue: { - return img.bulletBlue(); - } - case bulletDelete: { - return img.bulletDelete(); - } - case bulletGreen: { - return img.bulletGreen(); - } - case bulletPink: { - return img.bulletPink(); - } - case bulletPurple: { - return img.bulletPurple(); - } - case bulletRed: { - return img.bulletRed(); - } - case bulletStar: { - return img.bulletStar(); - } - case bulletToggleMinus: { - return img.bulletToggleMinus(); - } - case bulletTogglePlus: { - return img.bulletTogglePlus(); - } - case bulletYellow: { - return img.bulletYellow(); - } - case button15cblue: { - return img.button15cblue(); - } - case button15cdark: { - return img.button15cdark(); - } - case button15clight: { - return img.button15clight(); - } - case button15cxlight: { - return img.button15cxlight(); - } - case button15lblue: { - return img.button15lblue(); - } - case button15ldark: { - return img.button15ldark(); - } - case button15llight: { - return img.button15llight(); - } - case button15lxlight: { - return img.button15lxlight(); - } - case button15rblue: { - return img.button15rblue(); - } - case button15rdark: { - return img.button15rdark(); - } - case button15rlight: { - return img.button15rlight(); - } - case button15rxlight: { - return img.button15rxlight(); - } - case button17cblue: { - return img.button17cblue(); - } - case button17cdark: { - return img.button17cdark(); - } - case button17clight: { - return img.button17clight(); - } - case button17cxlight: { - return img.button17cxlight(); - } - case button17lblue: { - return img.button17lblue(); - } - case button17ldark: { - return img.button17ldark(); - } - case button17llight: { - return img.button17llight(); - } - case button17lxlight: { - return img.button17lxlight(); - } - case button17rblue: { - return img.button17rblue(); - } - case button17rdark: { - return img.button17rdark(); - } - case button17rlight: { - return img.button17rlight(); - } - case button17rxlight: { - return img.button17rxlight(); - } - case button20cblue: { - return img.button20cblue(); - } - case button20cdark: { - return img.button20cdark(); - } - case button20clight: { - return img.button20clight(); - } - case button20cxlight: { - return img.button20cxlight(); - } - case button20lblue: { - return img.button20lblue(); - } - case button20ldark: { - return img.button20ldark(); - } - case button20llight: { - return img.button20llight(); - } - case button20lxlight: { - return img.button20lxlight(); - } - case button20rblue: { - return img.button20rblue(); - } - case button20rdark: { - return img.button20rdark(); - } - case button20rlight: { - return img.button20rlight(); - } - case button20rxlight: { - return img.button20rxlight(); - } - case buttonArrowDown: { - return img.buttonArrowDown(); - } - case buttonHelpBlue: { - return img.buttonHelpBlue(); - } - case buttonHelpDark: { - return img.buttonHelpDark(); - } - case buttonHelpLight: { - return img.buttonHelpLight(); - } - case buttonSitebarArrowDown: { - return img.buttonSitebarArrowDown(); - } - case by80x15: { - return img.by80x15(); - } - case bync80x15: { - return img.bync80x15(); - } - case byncnd80x15: { - return img.byncnd80x15(); - } - case byncsa80x15: { - return img.byncsa80x15(); - } - case bynd80x15: { - return img.bynd80x15(); - } - case bysa80x15: { - return img.bysa80x15(); - } - case cancel: { - return img.cancel(); - } - case chat: { - return img.chat(); - } - case clear: { - return img.clear(); - } - case copyleft: { - return img.copyleft(); - } - case cross: { - return img.cross(); - } - case crossDark: { - return img.crossDark(); - } - case del: { - return img.del(); - } - case emblemImportant: { - return img.emblemImportant(); - } - case error: { - return img.error(); - } - case everybody: { - return img.everybody(); - } - case fullscreen: { - return img.fullscreen(); - } - case gnuFdl: { - return img.gnuFdl(); - } - case groupDefIcon: { - return img.groupDefIcon(); - } - case groupHome: { - return img.groupHome(); - } - case important: { - return img.important(); - } - case info: { - return img.info(); - } - case infoLight: { - return img.infoLight(); - } - case kuneClose: { - return img.kuneClose(); - } - case kuneExternalWindow: { - return img.kuneExternalWindow(); - } - case kuneHelpTranslationIcon: { - return img.kuneHelpTranslationIcon(); - } - case kuneIcon16: { - return img.kuneIcon16(); - } - case kuneLogo16px: { - return img.kuneLogo16px(); - } - case kunePreferences: { - return img.kunePreferences(); - } - case kuneSearchIco: { - return img.kuneSearchIco(); - } - case kuneSearchIcoPush: { - return img.kuneSearchIcoPush(); - } - case language: { - return img.language(); - } - case nobody: { - return img.nobody(); - } - case noCopyleft: { - return img.noCopyleft(); - } - case nt: { - return img.nt(); - } - case opentriangle: { - return img.opentriangle(); - } - case personDef: { - return img.personDef(); - } - case remove: { - return img.remove(); - } - case rssIcon: { - return img.rssIcon(); - } - case searchIco: { - return img.searchIco(); - } - case spinKuneThundGreen: { - return img.spinKuneThundGreen(); - } - case splitterVertBar: { - return img.splitterVertBar(); - } - case star10: { - return img.star10(); - } - case star20: { - return img.star20(); - } - case star30: { - return img.star30(); - } - case star40: { - return img.star40(); - } - case star50: { - return img.star50(); - } - case star60: { - return img.star60(); - } - case star70: { - return img.star70(); - } - case star80: { - return img.star80(); - } - case star90: { - return img.star90(); - } - case starGrey: { - return img.starGrey(); - } - case starSmallYellow: { - return img.starSmallYellow(); - } - case starVsmallYellow: { - return img.starVsmallYellow(); - } - case starYellow: { - return img.starYellow(); - } - case step1: { - return img.step1(); - } - case step2: { - return img.step2(); - } - case step3: { - return img.step3(); - } - case step4: { - return img.step4(); - } - case step5: { - return img.step5(); - } - case themeChoose: { - return img.themeChoose(); - } - case triangle: { - return img.triangle(); - } - default: - return null; - } + final Images img = Images.App.getInstance(); + switch (imageDescriptor) { + case accept: { + return img.accept(); + } + case add: { + return img.add(); + } + case addGreen: { + return img.addGreen(); + } + case alert: { + return img.alert(); + } + case anybody: { + return img.anybody(); + } + case arrowDownBlack: { + return img.arrowDownBlack(); + } + case arrowDownGreen: { + return img.arrowDownGreen(); + } + case arrowDownWhite: { + return img.arrowDownWhite(); + } + case arrowLeftGreen: { + return img.arrowLeftGreen(); + } + case arrowRightBlack: { + return img.arrowRightBlack(); + } + case arrowRightGreen: { + return img.arrowRightGreen(); + } + case arrowRightWhite: { + return img.arrowRightWhite(); + } + case arrowUpGreen: { + return img.arrowUpGreen(); + } + case bulletAdd: { + return img.bulletAdd(); + } + case bulletBlack: { + return img.bulletBlack(); + } + case bulletBlue: { + return img.bulletBlue(); + } + case bulletDelete: { + return img.bulletDelete(); + } + case bulletGreen: { + return img.bulletGreen(); + } + case bulletPink: { + return img.bulletPink(); + } + case bulletPurple: { + return img.bulletPurple(); + } + case bulletRed: { + return img.bulletRed(); + } + case bulletStar: { + return img.bulletStar(); + } + case bulletToggleMinus: { + return img.bulletToggleMinus(); + } + case bulletTogglePlus: { + return img.bulletTogglePlus(); + } + case bulletYellow: { + return img.bulletYellow(); + } + case button15cblue: { + return img.button15cblue(); + } + case button15cdark: { + return img.button15cdark(); + } + case button15clight: { + return img.button15clight(); + } + case button15cxlight: { + return img.button15cxlight(); + } + case button15lblue: { + return img.button15lblue(); + } + case button15ldark: { + return img.button15ldark(); + } + case button15llight: { + return img.button15llight(); + } + case button15lxlight: { + return img.button15lxlight(); + } + case button15rblue: { + return img.button15rblue(); + } + case button15rdark: { + return img.button15rdark(); + } + case button15rlight: { + return img.button15rlight(); + } + case button15rxlight: { + return img.button15rxlight(); + } + case button17cblue: { + return img.button17cblue(); + } + case button17cdark: { + return img.button17cdark(); + } + case button17clight: { + return img.button17clight(); + } + case button17cxlight: { + return img.button17cxlight(); + } + case button17lblue: { + return img.button17lblue(); + } + case button17ldark: { + return img.button17ldark(); + } + case button17llight: { + return img.button17llight(); + } + case button17lxlight: { + return img.button17lxlight(); + } + case button17rblue: { + return img.button17rblue(); + } + case button17rdark: { + return img.button17rdark(); + } + case button17rlight: { + return img.button17rlight(); + } + case button17rxlight: { + return img.button17rxlight(); + } + case button20cblue: { + return img.button20cblue(); + } + case button20cdark: { + return img.button20cdark(); + } + case button20clight: { + return img.button20clight(); + } + case button20cxlight: { + return img.button20cxlight(); + } + case button20lblue: { + return img.button20lblue(); + } + case button20ldark: { + return img.button20ldark(); + } + case button20llight: { + return img.button20llight(); + } + case button20lxlight: { + return img.button20lxlight(); + } + case button20rblue: { + return img.button20rblue(); + } + case button20rdark: { + return img.button20rdark(); + } + case button20rlight: { + return img.button20rlight(); + } + case button20rxlight: { + return img.button20rxlight(); + } + case buttonArrowDown: { + return img.buttonArrowDown(); + } + case buttonHelpBlue: { + return img.buttonHelpBlue(); + } + case buttonHelpDark: { + return img.buttonHelpDark(); + } + case buttonHelpLight: { + return img.buttonHelpLight(); + } + case buttonSitebarArrowDown: { + return img.buttonSitebarArrowDown(); + } + case by80x15: { + return img.by80x15(); + } + case bync80x15: { + return img.bync80x15(); + } + case byncnd80x15: { + return img.byncnd80x15(); + } + case byncsa80x15: { + return img.byncsa80x15(); + } + case bynd80x15: { + return img.bynd80x15(); + } + case bysa80x15: { + return img.bysa80x15(); + } + case cancel: { + return img.cancel(); + } + case chat: { + return img.chat(); + } + case clear: { + return img.clear(); + } + case copyleft: { + return img.copyleft(); + } + case cross: { + return img.cross(); + } + case crossDark: { + return img.crossDark(); + } + case del: { + return img.del(); + } + case emblemImportant: { + return img.emblemImportant(); + } + case error: { + return img.error(); + } + case everybody: { + return img.everybody(); + } + case fullscreen: { + return img.fullscreen(); + } + case gnuFdl: { + return img.gnuFdl(); + } + case groupDefIcon: { + return img.groupDefIcon(); + } + case groupHome: { + return img.groupHome(); + } + case important: { + return img.important(); + } + case info: { + return img.info(); + } + case infoLight: { + return img.infoLight(); + } + case kuneClose: { + return img.kuneClose(); + } + case kuneExternalWindow: { + return img.kuneExternalWindow(); + } + case kuneHelpTranslationIcon: { + return img.kuneHelpTranslationIcon(); + } + case kuneIcon16: { + return img.kuneIcon16(); + } + case kuneLogo16px: { + return img.kuneLogo16px(); + } + case kunePreferences: { + return img.kunePreferences(); + } + case kuneSearchIco: { + return img.kuneSearchIco(); + } + case kuneSearchIcoPush: { + return img.kuneSearchIcoPush(); + } + case language: { + return img.language(); + } + case nobody: { + return img.nobody(); + } + case noCopyleft: { + return img.noCopyleft(); + } + case nt: { + return img.nt(); + } + case opentriangle: { + return img.opentriangle(); + } + case personDef: { + return img.personDef(); + } + case remove: { + return img.remove(); + } + case rssIcon: { + return img.rssIcon(); + } + case searchIco: { + return img.searchIco(); + } + case spinKuneThundGreen: { + return img.spinKuneThundGreen(); + } + case splitterVertBar: { + return img.splitterVertBar(); + } + case star10: { + return img.star10(); + } + case star20: { + return img.star20(); + } + case star30: { + return img.star30(); + } + case star40: { + return img.star40(); + } + case star50: { + return img.star50(); + } + case star60: { + return img.star60(); + } + case star70: { + return img.star70(); + } + case star80: { + return img.star80(); + } + case star90: { + return img.star90(); + } + case starGrey: { + return img.starGrey(); + } + case starSmallYellow: { + return img.starSmallYellow(); + } + case starVsmallYellow: { + return img.starVsmallYellow(); + } + case starYellow: { + return img.starYellow(); + } + case step1: { + return img.step1(); + } + case step2: { + return img.step2(); + } + case step3: { + return img.step3(); + } + case step4: { + return img.step4(); + } + case step5: { + return img.step5(); + } + case themeChoose: { + return img.themeChoose(); + } + case triangle: { + return img.triangle(); + } + default: + return null; + } } public String getImageHtml(final ImageDescriptor imageDescriptor) { - return getImage(imageDescriptor).getHTML(); + return getImage(imageDescriptor).getHTML(); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/Images.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/Images.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/Images.java 2008-10-21 19:26:47 UTC (rev 917) @@ -27,14 +27,14 @@ public interface Images extends ImageBundle { public static class App { - private static Images ourInstance = null; + private static Images ourInstance = null; - public static synchronized Images getInstance() { - if (ourInstance == null) { - ourInstance = (Images) GWT.create(Images.class); - } - return ourInstance; - } + public static synchronized Images getInstance() { + if (ourInstance == null) { + ourInstance = (Images) GWT.create(Images.class); + } + return ourInstance; + } } @Resource("org/ourproject/kune/platf/public/images/accept.png") Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java 2008-10-21 19:26:47 UTC (rev 917) @@ -32,6 +32,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.site.Site; +import org.ourproject.kune.workspace.client.skel.EntityWorkspace; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.allen_sauer.gwt.log.client.Log; @@ -41,6 +42,7 @@ import com.calclab.suco.client.listener.Listener0; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException; +import com.google.gwt.user.client.ui.Label; public class KuneErrorHandler { private final Session session; @@ -61,7 +63,7 @@ public void doSessionExpired() { onSessionExpired.fire(); getWorkspaceSkeleton().showAlertMessage(i18n.t("Session expired"), - i18n.t("Your session has expired. Please login again.")); + i18n.t("Your session has expired. Please login again.")); } public WorkspaceSkeleton getWorkspaceSkeleton() { @@ -83,8 +85,15 @@ logException(e); doSessionExpired(); } catch (final NoDefaultContentException e) { - Site.info("This user don't have a homepage"); - stateManagerProvider.get().restorePreviousState(); + EntityWorkspace ws = wsProvider.get().getEntityWorkspace(); + ws.setContent(new Label(i18n.t("This user don't have a homepage"))); + ws.setContext(new Label("")); + ws.getSubTitle().removeAll(); + ws.getTitleComponent().removeAll(); + ws.getContentTopBar().removeAll(); + ws.getContextTopBar().removeAll(); + ws.getContentBottomBar().removeAll(); + ws.getContextBottomBar().removeAll(); } catch (final UserMustBeLoggedException e) { logException(e); if (session.isLogged()) { @@ -109,9 +118,9 @@ } catch (final LastAdminInGroupException e) { logException(e); getWorkspaceSkeleton().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 unjoin this group.")); + i18n.t("Warning"), + i18n.t("Sorry, you are the last admin of this group." + + " Look for someone to substitute you appropriately as admin before unjoin this group.")); } catch (final AlreadyGroupMemberException e) { logException(e); Site.error(i18n.t("This group is already a group member")); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-21 19:26:47 UTC (rev 917) @@ -42,6 +42,10 @@ import org.ourproject.kune.workspace.client.editor.TextEditor; import org.ourproject.kune.workspace.client.editor.TextEditorPanel; import org.ourproject.kune.workspace.client.editor.TextEditorPresenter; +import org.ourproject.kune.workspace.client.entitylogo.EntityLogo; +import org.ourproject.kune.workspace.client.entitylogo.EntityLogoSelector; +import org.ourproject.kune.workspace.client.entitylogo.EntityLogoSelectorPanel; +import org.ourproject.kune.workspace.client.entitylogo.EntityLogoSelectorPresenter; import org.ourproject.kune.workspace.client.i18n.I18nTranslator; import org.ourproject.kune.workspace.client.i18n.I18nTranslatorPresenter; import org.ourproject.kune.workspace.client.i18n.I18nTranslatorView; @@ -118,8 +122,7 @@ }, new Factory<SocialNetworkServiceAsync>(SocialNetworkServiceAsync.class) { @Override public SocialNetworkServiceAsync create() { - final SocialNetworkServiceAsync snServiceAsync = (SocialNetworkServiceAsync) GWT - .create(SocialNetworkService.class); + final SocialNetworkServiceAsync snServiceAsync = (SocialNetworkServiceAsync) GWT.create(SocialNetworkService.class); ((ServiceDefTarget) snServiceAsync).setServiceEntryPoint(GWT.getModuleBaseURL() + "SocialNetworkService"); return snServiceAsync; @@ -135,8 +138,7 @@ @Override public ContentServiceAsync create() { final ContentServiceAsync contentServiceAsync = (ContentServiceAsync) GWT.create(ContentService.class); - ((ServiceDefTarget) contentServiceAsync) - .setServiceEntryPoint(GWT.getModuleBaseURL() + "ContentService"); + ((ServiceDefTarget) contentServiceAsync).setServiceEntryPoint(GWT.getModuleBaseURL() + "ContentService"); return contentServiceAsync; } }); @@ -427,6 +429,18 @@ } }); + register(Singleton.class, new Factory<EntityLogoSelector>(EntityLogoSelector.class) { + @Override + public EntityLogoSelector create() { + final EntityLogoSelectorPresenter presenter = new EntityLogoSelectorPresenter($(Session.class), + $(EntityLogo.class)); + final EntityLogoSelectorPanel panel = new EntityLogoSelectorPanel(presenter, + $(WorkspaceSkeleton.class), $(I18nTranslationService.class)); + presenter.init(panel); + return presenter; + } + }); + $(ApplicationComponentGroup.class).createAll(); $(ToolGroup.class).createAll(); $(Application.class).start(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java 2008-10-21 19:26:47 UTC (rev 917) @@ -21,6 +21,7 @@ import org.ourproject.kune.workspace.client.entitylogo.EntityLogo; import org.ourproject.kune.workspace.client.entitylogo.EntityLogoPanel; import org.ourproject.kune.workspace.client.entitylogo.EntityLogoPresenter; +import org.ourproject.kune.workspace.client.entitylogo.EntityLogoSelector; import org.ourproject.kune.workspace.client.i18n.I18nTranslator; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.licensefoot.EntityLicensePanel; @@ -230,9 +231,9 @@ @Override public EntityLogo create() { final EntityLogoPresenter presenter = new EntityLogoPresenter($(StateManager.class), - $(WsThemePresenter.class), $(Session.class)); + $(WsThemePresenter.class), $(Session.class), $$(GroupServiceAsync.class)); final EntityLogoPanel panel = new EntityLogoPanel($(I18nUITranslationService.class), - $(WorkspaceSkeleton.class), $$(FileDownloadUtils.class)); + $(WorkspaceSkeleton.class), $$(FileDownloadUtils.class), $$(EntityLogoSelector.class)); presenter.init(panel); return presenter; } @@ -370,6 +371,5 @@ return presenter; } }); - } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -35,26 +35,26 @@ private final HashMap<StateToken, StateDTO> cache; public ContentProviderDefault(final ContentServiceAsync server) { - this.server = server; - this.cache = new HashMap<StateToken, StateDTO>(); + this.server = server; + this.cache = new HashMap<StateToken, StateDTO>(); } public void cache(final StateToken encodeState, final StateDTO content) { - cache.put(encodeState, content); + cache.put(encodeState, content); } public void getContent(final String user, final StateToken newState, final AsyncCallback<StateDTO> callback) { - Site.showProgressLoading(); - final StateDTO catched = getCached(newState); - if (catched != null) { - callback.onSuccess(catched); - } else { - server.getContent(user, newState, callback); - } + Site.showProgressLoading(); + final StateDTO catched = getCached(newState); + if (catched != null) { + callback.onSuccess(catched); + } else { + server.getContent(user, newState, callback); + } } private StateDTO getCached(final StateToken newState) { - return cache.remove(newState); + return cache.remove(newState); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2008-10-21 19:26:47 UTC (rev 917) @@ -39,52 +39,52 @@ /** * Duration remembering login: 2 weeks */ - public static int SESSION_DURATION = 1000 * 60 * 60 * 24 * 14; + int SESSION_DURATION = 1000 * 60 * 60 * 24 * 14; - public void check(AsyncCallbackSimple<?> callback); + void check(AsyncCallbackSimple<?> callback); - public List<I18nCountryDTO> getCountries(); + List<I18nCountryDTO> getCountries(); - public Object[][] getCountriesArray(); + Object[][] getCountriesArray(); - public I18nLanguageDTO getCurrentLanguage(); + I18nLanguageDTO getCurrentLanguage(); - public StateDTO getCurrentState(); + StateDTO getCurrentState(); - public StateToken getCurrentStateToken(); + StateToken getCurrentStateToken(); - public List<I18nLanguageSimpleDTO> getLanguages(); + UserInfoDTO getCurrentUserInfo(); - public Object[][] getLanguagesArray(); + String getGalleryPermittedExtensions(); - public List<LicenseDTO> getLicenses(); + List<I18nLanguageSimpleDTO> getLanguages(); - public Object[][] getTimezones(); + Object[][] getLanguagesArray(); - public boolean isLogged(); + List<LicenseDTO> getLicenses(); - public void setCurrent(final StateDTO currentState); + Object[][] getTimezones(); - public void setCurrentLanguage(final I18nLanguageDTO currentLanguage); + String getUserHash(); - public void setCurrentState(final StateDTO currentState); + boolean isLogged(); - public void setInitData(InitDataDTO initData); + void onInitDataReceived(Listener<InitDataDTO> listener); - UserInfoDTO getCurrentUserInfo(); + void onUserSignIn(Listener<UserInfoDTO> listener); - String getGalleryPermittedExtensions(); + void onUserSignOut(Listener0 listener); - String getUserHash(); + void setCurrent(final StateDTO currentState); - void onInitDataReceived(Listener<InitDataDTO> listener); + void setCurrentLanguage(final I18nLanguageDTO currentLanguage); - void onUserSignIn(Listener<UserInfoDTO> listener); + void setCurrentState(final StateDTO currentState); - void onUserSignOut(Listener0 listener); - void setCurrentUserInfo(UserInfoDTO currentUserInfo); + void setInitData(InitDataDTO initData); + void setUserHash(String userHash); } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/tool/AbstractClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/tool/AbstractClientTool.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/tool/AbstractClientTool.java 2008-10-21 19:26:47 UTC (rev 917) @@ -26,11 +26,11 @@ public abstract class AbstractClientTool implements ClientTool { public AbstractClientTool(final String shortName, final String longName, final ToolSelector toolSelector, - final WsThemePresenter wsThemePresenter, final WorkspaceSkeleton ws) { - final ToolSelectorItemPresenter presenter = new ToolSelectorItemPresenter(shortName, longName, toolSelector, - wsThemePresenter); - final ToolSelectorItemPanel panel = new ToolSelectorItemPanel(presenter, ws); - presenter.init(panel); + final WsThemePresenter wsThemePresenter, final WorkspaceSkeleton ws) { + final ToolSelectorItemPresenter presenter = new ToolSelectorItemPresenter(shortName, longName, toolSelector, + wsThemePresenter); + final ToolSelectorItemPanel panel = new ToolSelectorItemPanel(presenter, ws); + presenter.init(panel); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/tool/ClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/tool/ClientTool.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/tool/ClientTool.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.client.tool; - public interface ClientTool { String getName(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelector.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelector.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelector.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,8 +1,7 @@ package org.ourproject.kune.platf.client.tool; - public interface ToolSelector { - public void addTool(ToolSelectorItem item); + void addTool(ToolSelectorItem item); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractLabel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractLabel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractLabel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -26,34 +26,34 @@ public interface AbstractLabel { - public void addClickListener(final ClickListener listener); + void addClickListener(final ClickListener listener); - public void addMouseListener(final MouseListener listener); + void addDoubleClickListener(ClickListener listener); - public String getText(); + void addMouseListener(final MouseListener listener); - public Element getElement(); + void addStyleDependentName(String string); - public void onBrowserEvent(final Event event); + Element getElement(); - public void removeClickListener(final ClickListener listener); + String getText(); - public void removeMouseListener(final MouseListener listener); + void onBrowserEvent(final Event event); - public void setText(final String text); + void removeClickListener(final ClickListener listener); - public void setColor(final String color); + void removeDoubleClickListener(ClickListener listener); - public void setTitle(final String title); + void removeMouseListener(final MouseListener listener); - public void addStyleDependentName(String string); + void removeStyleDependentName(String string); - public void removeStyleDependentName(String string); + void setColor(final String color); - public void setStylePrimaryName(String string); + void setStylePrimaryName(String string); - public void addDoubleClickListener(ClickListener listener); + void setText(final String text); - public void removeDoubleClickListener(ClickListener listener); + void setTitle(final String title); } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/DropDownPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/DropDownPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/DropDownPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -48,118 +48,118 @@ private String stylePrimaryName; public DropDownPanel() { - vp = new VerticalPanel(); - outerBorder = new RoundedPanel(vp, RoundedPanel.ALL); - titleHP = new HorizontalPanel(); - arrowImage = new Image(); - titleLabel = new Label(); - contentPanel = new SimplePanel(); + vp = new VerticalPanel(); + outerBorder = new RoundedPanel(vp, RoundedPanel.ALL); + titleHP = new HorizontalPanel(); + arrowImage = new Image(); + titleLabel = new Label(); + contentPanel = new SimplePanel(); - initWidget(outerBorder); - vp.add(titleHP); - vp.add(contentPanel); - titleHP.add(arrowImage); - titleHP.add(titleLabel); + initWidget(outerBorder); + vp.add(titleHP); + vp.add(contentPanel); + titleHP.add(arrowImage); + titleHP.add(titleLabel); - this.stylePrimaryName = "k-dropdownouter"; - outerBorder.setCornerStyleName(stylePrimaryName); - vp.setStylePrimaryName(stylePrimaryName); - vp.setWidth("100%"); - vp.setCellWidth(contentPanel, "100%"); - vp.setCellWidth(titleHP, "100%"); - titleHP.setStylePrimaryName("k-dropdownlabel"); - img = Images.App.getInstance(); - img.arrowDownWhite().applyTo(arrowImage); - titleLabel.setText(""); - contentPanel.setStylePrimaryName("k-dropdowninner"); + this.stylePrimaryName = "k-dropdownouter"; + outerBorder.setCornerStyleName(stylePrimaryName); + vp.setStylePrimaryName(stylePrimaryName); + vp.setWidth("100%"); + vp.setCellWidth(contentPanel, "100%"); + vp.setCellWidth(titleHP, "100%"); + titleHP.setStylePrimaryName("k-dropdownlabel"); + img = Images.App.getInstance(); + img.arrowDownWhite().applyTo(arrowImage); + titleLabel.setText(""); + contentPanel.setStylePrimaryName("k-dropdowninner"); - setContentVisible(false); - arrowImage.addClickListener(this); - titleLabel.addClickListener(this); + setContentVisible(false); + arrowImage.addClickListener(this); + titleLabel.addClickListener(this); } public DropDownPanel(final boolean visible) { - this(); - setContentVisible(visible); + this(); + setContentVisible(visible); } public DropDownPanel(final String headerText, final boolean visible) { - this(); - setContentVisible(visible); - setHeaderText(headerText); + this(); + setContentVisible(visible); + setHeaderText(headerText); } public boolean isContentVisible() { - return contentPanel.isVisible(); + return contentPanel.isVisible(); } public void onClick(final Widget sender) { - if (sender == titleHP | sender == arrowImage | sender == titleLabel) { - setContentVisible(!isContentVisible()); - } + if (sender == titleHP | sender == arrowImage | sender == titleLabel) { + setContentVisible(!isContentVisible()); + } } public void setBorderStylePrimaryName(final String stylePrimaryName) { - this.stylePrimaryName = stylePrimaryName; - outerBorder.setCornerStyleName(stylePrimaryName); - vp.setStylePrimaryName(stylePrimaryName); + this.stylePrimaryName = stylePrimaryName; + outerBorder.setCornerStyleName(stylePrimaryName); + vp.setStylePrimaryName(stylePrimaryName); } public void setContent(final Widget widget) { - contentPanel.setWidget(widget); - // refresh panel - setContentVisible(isContentVisible()); + contentPanel.setWidget(widget); + // refresh panel + setContentVisible(isContentVisible()); } public void setContentHeight(final String height) { - contentPanel.setHeight(height); + contentPanel.setHeight(height); } public void setContentVisible(final boolean visible) { - if (visible) { - img.arrowDownWhite().applyTo(arrowImage); - contentPanel.setVisible(true); + if (visible) { + img.arrowDownWhite().applyTo(arrowImage); + contentPanel.setVisible(true); - } else { - img.arrowRightWhite().applyTo(arrowImage); - contentPanel.setVisible(false); - } + } else { + img.arrowRightWhite().applyTo(arrowImage); + contentPanel.setVisible(false); + } } public void setHeaderText(final String text) { - titleLabel.setText(text); + titleLabel.setText(text); } public void setHeaderTitle(final String title) { - // QuickTips size problems with images - KuneUiUtils.setQuickTip(arrowImage, title); - KuneUiUtils.setQuickTip(titleLabel, title); + // QuickTips size problems with images + KuneUiUtils.setQuickTip(arrowImage, title); + KuneUiUtils.setQuickTip(titleLabel, title); } public void setHeight(final String height) { - super.setHeight(height); - outerBorder.setHeight(height); + super.setHeight(height); + outerBorder.setHeight(height); } public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { - if (oldTheme != null) { - final String oldThemeS = oldTheme.toString(); - // outerBorder.removeStyleDependentName(oldThemeS); - vp.removeStyleDependentName(oldThemeS); - titleHP.removeStyleDependentName(oldThemeS); - contentPanel.removeStyleDependentName(oldThemeS); - } - final String newThemeS = newTheme.toString(); - outerBorder.setCornerStyleName(stylePrimaryName + "-" + newThemeS); - // outerBorder.addStyleDependentName(newThemeS); - vp.addStyleDependentName(newThemeS); - titleHP.addStyleDependentName(newThemeS); - contentPanel.addStyleDependentName(newThemeS); + if (oldTheme != null) { + final String oldThemeS = oldTheme.toString(); + // outerBorder.removeStyleDependentName(oldThemeS); + vp.removeStyleDependentName(oldThemeS); + titleHP.removeStyleDependentName(oldThemeS); + contentPanel.removeStyleDependentName(oldThemeS); + } + final String newThemeS = newTheme.toString(); + outerBorder.setCornerStyleName(stylePrimaryName + "-" + newThemeS); + // outerBorder.addStyleDependentName(newThemeS); + vp.addStyleDependentName(newThemeS); + titleHP.addStyleDependentName(newThemeS); + contentPanel.addStyleDependentName(newThemeS); } public void setWidth(final String width) { - super.setWidth(width); - outerBorder.setWidth(width); + super.setWidth(width); + outerBorder.setWidth(width); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/EditableIconLabel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/EditableIconLabel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/EditableIconLabel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -42,155 +42,155 @@ private String clickToRenameLabel; public EditableIconLabel(final AbstractImagePrototype icon, final String text, final boolean useDoubleClick, - final EditableClickListener editableListenerOrig) { - label = new IconLabel(icon, text); - init(text, useDoubleClick, editableListenerOrig); + final EditableClickListener editableListenerOrig) { + label = new IconLabel(icon, text); + init(text, useDoubleClick, editableListenerOrig); } public EditableIconLabel(final AbstractImagePrototype icon, final String text, final String targetHistoryToken, - final boolean useDoubleClick, final EditableClickListener editableListenerOrig) { - label = new IconHyperlink(icon, text, targetHistoryToken); - init(text, useDoubleClick, editableListenerOrig); + final boolean useDoubleClick, final EditableClickListener editableListenerOrig) { + label = new IconHyperlink(icon, text, targetHistoryToken); + init(text, useDoubleClick, editableListenerOrig); } public EditableIconLabel(final EditableClickListener editableListener) { - this("", editableListener); + this("", editableListener); } public EditableIconLabel(final String text, final boolean wordWrap, final boolean useDoubleClick, - final EditableClickListener editableListenerOrig) { - label = new LabelWrapper(text, wordWrap); - init(text, useDoubleClick, editableListenerOrig); + final EditableClickListener editableListenerOrig) { + label = new LabelWrapper(text, wordWrap); + init(text, useDoubleClick, editableListenerOrig); } public EditableIconLabel(final String text, final boolean useDoubleClick, - final EditableClickListener editableListener) { - this(text, false, false, editableListener); + final EditableClickListener editableListener) { + this(text, false, false, editableListener); } public EditableIconLabel(final String text, final EditableClickListener editableListener) { - this(text, false, editableListener); + this(text, false, editableListener); } public EditableClickListener getEditableListener() { - return editableListener; + return editableListener; } public String getText() { - return label.getText(); + return label.getText(); } public void restoreOldText() { - label.setText(oldText); - this.currentText = this.oldText; + label.setText(oldText); + this.currentText = this.oldText; } public void setClickToRenameLabel(final String clickToRenameLabel) { - this.clickToRenameLabel = clickToRenameLabel; + this.clickToRenameLabel = clickToRenameLabel; } public void setDoubleClickToRenameLabel(final String doubleClickToRenameLabel) { - this.doubleClickToRenameLabel = doubleClickToRenameLabel; + this.doubleClickToRenameLabel = doubleClickToRenameLabel; } public void setEditable(final boolean editable) { - reset(); - if (editable) { - if (useDoubleClick) { - label.setTitle(doubleClickToRenameLabel); - label.addDoubleClickListener(listener); - } else { - label.setTitle(clickToRenameLabel); - label.addClickListener(listener); - } - label.addStyleDependentName("editable"); - // label.addDoubleClickListener(listener); - label.addMouseListener(mouseOverListener); - } else { - label.setTitle(""); - label.addStyleDependentName("noneditable"); - } + reset(); + if (editable) { + if (useDoubleClick) { + label.setTitle(doubleClickToRenameLabel); + label.addDoubleClickListener(listener); + } else { + label.setTitle(clickToRenameLabel); + label.addClickListener(listener); + } + label.addStyleDependentName("editable"); + // label.addDoubleClickListener(listener); + label.addMouseListener(mouseOverListener); + } else { + label.setTitle(""); + label.addStyleDependentName("noneditable"); + } } public void setEditableListener(final EditableClickListener editableListener) { - this.editableListener = editableListener; + this.editableListener = editableListener; } public void setRenameDialogLabel(final String renameDialogLabel) { - this.renameDialogLabel = renameDialogLabel; + this.renameDialogLabel = renameDialogLabel; } public void setRenameDialogTitle(final String renameDialogTitle) { - this.renameDialogTitle = renameDialogTitle; + this.renameDialogTitle = renameDialogTitle; } public void setText(final String text) { - this.oldText = this.currentText; - this.currentText = text; - label.setText(text); + this.oldText = this.currentText; + this.currentText = text; + label.setText(text); } private void init(final String text, final boolean useDoubleClick, final EditableClickListener editableListenerOrig) { - doubleClickToRenameLabel = "Double click to rename"; - clickToRenameLabel = "Click to rename"; - renameDialogLabel = "Write a new name:"; - renameDialogTitle = "Rename"; - initWidget((Widget) label); - this.currentText = text; - this.oldText = text; - this.useDoubleClick = useDoubleClick; - this.editableListener = editableListenerOrig; - this.listener = new ClickListener() { - public void onClick(final Widget sender) { - showEditableDialog(); - } - }; - mouseOverListener = new MouseListenerAdapter() { - public void onMouseEnter(final Widget sender) { - label.addStyleDependentName("high"); - } + doubleClickToRenameLabel = "Double click to rename"; + clickToRenameLabel = "Click to rename"; + renameDialogLabel = "Write a new name:"; + renameDialogTitle = "Rename"; + initWidget((Widget) label); + this.currentText = text; + this.oldText = text; + this.useDoubleClick = useDoubleClick; + this.editableListener = editableListenerOrig; + this.listener = new ClickListener() { + public void onClick(final Widget sender) { + showEditableDialog(); + } + }; + mouseOverListener = new MouseListenerAdapter() { + public void onMouseEnter(final Widget sender) { + label.addStyleDependentName("high"); + } - public void onMouseLeave(final Widget sender) { - label.removeStyleDependentName("high"); - } - }; - label.setStylePrimaryName("kune-EditableLabel"); - label.addMouseListener(mouseOverListener); - setEditable(false); + public void onMouseLeave(final Widget sender) { + label.removeStyleDependentName("high"); + } + }; + label.setStylePrimaryName("kune-EditableLabel"); + label.addMouseListener(mouseOverListener); + setEditable(false); } private void reset() { - label.removeStyleDependentName("noneditable"); - label.removeStyleDependentName("editable"); - label.removeClickListener(listener); - label.removeDoubleClickListener(listener); - label.removeMouseListener(mouseOverListener); + label.removeStyleDependentName("noneditable"); + label.removeStyleDependentName("editable"); + label.removeClickListener(listener); + label.removeDoubleClickListener(listener); + label.removeMouseListener(mouseOverListener); } private void showEditableDialog() { - MessageBox.show(new MessageBoxConfig() { - { - // i18n - setClosable(true); - setModal(true); - setWidth(300); - setDefaultTextHeight(2); - setButtons(MessageBox.OKCANCEL); - setTitle(renameDialogTitle); - setMsg(renameDialogLabel); - setCallback(new MessageBox.PromptCallback() { - public void execute(final String btnID, final String text) { - if (btnID.equals("ok") && text != null) { - editableListener.onEdited(text); - } else { - // Do nothing - } - } - }); - setMultiline(true); - setValue(currentText); - } - }); + MessageBox.show(new MessageBoxConfig() { + { + // i18n + setClosable(true); + setModal(true); + setWidth(300); + setDefaultTextHeight(2); + setButtons(MessageBox.OKCANCEL); + setTitle(renameDialogTitle); + setMsg(renameDialogLabel); + setCallback(new MessageBox.PromptCallback() { + public void execute(final String btnID, final String text) { + if (btnID.equals("ok") && text != null) { + editableListener.onEdited(text); + } else { + // Do nothing + } + } + }); + setMultiline(true); + setValue(currentText); + } + }); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/HasColor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/HasColor.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/HasColor.java 2008-10-21 19:26:47 UTC (rev 917) @@ -18,9 +18,10 @@ * */ -package org.ourproject.kune.platf.client.ui; - -public interface HasColor { - void setColor(String color); - String getColor(); -} +package org.ourproject.kune.platf.client.ui; + +public interface HasColor { + void setColor(String color); + + String getColor(); +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/HorizontalLine.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/HorizontalLine.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/HorizontalLine.java 2008-10-21 19:26:47 UTC (rev 917) @@ -25,6 +25,6 @@ final public class HorizontalLine extends HTML { public HorizontalLine() { - this.setHTML("<hr noshadow size='1'>"); + this.setHTML("<hr noshadow size='1'>"); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -58,10 +58,7 @@ * A widget that contains a icon and arbitrary text, <i>not</i> interpreted as * HTML. * - * <h3>CSS Style Rules</h3> - * <ul class='css'> - * <li>.kune-IconLabel { }</li> - * </ul> + * <h3>CSS Style Rules</h3> <ul class='css'> <li>.kune-IconLabel { }</li> </ul> * * <p> * <h3>Example</h3> @@ -84,7 +81,7 @@ * Creates an empty label with a icon. * * @param image - * the icon to add + * the icon to add */ private IconLabel(final AbstractImagePrototype image, final boolean leftIcon) { setElement(DOM.createDiv()); @@ -105,9 +102,9 @@ * Creates a label with the specified text and a icon in the left. * * @param image - * the icon to add + * the icon to add * @param text - * the new label's text + * the new label's text */ public IconLabel(final AbstractImagePrototype image, final String text) { this(image, true); @@ -118,9 +115,9 @@ * Creates a label with the specified text and a icon in the right. * * @param image - * the icon to add + * the icon to add * @param text - * the new label's text + * the new label's text */ public IconLabel(final String text, final AbstractImagePrototype image) { this(image, false); @@ -131,11 +128,11 @@ * Creates a label with the specified text and a icon in the right. * * @param image - * the icon to add + * the icon to add * @param text - * the new label's text + * the new label's text * @param wordWrap - * <code>false</code> to disable word wrapping + * <code>false</code> to disable word wrapping */ public IconLabel(final String text, final AbstractImagePrototype image, final boolean wordWrap) { this(text, image); @@ -146,11 +143,11 @@ * Creates a label with the specified text and a icon in the left. * * @param image - * the icon to add + * the icon to add * @param text - * the new label's text + * the new label's text * @param wordWrap - * <code>false</code> to disable word wrapping + * <code>false</code> to disable word wrapping */ public IconLabel(final AbstractImagePrototype image, final String text, final boolean wordWrap) { this(image, text); 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.java 2008-10-21 19:26:47 UTC (rev 917) @@ -26,38 +26,38 @@ * This method escape only some dangerous html chars */ public static String escapeHtmlLight(final String textOrig) { - String text = textOrig; - text = text.replaceAll("&", "&"); - text = text.replaceAll("\"", """); - // text = text.replaceAll("\'", "'"); - text = text.replaceAll("<", "<"); - text = text.replaceAll(">", ">"); - return text; + String text = textOrig; + text = text.replaceAll("&", "&"); + text = text.replaceAll("\"", """); + // text = text.replaceAll("\'", "'"); + text = text.replaceAll("<", "<"); + text = text.replaceAll(">", ">"); + return text; } public static String generateHtmlLink(final String href, final String text) { - return "<a href=\"" + href + "\" target=\"_blank\">" + text + "</a>"; + 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 (int i = 0; i < splitted.length; i++) { - String tag = splitted[i]; - tag = tag.replaceAll("\\s$", ""); - if (tag.length() > 0) { - tagsList.add(tag); - } - } - return tagsList; + 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 (int i = 0; i < splitted.length; i++) { + String tag = splitted[i]; + tag = tag.replaceAll("\\s$", ""); + if (tag.length() > 0) { + tagsList.add(tag); + } + } + return tagsList; } /* @@ -65,13 +65,13 @@ * widget for instance */ public static String unescapeHtmlLight(final String textOrig) { - String text = textOrig; - text = text.replaceAll("&", "&"); - text = text.replaceAll(""", "\""); - text = text.replaceAll("'", "\'"); - text = text.replaceAll("<", "<"); - text = text.replaceAll(">", ">"); - return text; + String text = textOrig; + text = text.replaceAll("&", "&"); + text = text.replaceAll(""", "\""); + text = text.replaceAll("'", "\'"); + text = text.replaceAll("<", "<"); + text = text.replaceAll(">", ">"); + return text; } public KuneStringUtils() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java 2008-10-21 19:26:47 UTC (rev 917) @@ -127,8 +127,8 @@ } private native String unescape(String val) /*-{ - return unescape(val); - }-*/; + return unescape(val); + }-*/; public String getParameter(final String name) { return paramMap.get(name); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/MenuItemCollection.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/MenuItemCollection.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/MenuItemCollection.java 2008-10-21 19:26:47 UTC (rev 917) @@ -23,7 +23,6 @@ import java.util.ArrayList; - public class MenuItemCollection<T> extends ArrayList<MenuItem<T>> { private static final long serialVersionUID = 1L; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/QuickTipsHelper.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/QuickTipsHelper.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/QuickTipsHelper.java 2008-10-21 19:26:47 UTC (rev 917) @@ -6,11 +6,11 @@ public class QuickTipsHelper { public QuickTipsHelper() { - QuickTips.init(); - final QuickTip quickTipInstance = QuickTips.getQuickTip(); - quickTipInstance.setInterceptTitles(true); - quickTipInstance.setDismissDelay(7000); - quickTipInstance.setHideDelay(400); - quickTipInstance.setMinWidth(100); + QuickTips.init(); + final QuickTip quickTipInstance = QuickTips.getQuickTip(); + quickTipInstance.setInterceptTitles(true); + quickTipInstance.setDismissDelay(7000); + quickTipInstance.setHideDelay(400); + quickTipInstance.setMinWidth(100); } } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/RoundedBorderDecorator.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/RoundedBorderDecorator.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/RoundedBorderDecorator.java 2008-10-21 19:26:47 UTC (rev 917) @@ -66,14 +66,14 @@ * <p> * By default the classname assigned to the rounded corners is "rp". You need * this to set the color of the rounded corners to match the rest of you widget. - * e.g. <code>.rp { background-color:#c3d9ff; }</code> If you want another - * class name, use the method <code>setLineStyleName</code>. + * e.g. <code>.rp { background-color:#c3d9ff; }</code> If you want another class + * name, use the method <code>setLineStyleName</code>. * </p> * * @author Hilbrand Bouwkamp(hs(a)bouwkamp.com) * @version 1.2 * - * adapted by Vicente J. Ruiz Jurado and danigb for kune + * adapted by Vicente J. Ruiz Jurado and danigb for kune */ public class RoundedBorderDecorator extends ComplexPanel implements HasColor { @@ -136,48 +136,48 @@ /** * <p> * Creates a new <code>RoundedPanel</code> with custom rounded corners on - * the given widget <code>w</code>. Every combination of corners can be - * set via the <code>corners</code> argument. Use the static constants to - * set the corners. For example if you want to create a panel with only - * rounded corners at the left, use:<br> + * the given widget <code>w</code>. Every combination of corners can be set + * via the <code>corners</code> argument. Use the static constants to set + * the corners. For example if you want to create a panel with only rounded + * corners at the left, use:<br> * <code>new RoundedPanel(yourWidget, RoundedPanel.LEFT);</code> * </p> * * @param corners - * set custom rounded corners. + * set custom rounded corners. * @param decorated - * widget to add corners to. + * widget to add corners to. * * @param size - * size of the corners: DOUBLE (2px) or SIMPLE (1px) + * size of the corners: DOUBLE (2px) or SIMPLE (1px) */ public RoundedBorderDecorator(final Widget decorated, final int corners, final int size) { - body = DOM.createDiv(); - if (is(corners, TOP)) { - if (is(size, DOUBLE)) { - div2t = createLine(corners & TOP, '2'); - DOM.appendChild(body, div2t); - } - div1t = createLine(corners & TOP, '1'); - DOM.appendChild(body, div1t); - } - divElement = DOM.createDiv(); - DOM.appendChild(body, divElement); - if (is(corners, BOTTOM)) { - div1b = createLine(corners & BOTTOM, '1'); - DOM.appendChild(body, div1b); - if (is(size, DOUBLE)) { - div2b = createLine(corners & BOTTOM, '2'); - DOM.appendChild(body, div2b); - } - } - setElement(body); - add(decorated, divElement); - setColor("CCC"); + body = DOM.createDiv(); + if (is(corners, TOP)) { + if (is(size, DOUBLE)) { + div2t = createLine(corners & TOP, '2'); + DOM.appendChild(body, div2t); + } + div1t = createLine(corners & TOP, '1'); + DOM.appendChild(body, div1t); + } + divElement = DOM.createDiv(); + DOM.appendChild(body, divElement); + if (is(corners, BOTTOM)) { + div1b = createLine(corners & BOTTOM, '1'); + DOM.appendChild(body, div1b); + if (is(size, DOUBLE)) { + div2b = createLine(corners & BOTTOM, '2'); + DOM.appendChild(body, div2b); + } + } + setElement(body); + add(decorated, divElement); + setColor("CCC"); } public RoundedBorderDecorator(final Widget decorated, final int corners) { - this(decorated, corners, DOUBLE); + this(decorated, corners, DOUBLE); } /** @@ -186,28 +186,28 @@ * </p> * * @param corner - * corner mask to set rounded corner. + * corner mask to set rounded corner. * @param width - * margin width for line. + * margin width for line. */ private Element createLine(final int corner, final char width) { - // margin 2 fields : top/bottom right/left => "0 <width>px" - // margin 4 fields : top right bottom left => "0 <width>px 0 - // <width>px" - final String margin = corner == TOP || corner == BOTTOM ? "0 " + width + "px" : is(corner, LEFT) ? "0 0 0 " - + width + "px" : "0 " + width + "px 0 0"; - final Element div = DOM.createDiv(); - DOM.setStyleAttribute(div, "fontSize", "0px"); - DOM.setStyleAttribute(div, "height", "1px"); - DOM.setStyleAttribute(div, "lineHeight", "1px"); - DOM.setStyleAttribute(div, "margin", margin); - DOM.setInnerHTML(div, " "); - return div; + // margin 2 fields : top/bottom right/left => "0 <width>px" + // margin 4 fields : top right bottom left => "0 <width>px 0 + // <width>px" + final String margin = corner == TOP || corner == BOTTOM ? "0 " + width + "px" : is(corner, LEFT) ? "0 0 0 " + + width + "px" : "0 " + width + "px 0 0"; + final Element div = DOM.createDiv(); + DOM.setStyleAttribute(div, "fontSize", "0px"); + DOM.setStyleAttribute(div, "height", "1px"); + DOM.setStyleAttribute(div, "lineHeight", "1px"); + DOM.setStyleAttribute(div, "margin", margin); + DOM.setInnerHTML(div, " "); + return div; } // convience method for mask test private boolean is(final int input, final int mask) { - return (input & mask) > 0; + return (input & mask) > 0; } /** @@ -219,17 +219,17 @@ * </p> * * @param style - * css style name + * css style name */ public void setStyleName(final String style) { - DOM.setElementProperty(body, "className", style); + DOM.setElementProperty(body, "className", style); } /** * <p> * Set the css style name of the rounded corners div's. Default the css - * stylename is <code>rp</code>. Use it to set the colors of the corner. - * For example: <code>.rp { background-color:#c3d9ff; }</code>. + * stylename is <code>rp</code>. Use it to set the colors of the corner. For + * example: <code>.rp { background-color:#c3d9ff; }</code>. * </p> * <p> * A custom style might be needed when the corners are visible only when a @@ -239,47 +239,47 @@ * </p> * * @param style - * css style name. + * css style name. */ public void setCornerStyleName(final String style) { - if (null != div2t) { - DOM.setElementProperty(div2t, "className", style); - } - if (null != div1t) { - DOM.setElementProperty(div1t, "className", style); - } - if (null != div1b) { - DOM.setElementProperty(div1b, "className", style); - } - if (null != div2b) { - DOM.setElementProperty(div2b, "className", style); - } - if (null != divElement) { - DOM.setElementProperty(divElement, "className", style); - } + if (null != div2t) { + DOM.setElementProperty(div2t, "className", style); + } + if (null != div1t) { + DOM.setElementProperty(div1t, "className", style); + } + if (null != div1b) { + DOM.setElementProperty(div1b, "className", style); + } + if (null != div2b) { + DOM.setElementProperty(div2b, "className", style); + } + if (null != divElement) { + DOM.setElementProperty(divElement, "className", style); + } } public void setColor(final String color) { - this.color = color; - if (null != div2t) { - DOM.setStyleAttribute(div2t, "backgroundColor", color); - } - if (null != div1t) { - DOM.setStyleAttribute(div1t, "backgroundColor", color); - } - if (null != div1b) { - DOM.setStyleAttribute(div1b, "backgroundColor", color); - } - if (null != div2b) { - DOM.setStyleAttribute(div2b, "backgroundColor", color); - } - if (null != divElement) { - DOM.setStyleAttribute(divElement, "backgroundColor", color); - } + this.color = color; + if (null != div2t) { + DOM.setStyleAttribute(div2t, "backgroundColor", color); + } + if (null != div1t) { + DOM.setStyleAttribute(div1t, "backgroundColor", color); + } + if (null != div1b) { + DOM.setStyleAttribute(div1b, "backgroundColor", color); + } + if (null != div2b) { + DOM.setStyleAttribute(div2b, "backgroundColor", color); + } + if (null != divElement) { + DOM.setStyleAttribute(divElement, "backgroundColor", color); + } } public String getColor() { - return color; + return color; } } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/RoundedPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/RoundedPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/RoundedPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -21,10 +21,10 @@ import com.google.gwt.user.client.ui.Widget; /** - * The <code>RoundedPanel</code> class adds similar rounded corners, as seen - * in other Google applications, to a widget. This is done by adding several - * <code>div</code> Elements around a Widget. The HTML code roughly for a - * corner height 2 looks as follows: + * The <code>RoundedPanel</code> class adds similar rounded corners, as seen in + * other Google applications, to a widget. This is done by adding several + * <code>div</code> Elements around a Widget. The HTML code roughly for a corner + * height 2 looks as follows: * * <pre> * <div> @@ -90,15 +90,14 @@ * .selected .my-RP { background-color:#c3d9ff; } * </pre> * - * <h3>Adding rounded corners to DialogBox widgets</h3> - * Adding rounded corners to a <code>DialogBox</code> is somewhat more - * complicated. The problem with <code>DialogBox</code> is that it uses a - * private panel and the <code>RoundedPanel</code> should be applied to this - * private <code>Panel</code>. To add the rounded corners to a - * <code>DialogBox</code> you have to rewrite the implementation of the - * <code>DialogBox</code>. For the <code>DialogBox</code> widget this can - * be done as follows. First create a new class like - * <code>RoundedDialogBox</code> and copy the code from the original + * <h3>Adding rounded corners to DialogBox widgets</h3> Adding rounded corners + * to a <code>DialogBox</code> is somewhat more complicated. The problem with + * <code>DialogBox</code> is that it uses a private panel and the + * <code>RoundedPanel</code> should be applied to this private + * <code>Panel</code>. To add the rounded corners to a <code>DialogBox</code> + * you have to rewrite the implementation of the <code>DialogBox</code>. For the + * <code>DialogBox</code> widget this can be done as follows. First create a new + * class like <code>RoundedDialogBox</code> and copy the code from the original * <code>DialogBox</code> (Please take the copyright of this class into * account). Next make the following changes to the code: * @@ -156,8 +155,8 @@ * </pre> * * Now by extending your own dialog class on this <code>RoundedDialogBox</code> - * instead of the original <code>DialogBox</code> you will have rounded - * corners around your dialog. + * instead of the original <code>DialogBox</code> you will have rounded corners + * around your dialog. * * * @author Hilbrand Bouwkamp(hs(a)bouwkamp.com) @@ -219,28 +218,28 @@ * Lookup table for corner border width */ private final static String[][] CORNERBORDER = { { "1px" }, { "1px", "1px" }, { "1px", "1px", "1px" }, - { "1px", "1px", "1px", "1px" }, { "1px", "1px", "1px", "2px", "1px" }, - { "1px", "1px", "1px", "1px", "2px", "1px" }, { "1px", "1px", "1px", "1px", "1px", "2px", "1px" }, - { "1px", "1px", "1px", "1px", "1px", "2px", "2px", "1px" }, - { "1px", "1px", "1px", "1px", "1px", "1px", "2px", "3px", "1px" } }; + { "1px", "1px", "1px", "1px" }, { "1px", "1px", "1px", "2px", "1px" }, + { "1px", "1px", "1px", "1px", "2px", "1px" }, { "1px", "1px", "1px", "1px", "1px", "2px", "1px" }, + { "1px", "1px", "1px", "1px", "1px", "2px", "2px", "1px" }, + { "1px", "1px", "1px", "1px", "1px", "1px", "2px", "3px", "1px" } }; /** * Lookup table for corner height */ private final static String[][] CORNERHEIGHT = { { "1px" }, { "1px", "1px" }, { "1px", "1px", "1px" }, - { "1px", "1px", "1px", "1px" }, { "2px", "1px", "1px", "1px", "1px" }, - { "2px", "1px", "1px", "1px", "1px", "1px" }, { "2px", "1px", "1px", "1px", "1px", "1px", "1px" }, - { "2px", "1px", "1px", "1px", "1px", "1px", "1px", "1px" }, - { "3px", "2px", "1px", "1px", "1px", "1px", "1px", "1px", "1px" } }; + { "1px", "1px", "1px", "1px" }, { "2px", "1px", "1px", "1px", "1px" }, + { "2px", "1px", "1px", "1px", "1px", "1px" }, { "2px", "1px", "1px", "1px", "1px", "1px", "1px" }, + { "2px", "1px", "1px", "1px", "1px", "1px", "1px", "1px" }, + { "3px", "2px", "1px", "1px", "1px", "1px", "1px", "1px", "1px" } }; /** * Lookup table for corner margin */ private final static String[][] CORNERMARGIN = { { "1px" }, { "1px", "2px" }, { "1px", "2px", "3px" }, - { "1px", "2px", "3px", "4px" }, { "1px", "2px", "3px", "4px", "6px" }, - { "1px", "2px", "3px", "4px", "5px", "7px" }, { "1px", "2px", "3px", "4px", "5px", "6px", "8px" }, - { "1px", "2px", "3px", "4px", "5px", "6px", "8px", "10px" }, - { "1px", "2px", "3px", "4px", "5px", "6px", "7px", "9px", "12px" }, }; + { "1px", "2px", "3px", "4px" }, { "1px", "2px", "3px", "4px", "6px" }, + { "1px", "2px", "3px", "4px", "5px", "7px" }, { "1px", "2px", "3px", "4px", "5px", "6px", "8px" }, + { "1px", "2px", "3px", "4px", "5px", "6px", "8px", "10px" }, + { "1px", "2px", "3px", "4px", "5px", "6px", "7px", "9px", "12px" }, }; /** * Element array containing all div elements of the top corner div's. @@ -270,25 +269,25 @@ * height of corners 2px. Use <code>setWidget</code> to add the widget. */ public RoundedPanel() { - this(ALL, 2); + this(ALL, 2); } /** * Creates a new <code>RoundedPanel</code> with custom rounding and height - * of corners 2px but with no widget set. Use <code>setWidget</code> to - * add widget. + * of corners 2px but with no widget set. Use <code>setWidget</code> to add + * widget. * - * Every combination of corners can be set via <code>corners</code>. Use - * the static constants to set the corners. For example, to create a panel - * with only rounded corners at the left, use: + * Every combination of corners can be set via <code>corners</code>. Use the + * static constants to set the corners. For example, to create a panel with + * only rounded corners at the left, use: * * <code>new RoundedPanel(yourWidget, RoundedPanel.LEFT);</code> * * @param corners - * set custom rounded corners + * set custom rounded corners */ public RoundedPanel(final int corners) { - this(corners, 2); + this(corners, 2); } /** @@ -298,39 +297,39 @@ * the height is 6px. Use {@link #setWidget(Widget)} to add widget. * * @param corners - * set custom rounded corners + * set custom rounded corners * @param cornerHeight - * height index between and including 1 and 9 + * height index between and including 1 and 9 * @throws IndexOutOfBoundsException - * when cornerHeight below 1 or above 9 + * when cornerHeight below 1 or above 9 */ public RoundedPanel(final int corners, final int cornerHeight) { - super(DOM.createDiv()); - body = getElement(); - if (cornerHeight < 1 || cornerHeight > 9) { - throw new IndexOutOfBoundsException("RoundedPanel height range between and including 1 and 9"); - } - this.cornerHeight = cornerHeight; - divt = new Element[cornerHeight]; - divb = new Element[cornerHeight]; - this.corners = corners; - if (inMask(corners, TOP)) { - final int ct = corners & TOP; + super(DOM.createDiv()); + body = getElement(); + if (cornerHeight < 1 || cornerHeight > 9) { + throw new IndexOutOfBoundsException("RoundedPanel height range between and including 1 and 9"); + } + this.cornerHeight = cornerHeight; + divt = new Element[cornerHeight]; + divb = new Element[cornerHeight]; + this.corners = corners; + if (inMask(corners, TOP)) { + final int ct = corners & TOP; - for (int i = 0; i < cornerHeight; ++i) { - divt[i] = addLine(ct, cornerHeight - (i + 1)); - } - } - divElement = DOM.createDiv(); - DOM.appendChild(body, divElement); - if (inMask(corners, BOTTOM)) { - final int cb = corners & BOTTOM; + for (int i = 0; i < cornerHeight; ++i) { + divt[i] = addLine(ct, cornerHeight - (i + 1)); + } + } + divElement = DOM.createDiv(); + DOM.appendChild(body, divElement); + if (inMask(corners, BOTTOM)) { + final int cb = corners & BOTTOM; - for (int i = cornerHeight - 1; i >= 0; --i) { - divb[i] = addLine(cb, cornerHeight - (i + 1)); - } - } - setCornerStyleName(RPSTYLE); + for (int i = cornerHeight - 1; i >= 0; --i) { + divb[i] = addLine(cb, cornerHeight - (i + 1)); + } + } + setCornerStyleName(RPSTYLE); } /** @@ -338,10 +337,10 @@ * height 2px on the widget <code>w</code>. * * @param w - * widget to add corners to + * widget to add corners to */ public RoundedPanel(final Widget w) { - this(w, ALL); + this(w, ALL); } /** @@ -349,12 +348,12 @@ * height 2px on the widget <code>w</code>. * * @param w - * widget to add corners to + * widget to add corners to * @param corners - * set custom rounded corners + * set custom rounded corners */ public RoundedPanel(final Widget w, final int corners) { - this(w, corners, 2); + this(w, corners, 2); } /** @@ -362,15 +361,15 @@ * custom height on widget <code>w</code>. * * @param w - * widget to add corners to + * widget to add corners to * @param corners - * set custom rounded corners + * set custom rounded corners * @param cornerHeight - * height index between and including 1 and 9 + * height index between and including 1 and 9 */ public RoundedPanel(final Widget w, final int corners, final int cornerHeight) { - this(corners, cornerHeight); - setWidget(w); + this(corners, cornerHeight); + setWidget(w); } /** @@ -380,47 +379,47 @@ * </p> * * @param borderColor - * border color + * border color */ public void setCornerColor(final String borderColor) { - if (null != divt[0]) { - for (int i = 0; i < cornerHeight; ++i) { - DOM.setStyleAttribute(divt[i], "backgroundColor", borderColor); - } - } - if (null != divb[0]) { - for (int i = 0; i < cornerHeight; ++i) { - DOM.setStyleAttribute(divb[i], "backgroundColor", borderColor); - } - } + if (null != divt[0]) { + for (int i = 0; i < cornerHeight; ++i) { + DOM.setStyleAttribute(divt[i], "backgroundColor", borderColor); + } + } + if (null != divb[0]) { + for (int i = 0; i < cornerHeight; ++i) { + DOM.setStyleAttribute(divb[i], "backgroundColor", borderColor); + } + } } /** * Set the css style name of the rounded corners div's. Default the css - * stylename is <code>cbg-RP</code>. Use it to set the colors of the - * corner. For example: <code>.cbg-RP { background-color:#c3d9ff; }</code>. + * stylename is <code>cbg-RP</code>. Use it to set the colors of the corner. + * For example: <code>.cbg-RP { background-color:#c3d9ff; }</code>. * * A custom style might be needed when the corners are visible only when a * panel is selected. Use this method to set the custom style name and add * something like the following to the stylesheet: * - * <code>.selected .cbg-RP { background-color:#c3d9ff; }</code> Setting - * the color is also possible via the method {@link #setCornerColor(String)}. + * <code>.selected .cbg-RP { background-color:#c3d9ff; }</code> Setting the + * color is also possible via the method {@link #setCornerColor(String)}. * * @param style - * css style name + * css style name */ public void setCornerStyleName(final String style) { - if (null != divt[0]) { - for (int i = 0; i < cornerHeight; ++i) { - DOM.setElementProperty(divt[i], "className", style); - } - } - if (null != divb[0]) { - for (int i = 0; i < cornerHeight; ++i) { - DOM.setElementProperty(divb[i], "className", style); - } - } + if (null != divt[0]) { + for (int i = 0; i < cornerHeight; ++i) { + DOM.setElementProperty(divt[i], "className", style); + } + } + if (null != divb[0]) { + for (int i = 0; i < cornerHeight; ++i) { + DOM.setElementProperty(divb[i], "className", style); + } + } } /** @@ -430,17 +429,17 @@ * using the <code>RoundedPanel</code> * * @param style - * css style name + * css style name */ public void setStyleName(final String style) { - DOM.setElementProperty(body, "className", style); + DOM.setElementProperty(body, "className", style); } /** * Overwrite of parent getContainerElement() */ protected Element getContainerElement() { - return divElement; + return divElement; } /** @@ -448,39 +447,39 @@ * <code>mask</code>. * * @param input - * input to check + * input to check * @param mask - * mask to check against + * mask to check against * @return true if input within mask */ protected boolean inMask(final int input, final int mask) { - return (input & mask) > 0; + return (input & mask) > 0; } /** * Creates div element representing part of the rounded corner. * * @param corner - * corner mask to set rounded corner + * corner mask to set rounded corner * @param heightIndex - * margin width for line + * margin width for line */ private Element addLine(final int corner, final int heightIndex) { - // margin 2 fields : top/bottom right/left => "0 <width>px" - // margin 4 fields : top right bottom left => "0 <width>px 0 <width>px" - final String margin = corner == TOP || corner == BOTTOM ? "0 " - + RoundedPanel.CORNERMARGIN[cornerHeight - 1][heightIndex] : inMask(corner, LEFT) ? "0 0 0 " - + RoundedPanel.CORNERMARGIN[cornerHeight - 1][heightIndex] : "0 " - + RoundedPanel.CORNERMARGIN[cornerHeight - 1][heightIndex] + " 0 0"; - final Element div = DOM.createDiv(); + // margin 2 fields : top/bottom right/left => "0 <width>px" + // margin 4 fields : top right bottom left => "0 <width>px 0 <width>px" + final String margin = corner == TOP || corner == BOTTOM ? "0 " + + RoundedPanel.CORNERMARGIN[cornerHeight - 1][heightIndex] : inMask(corner, LEFT) ? "0 0 0 " + + RoundedPanel.CORNERMARGIN[cornerHeight - 1][heightIndex] : "0 " + + RoundedPanel.CORNERMARGIN[cornerHeight - 1][heightIndex] + " 0 0"; + final Element div = DOM.createDiv(); - DOM.setStyleAttribute(div, "fontSize", "0px"); - DOM.setStyleAttribute(div, "height", RoundedPanel.CORNERHEIGHT[cornerHeight - 1][heightIndex]); - DOM.setStyleAttribute(div, "borderWidth", "0 " + RoundedPanel.CORNERBORDER[cornerHeight - 1][heightIndex]); - DOM.setStyleAttribute(div, "lineHeight", RoundedPanel.CORNERHEIGHT[cornerHeight - 1][heightIndex]); - DOM.setStyleAttribute(div, "margin", margin); - DOM.setInnerHTML(div, " "); - DOM.appendChild(body, div); - return div; + DOM.setStyleAttribute(div, "fontSize", "0px"); + DOM.setStyleAttribute(div, "height", RoundedPanel.CORNERHEIGHT[cornerHeight - 1][heightIndex]); + DOM.setStyleAttribute(div, "borderWidth", "0 " + RoundedPanel.CORNERBORDER[cornerHeight - 1][heightIndex]); + DOM.setStyleAttribute(div, "lineHeight", RoundedPanel.CORNERHEIGHT[cornerHeight - 1][heightIndex]); + DOM.setStyleAttribute(div, "margin", margin); + DOM.setInnerHTML(div, " "); + DOM.appendChild(body, div); + return div; } } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/SplitterListenerCollection.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/SplitterListenerCollection.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/SplitterListenerCollection.java 2008-10-21 19:26:47 UTC (rev 917) @@ -32,7 +32,7 @@ * Fires a event to all listeners. * * @param sender - * the widget sending the event. + * the widget sending the event. */ public void fireStartResizing(final Widget sender) { for (Iterator<SplitterListener> it = iterator(); it.hasNext();) { @@ -45,7 +45,7 @@ * Fires a event to all listeners. * * @param sender - * the widget sending the event. + * the widget sending the event. */ public void fireStopResizing(final Widget sender) { for (Iterator<SplitterListener> it = iterator(); it.hasNext();) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/TitledPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/TitledPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/TitledPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -50,17 +50,17 @@ * Implementation class for TitledPanel. */ public static class TitledPanelImpl { - /** - * Set the title of a fieldset element. - */ - public void setTitle(final Element fieldset, final Element legend, final String title) { - if (title != "" && title != null) { - DOM.setInnerHTML(legend, title); - DOM.insertChild(fieldset, legend, 0); - } else if (DOM.getParent(legend) != null) { - DOM.removeChild(fieldset, legend); - } - } + /** + * Set the title of a fieldset element. + */ + public void setTitle(final Element fieldset, final Element legend, final String title) { + if (title != "" && title != null) { + DOM.setInnerHTML(legend, title); + DOM.insertChild(fieldset, legend, 0); + } else if (DOM.getParent(legend) != null) { + DOM.removeChild(fieldset, legend); + } + } } /** @@ -68,11 +68,11 @@ * issues. */ public static class TitledPanelImplMozilla extends TitledPanelImpl { - public void setTitle(final Element fieldset, final Element legend, final String title) { - DOM.setStyleAttribute(fieldset, "display", "none"); - super.setTitle(fieldset, legend, title); - DOM.setStyleAttribute(fieldset, "display", ""); - } + public void setTitle(final Element fieldset, final Element legend, final String title) { + DOM.setStyleAttribute(fieldset, "display", "none"); + super.setTitle(fieldset, legend, title); + DOM.setStyleAttribute(fieldset, "display", ""); + } } /** @@ -94,26 +94,26 @@ * Constructor. * * @param title - * the title to display + * the title to display */ public TitledPanel(final String title) { - super(DOM.createElement("fieldset")); - legend = DOM.createElement("legend"); - DOM.appendChild(getElement(), legend); - setTitle(title); + super(DOM.createElement("fieldset")); + legend = DOM.createElement("legend"); + DOM.appendChild(getElement(), legend); + setTitle(title); } /** * Constructor. * * @param title - * the title to display + * the title to display * @param w - * the widget to add to the panel + * the widget to add to the panel */ public TitledPanel(final String title, final Widget w) { - this(title); - setWidget(w); + this(title); + setWidget(w); } /** @@ -122,7 +122,7 @@ * @return the title of the panel */ public String getTitle() { - return this.title; + return this.title; } /** @@ -130,11 +130,11 @@ * the title completely, leaving just a box. * * @param title - * the new title + * the new title */ public void setTitle(final String title) { - this.title = title; - impl.setTitle(getElement(), legend, title); + this.title = title; + impl.setTitle(getElement(), legend, title); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/UIConstants.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/UIConstants.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/UIConstants.java 2008-10-21 19:26:47 UTC (rev 917) @@ -21,7 +21,7 @@ public interface UIConstants { - public final static String ICON_HORIZ_ALIGN_RIGHT = "right"; - public final static String ICON_HORIZ_ALIGN_LEFT = "left"; + String ICON_HORIZ_ALIGN_RIGHT = "right"; + String ICON_HORIZ_ALIGN_LEFT = "left"; } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/UnknowComponent.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/UnknowComponent.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/UnknowComponent.java 2008-10-21 19:26:47 UTC (rev 917) @@ -28,11 +28,11 @@ public static final UnknowComponent instance = new UnknowComponent(); public UnknowComponent() { - super("programming error: unknown component!! please contact kune-devel(a)lists-ourproject.org"); + super("programming error: unknown component!! please contact kune-devel(a)lists-ourproject.org"); } public View getView() { - return this; + return this; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java 2008-10-21 19:26:47 UTC (rev 917) @@ -49,35 +49,35 @@ } private static native String getQueryString() /*-{ - return $wnd.location.search; - }-*/; + return $wnd.location.search; + }-*/; private static native String getProtocol() /*-{ - return $wnd.location.protocol; - }-*/; + return $wnd.location.protocol; + }-*/; private static native String getPort() /*-{ - return $wnd.location.port; - }-*/; + return $wnd.location.port; + }-*/; private static native String getPath() /*-{ - return $wnd.location.pathname; - }-*/; + return $wnd.location.pathname; + }-*/; private static native String getHref() /*-{ - return $wnd.location.href; - }-*/; + return $wnd.location.href; + }-*/; private static native String getHostName() /*-{ - return $wnd.location.hostname; - }-*/; + return $wnd.location.hostname; + }-*/; private static native String getHost() /*-{ - return $wnd.location.host; - }-*/; + return $wnd.location.host; + }-*/; private static native String getHash() /*-{ - return $wnd.location.hash; - }-*/; + return $wnd.location.hash; + }-*/; } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultTabbedForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultTabbedForm.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultTabbedForm.java 2008-10-21 19:26:47 UTC (rev 917) @@ -14,39 +14,39 @@ private final TabPanel tabPanel; public DefaultTabbedForm(final int width, final int labelWidth) { - formPanel = new FormPanel(); - formPanel.setFrame(true); - formPanel.setLabelWidth(labelWidth); - formPanel.setBorder(false); - formPanel.setWidth(width); - formPanel.setButtonAlign(Position.RIGHT); + formPanel = new FormPanel(); + formPanel.setFrame(true); + formPanel.setLabelWidth(labelWidth); + formPanel.setBorder(false); + formPanel.setWidth(width); + formPanel.setButtonAlign(Position.RIGHT); - tabPanel = new TabPanel(); - tabPanel.setActiveTab(0); - formPanel.add(tabPanel); + tabPanel = new TabPanel(); + tabPanel.setActiveTab(0); + formPanel.add(tabPanel); } public void addButton(final Button button) { - formPanel.addButton(button); + formPanel.addButton(button); } public void addTab(final String title, final Panel tab) { - tab.setTitle(title); - tab.setLayout(new FormLayout()); - tab.setAutoHeight(true); - tab.setPaddings(10); - tabPanel.add(tab); - if (formPanel.isRendered()) { - formPanel.doLayout(); - } + tab.setTitle(title); + tab.setLayout(new FormLayout()); + tab.setAutoHeight(true); + tab.setPaddings(10); + tabPanel.add(tab); + if (formPanel.isRendered()) { + formPanel.doLayout(); + } } public Form getForm() { - return formPanel.getForm(); + return formPanel.getForm(); } public Component getPanel() { - return formPanel; + return formPanel; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/TwoButtonsDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/TwoButtonsDialog.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/TwoButtonsDialog.java 2008-10-21 19:26:47 UTC (rev 917) @@ -32,6 +32,13 @@ private final Window dialog; public TwoButtonsDialog(final String caption, final String firstButton, final String secondButton, + final boolean modal, final boolean minimizable, final int width, final int height, + final FormListener listener) { + this(caption, firstButton, secondButton, modal, minimizable, width, height, width, height, listener); + + } + + public TwoButtonsDialog(final String caption, final String firstButton, final String secondButton, final boolean modal, final boolean minimizable, final int width, final int height, final int minWidth, final int minHeight, final FormListener listener) { @@ -47,39 +54,27 @@ dialog.setCollapsible(minimizable); // Def values - dialog. + dialog.setShadow(true); - setShadow(true); - dialog.addButton(new CustomButton(firstButton, new ClickListener() { public void onClick(final Widget sender) { listener.onAccept(); } }).getButton()); - dialog.addButton(new CustomButton(secondButton, new ClickListener() { + CustomButton button = new CustomButton(secondButton, new ClickListener() { public void onClick(final Widget sender) { listener.onCancel(); } - }).getButton()); + }); + dialog.addButton(button.getButton()); } - public TwoButtonsDialog(final String caption, final String firstButton, final String secondButton, - final boolean modal, final boolean minimizable, final int width, final int height, - final FormListener listener) { - this(caption, firstButton, secondButton, modal, minimizable, width, height, width, height, listener); - - } - public void add(final Widget widget) { dialog.add(widget); } - public void show() { - dialog.show(); - } - public void center() { dialog.center(); } @@ -87,4 +82,8 @@ public void hide() { dialog.hide(); } + + public void show() { + dialog.show(); + } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2008-10-21 19:26:47 UTC (rev 917) @@ -2,6 +2,8 @@ import org.ourproject.kune.platf.client.dto.StateToken; 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 com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.RootPanel; @@ -9,6 +11,7 @@ public class FileDownloadUtils { private static final String DOWNLOADSERVLET = "/kune/servlets/FileDownloadManager"; + private static final String LOGODOWNLOADSERVLET = "/kune/servlets/EntityLogoDownloadManager"; private final Session session; @@ -22,17 +25,20 @@ } public String getImageResizedUrl(final StateToken token, ImageSize imageSize) { - return calculateUrl(token, false) + "&" + FileParams.IMGSIZE + "=" + imageSize; + return calculateUrl(token, false) + "&" + new UrlParam(FileParams.IMGSIZE, imageSize.toString()); } public String getImageUrl(final StateToken token) { return calculateUrl(token, false); } + public String getLogoImageUrl(StateToken token) { + return new Url(LOGODOWNLOADSERVLET, new UrlParam(FileParams.TOKEN, token.toString())).toString(); + } + private String calculateUrl(final StateToken token, final boolean download) { - final String url = DOWNLOADSERVLET + "?" + FileParams.TOKEN + "=" + token + "&" + FileParams.HASH + "=" - + session.getUserHash() + "&" + FileParams.DOWNLOAD + "=" + (download ? "true" : "false"); - return url; + return new Url(DOWNLOADSERVLET, new UrlParam(FileParams.TOKEN, token.toString()), new UrlParam(FileParams.HASH, + session.getUserHash()), new UrlParam(FileParams.DOWNLOAD, download)).toString(); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,8 +1,9 @@ package org.ourproject.kune.platf.client.ui.download; public interface FileParams { - final String HASH = "hash"; - final String TOKEN = "token"; - final String DOWNLOAD = "download"; - final String IMGSIZE = "imgsize"; + String HASH = "hash"; + String TOKEN = "token"; + String DOWNLOAD = "download"; + String IMGSIZE = "imgsize"; + String FILENAME = "filename"; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/AbstractFormPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/AbstractFormPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/AbstractFormPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -34,35 +34,35 @@ protected final VerticalPanel content; public AbstractFormPanel(final FormListener listener) { - content = new VerticalPanel(); - add(content); + content = new VerticalPanel(); + add(content); - btnOk = new Button("", new ClickListener() { - public void onClick(final Widget sender) { - listener.onAccept(); - } - }); - btnCancel = new Button("", new ClickListener() { - public void onClick(final Widget sender) { - listener.onCancel(); - } - }); + btnOk = new Button("", new ClickListener() { + public void onClick(final Widget sender) { + listener.onAccept(); + } + }); + btnCancel = new Button("", new ClickListener() { + public void onClick(final Widget sender) { + listener.onCancel(); + } + }); - FlowPanel controls = new FlowPanel(); - controls.add(btnOk); - controls.add(btnCancel); - add(controls); + FlowPanel controls = new FlowPanel(); + controls.add(btnOk); + controls.add(btnCancel); + add(controls); } public void addRow(final String label, final Widget widget) { - HorizontalPanel panel = new HorizontalPanel(); - panel.add(new Label(label)); - panel.add(widget); - content.add(panel); + HorizontalPanel panel = new HorizontalPanel(); + panel.add(new Label(label)); + panel.add(widget); + content.add(panel); } public void setCommandLabels(final String acceptLabel, final String cancelLabel) { - btnOk.setText(acceptLabel); - btnCancel.setText(cancelLabel); + btnOk.setText(acceptLabel); + btnCancel.setText(cancelLabel); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/FormListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/FormListener.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/FormListener.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.client.ui.form; - public interface FormListener { void onAccept(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java 2008-10-21 19:26:47 UTC (rev 917) @@ -41,42 +41,42 @@ /** * * @param param - * the uniq id (for instance a group short name, a xmpp uri - * of the object asociated with this menu + * the uniq id (for instance a group short name, a xmpp uri of + * the object asociated with this menu * */ public CustomMenu(final T param) { - this.param = param; - menu = new Menu(); + this.param = param; + menu = new Menu(); } public void addMenuItem(final MenuItem<T> menuItem) { - final Item item = new Item(menuItem.getTitle()); - item.setIcon(menuItem.getIcon()); - menu.addItem(item); - item.addListener(new BaseItemListenerAdapter() { - public void onClick(final BaseItem item, final EventObject e) { - DeferredCommand.addCommand(new Command() { - public void execute() { - menuItem.fire(param); - } - }); - } - }); + final Item item = new Item(menuItem.getTitle()); + item.setIcon(menuItem.getIcon()); + menu.addItem(item); + item.addListener(new BaseItemListenerAdapter() { + public void onClick(final BaseItem item, final EventObject e) { + DeferredCommand.addCommand(new Command() { + public void execute() { + menuItem.fire(param); + } + }); + } + }); } @SuppressWarnings("unchecked") public void addMenuItemList(final MenuItemCollection list) { - for (final Iterator iterator = list.iterator(); iterator.hasNext();) { - final MenuItem item = (MenuItem) iterator.next(); - addMenuItem(item); - } + for (final Iterator iterator = list.iterator(); iterator.hasNext();) { + final MenuItem item = (MenuItem) iterator.next(); + addMenuItem(item); + } } public void showMenu(final EventObject e) { - if (menu.getItems().length > 0) { - menu.showAt(e.getXY()); - } + if (menu.getItems().length > 0) { + menu.showAt(e.getXY()); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridButton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridButton.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridButton.java 2008-10-21 19:26:47 UTC (rev 917) @@ -10,26 +10,26 @@ private final Listener<String> listener; public GridButton(final String icon, final String title, final String tooltip, final Listener<String> listener) { - this.icon = icon; - this.title = title; - this.tooltip = tooltip; - this.listener = listener; + this.icon = icon; + this.title = title; + this.tooltip = tooltip; + this.listener = listener; } public String getIcon() { - return icon; + return icon; } public Listener<String> getListener() { - return listener; + return listener; } public String getTitle() { - return title; + return title; } public String getTooltip() { - return tooltip; + return tooltip; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDragConfiguration.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDragConfiguration.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDragConfiguration.java 2008-10-21 19:26:47 UTC (rev 917) @@ -27,16 +27,16 @@ private final String dragMessage; public GridDragConfiguration(final String ddGroupId, final String dragMessage) { - this.ddGroupId = ddGroupId; - this.dragMessage = dragMessage; + this.ddGroupId = ddGroupId; + this.dragMessage = dragMessage; } public String getDdGroupId() { - return ddGroupId; + return ddGroupId; } public String getDragMessage() { - return dragMessage; + return dragMessage; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java 2008-10-21 19:26:47 UTC (rev 917) @@ -31,21 +31,21 @@ private final Event<String> onDrop; public GridDropConfiguration(final String ddGroupId, final Listener<String> listener) { - this.ddGroupId = ddGroupId; - this.onDrop = Events.create(String.class, "onDrop"); - this.onDrop(listener); + this.ddGroupId = ddGroupId; + this.onDrop = Events.create(String.class, "onDrop"); + this.onDrop(listener); } public void fire(final String id) { - onDrop.fire(id); + onDrop.fire(id); } public String getDdGroupId() { - return ddGroupId; + return ddGroupId; } public void onDrop(final Listener<String> listener) { - onDrop.add(listener); + onDrop.add(listener); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridGroup.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridGroup.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridGroup.java 2008-10-21 19:26:47 UTC (rev 917) @@ -10,60 +10,60 @@ private String endIconHtml; public GridGroup(final String adminsTitle, final String tooltipTitle, final String tooltip, - final boolean countVisible) { - this(adminsTitle, tooltipTitle, tooltip, "", countVisible); + final boolean countVisible) { + this(adminsTitle, tooltipTitle, tooltip, "", countVisible); } public GridGroup(final String name, final String tooltipTitle, final String tooltip, final String endIconHtml, - final boolean countVisible) { - this.name = name; - this.tooltipTitle = tooltipTitle; - this.tooltip = tooltip; - this.endIconHtml = endIconHtml; + final boolean countVisible) { + this.name = name; + this.tooltipTitle = tooltipTitle; + this.tooltip = tooltip; + this.endIconHtml = endIconHtml; } GridGroup(final String adminsTitle) { - this(adminsTitle, "", "", false); + this(adminsTitle, "", "", false); } GridGroup(final String adminsTitle, final String tooltip) { - this(adminsTitle, "", tooltip, false); + this(adminsTitle, "", tooltip, false); } GridGroup(final String adminsTitle, final String tooltipTitle, final String tooltip) { - this(adminsTitle, tooltipTitle, tooltip, false); + this(adminsTitle, tooltipTitle, tooltip, false); } public String getEndIconHtml() { - return endIconHtml; + return endIconHtml; } public String getName() { - return name; + return name; } public String getTooltip() { - return tooltip; + return tooltip; } public String getTooltipTitle() { - return tooltipTitle; + return tooltipTitle; } public void setEndIconHtml(final String endIconHtml) { - this.endIconHtml = endIconHtml; + this.endIconHtml = endIconHtml; } public void setName(final String name) { - this.name = name; + this.name = name; } public void setTooltip(final String tooltip) { - this.tooltip = tooltip; + this.tooltip = tooltip; } public void setTooltipTitle(final String tooltipTitle) { - this.tooltipTitle = tooltipTitle; + this.tooltipTitle = tooltipTitle; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridItem.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridItem.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,6 +1,5 @@ package org.ourproject.kune.platf.client.ui.gridmenu; - public class GridItem<T> { private GridGroup group; @@ -15,98 +14,98 @@ private CustomMenu<T> menu; public GridItem(final T item, final GridGroup group, final String id, final String iconHtml, final String title, - final String titleHtml, final String endIconHtml, final String tooltipTitle, final String tooltip, - final CustomMenu<T> menu) { - this.item = item; - this.group = group; - this.id = id; - this.iconHtml = iconHtml; - this.title = title; - this.titleHtml = titleHtml; - this.endIconHtml = endIconHtml; - this.tooltip = tooltip; - this.tooltipTitle = tooltipTitle; - this.menu = menu; + final String titleHtml, final String endIconHtml, final String tooltipTitle, final String tooltip, + final CustomMenu<T> menu) { + this.item = item; + this.group = group; + this.id = id; + this.iconHtml = iconHtml; + this.title = title; + this.titleHtml = titleHtml; + this.endIconHtml = endIconHtml; + this.tooltip = tooltip; + this.tooltipTitle = tooltipTitle; + this.menu = menu; } public String getEndIconHtml() { - return endIconHtml; + return endIconHtml; } public GridGroup getGroup() { - return group; + return group; } public String getIconHtml() { - return iconHtml; + return iconHtml; } public String getId() { - return id; + return id; } public T getItem() { - return item; + return item; } public CustomMenu<T> getMenu() { - return menu; + return menu; } public String getTitle() { - return title; + return title; } public String getTitleHtml() { - return titleHtml; + return titleHtml; } public String getTooltip() { - return tooltip; + return tooltip; } public String getTooltipTitle() { - return tooltipTitle; + return tooltipTitle; } public void setEndIconHtml(final String endIconHtml) { - this.endIconHtml = endIconHtml; + this.endIconHtml = endIconHtml; } public void setGroup(final GridGroup group) { - this.group = group; + this.group = group; } public void setIconHtml(final String iconHtml) { - this.iconHtml = iconHtml; + this.iconHtml = iconHtml; } public void setId(final String id) { - this.id = id; + this.id = id; } public void setItem(final T item) { - this.item = item; + this.item = item; } public void setMenu(final CustomMenu<T> menu) { - this.menu = menu; + this.menu = menu; } public void setTitle(final String title) { - this.title = title; + this.title = title; } public void setTitleHtml(final String titleHtml) { - this.titleHtml = titleHtml; + this.titleHtml = titleHtml; } public void setTooltip(final String tooltip) { - this.tooltip = tooltip; + this.tooltip = tooltip; } public void setTooltipTitle(final String tooltipTitle) { - this.tooltipTitle = tooltipTitle; + this.tooltipTitle = tooltipTitle; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -131,11 +131,10 @@ public void addItem(final GridItem<T> gridItem) { final String id = gridItem.getId(); - final Record newRecord = recordDef - .createRecord(id, new Object[] { gridItem.getGroup().getName(), gridItem.getGroup().getTooltipTitle(), - gridItem.getGroup().getTooltip(), gridItem.getGroup().getEndIconHtml(), id, - gridItem.getIconHtml(), gridItem.getTitle(), gridItem.getTitleHtml(), - gridItem.getEndIconHtml(), gridItem.getTooltipTitle(), gridItem.getTooltip() }); + final Record newRecord = recordDef.createRecord(id, new Object[] { gridItem.getGroup().getName(), + gridItem.getGroup().getTooltipTitle(), gridItem.getGroup().getTooltip(), + gridItem.getGroup().getEndIconHtml(), id, gridItem.getIconHtml(), gridItem.getTitle(), + gridItem.getTitleHtml(), gridItem.getEndIconHtml(), gridItem.getTooltipTitle(), gridItem.getTooltip() }); recordMap.put(gridItem.getItem(), newRecord); store.addSorted(newRecord); menuMap.put(id, gridItem.getMenu()); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/imgchooser/ImageChooser.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/imgchooser/ImageChooser.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/imgchooser/ImageChooser.java 2008-10-21 19:26:47 UTC (rev 917) @@ -54,43 +54,43 @@ private final Store store; public ImageChooser(final String title, final int minWidth, final int minHeight, final Store store) { - imageMap = new HashMap<String, ImageData>(); - this.store = store; - initMainPanel(title, minWidth, minHeight); - createView(); - centerPanel.add(view); + imageMap = new HashMap<String, ImageData>(); + this.store = store; + initMainPanel(title, minWidth, minHeight); + createView(); + centerPanel.add(view); } public void show(final ImageChooserCallback callback) { - this.callback = callback; - super.show(); + this.callback = callback; + super.show(); } private void addCancelButton() { - final Button cancelButton = new Button("Cancel"); - cancelButton.enable(); - cancelButton.addListener(new ButtonListenerAdapter() { - public void onClick(final Button button, final EventObject e) { - hide(); - } - }); - addButton(cancelButton); - cancelButton.focus(); + final Button cancelButton = new Button("Cancel"); + cancelButton.enable(); + cancelButton.addListener(new ButtonListenerAdapter() { + public void onClick(final Button button, final EventObject e) { + hide(); + } + }); + addButton(cancelButton); + cancelButton.focus(); } private void addOkButton() { - okButton = new Button("Ok"); - okButton.disable(); - okButton.addListener(new ButtonListenerAdapter() { - public void onClick(final Button button, final EventObject e) { - hide(); - if (callback != null) { - // pass the image data to the caller - callback.onImageSelection(imageData); - } - } - }); - addButton(okButton); + okButton = new Button("Ok"); + okButton.disable(); + okButton.addListener(new ButtonListenerAdapter() { + public void onClick(final Button button, final EventObject e) { + hide(); + if (callback != null) { + // pass the image data to the caller + callback.onImageSelection(imageData); + } + } + }); + addButton(okButton); } /** @@ -99,104 +99,104 @@ * displays the selected images with information about the image. */ private void createView() { - // the thumb nail template for the main view - final String thumbTemplate[] = new String[] { "<tpl for='.'>", "<div class='thumb-wrap' id='{name}'>", - "<div class='thumb'><img src='{url}' title='{name}'></div>", "<span>{shortName}</span></div>", - "</tpl>", "<div class='x-clear'></div>" }; + // the thumb nail template for the main view + final String thumbTemplate[] = new String[] { "<tpl for='.'>", "<div class='thumb-wrap' id='{name}'>", + "<div class='thumb'><img src='{url}' title='{name}'></div>", "<span>{shortName}</span></div>", + "</tpl>", "<div class='x-clear'></div>" }; - // the detail template for the selected image - final String detailTemplate[] = new String[] { "<tpl for='.'>", "<div class='details'><img src='{url}'>", - "<div class='details-info'><b>Image Name:</b>", "<span>{name}</span><b>Size:</b>", - "<span>{sizeString}</span><b>Last Modified:</b>", "<span>{dateString}</span></div></div>", "</tpl>", - "<div class='x-clear'></div>" }; + // the detail template for the selected image + final String detailTemplate[] = new String[] { "<tpl for='.'>", "<div class='details'><img src='{url}'>", + "<div class='details-info'><b>Image Name:</b>", "<span>{name}</span><b>Size:</b>", + "<span>{sizeString}</span><b>Last Modified:</b>", "<span>{dateString}</span></div></div>", "</tpl>", + "<div class='x-clear'></div>" }; - // compile the templates - final XTemplate thumbsTemplate = new XTemplate(thumbTemplate); - final XTemplate detailsTemplate = new XTemplate(detailTemplate); - thumbsTemplate.compile(); - detailsTemplate.compile(); + // compile the templates + final XTemplate thumbsTemplate = new XTemplate(thumbTemplate); + final XTemplate detailsTemplate = new XTemplate(detailTemplate); + thumbsTemplate.compile(); + detailsTemplate.compile(); - // initialize the View using the thumb nail template - view = new DataView("div.thumb-wrap") { - public void prepareData(final Data data) { - ImageData newImageData = null; - final String name = data.getProperty("name"); - final String sizeString = data.getProperty("size"); - final String dateString = Format.date(data.getProperty("lastmod"), "m/d/Y g:i a"); + // initialize the View using the thumb nail template + view = new DataView("div.thumb-wrap") { + public void prepareData(final Data data) { + ImageData newImageData = null; + final String name = data.getProperty("name"); + final String sizeString = data.getProperty("size"); + final String dateString = Format.date(data.getProperty("lastmod"), "m/d/Y g:i a"); - data.setProperty("shortName", Format.ellipsis(data.getProperty("name"), 15)); - data.setProperty("sizeString", sizeString); + data.setProperty("shortName", Format.ellipsis(data.getProperty("name"), 15)); + data.setProperty("sizeString", sizeString); - if (imageMap.containsKey(name)) { - newImageData = imageMap.get(name); - } else { - newImageData = new ImageData(); - imageMap.put(name, newImageData); - } + if (imageMap.containsKey(name)) { + newImageData = imageMap.get(name); + } else { + newImageData = new ImageData(); + imageMap.put(name, newImageData); + } - newImageData.setFileName(name); - newImageData.setName(name); - newImageData.setLastModified(dateString); - newImageData.setSize(Long.parseLong(data.getProperty("size"))); - newImageData.setUrl(data.getProperty("url")); - } - }; - view.setSingleSelect(true); - view.setTpl(thumbsTemplate); - view.setStore(store); - view.setAutoHeight(true); - view.setOverCls("x-view-over"); + newImageData.setFileName(name); + newImageData.setName(name); + newImageData.setLastModified(dateString); + newImageData.setSize(Long.parseLong(data.getProperty("size"))); + newImageData.setUrl(data.getProperty("url")); + } + }; + view.setSingleSelect(true); + view.setTpl(thumbsTemplate); + view.setStore(store); + view.setAutoHeight(true); + view.setOverCls("x-view-over"); - // if there is no images that can be found, just output an message - view.setEmptyText("<div style=\"padding:10px;\">No images match the specified filter</div>"); - view.addListener(new DataViewListenerAdapter() { + // if there is no images that can be found, just output an message + view.setEmptyText("<div style=\"padding:10px;\">No images match the specified filter</div>"); + view.addListener(new DataViewListenerAdapter() { - /** - * This method is called when a selection is made changing the - * previous selection - * - * @params view the view that this selection is for - * @params selections a list of all selected items. There should - * only be one as we only allow 1 selection. - */ - public void onSelectionChange(final DataView component, final Element[] selections) { - // The details Ext.Element - final ExtElement detailEl = eastPanel.getEl(); + /** + * This method is called when a selection is made changing the + * previous selection + * + * @params view the view that this selection is for + * @params selections a list of all selected items. There should + * only be one as we only allow 1 selection. + */ + public void onSelectionChange(final DataView component, final Element[] selections) { + // The details Ext.Element + final ExtElement detailEl = eastPanel.getEl(); - // if there is a selection and show the details - if (selections != null && selections.length > 0 && selections[0] != null) { - // enable the ok button now there is a selection made - okButton.enable(); - final String id = DOM.getElementAttribute(selections[0], "id"); - imageData = imageMap.get(id); + // if there is a selection and show the details + if (selections != null && selections.length > 0 && selections[0] != null) { + // enable the ok button now there is a selection made + okButton.enable(); + final String id = DOM.getElementAttribute(selections[0], "id"); + imageData = imageMap.get(id); - detailEl.hide(); - final NameValuePair vals[] = new NameValuePair[4]; - vals[0] = new NameValuePair("name", imageData.getName()); - vals[1] = new NameValuePair("url", imageData.getUrl()); - vals[2] = new NameValuePair("sizeString", imageData.getSize()); - vals[3] = new NameValuePair("dateString", imageData.getLastModified()); - final String html = detailsTemplate.applyTemplate(vals); - detailEl.update(html); - detailEl.slideIn(); - } else { - // no selection means the ok button should be disabled and - // the detail - // area should be blanked out - okButton.disable(); - detailEl.update(""); - } - } - }); + detailEl.hide(); + final NameValuePair vals[] = new NameValuePair[4]; + vals[0] = new NameValuePair("name", imageData.getName()); + vals[1] = new NameValuePair("url", imageData.getUrl()); + vals[2] = new NameValuePair("sizeString", imageData.getSize()); + vals[3] = new NameValuePair("dateString", imageData.getLastModified()); + final String html = detailsTemplate.applyTemplate(vals); + detailEl.update(html); + detailEl.slideIn(); + } else { + // no selection means the ok button should be disabled and + // the detail + // area should be blanked out + okButton.disable(); + detailEl.update(""); + } + } + }); } private void displayThumbs(final String findStr) { - if (findStr == null || findStr.equals("")) { - store.clearFilter(true); - } else { - store.filter("name", findStr, true); - } - view.refresh(); + if (findStr == null || findStr.equals("")) { + store.clearFilter(true); + } else { + store.filter("name", findStr, true); + } + view.refresh(); } /** @@ -205,68 +205,68 @@ * @return the toolbar just created to be added into the dialog */ private Toolbar getToolbar() { - final Toolbar tb = new Toolbar(); - searchField = new TextField(); + final Toolbar tb = new Toolbar(); + searchField = new TextField(); - searchField.setId("ychooser-toolbar-searchfield"); - searchField.setMaxLength(60); - searchField.setGrow(false); - searchField.setSelectOnFocus(true); + searchField.setId("ychooser-toolbar-searchfield"); + searchField.setMaxLength(60); + searchField.setGrow(false); + searchField.setSelectOnFocus(true); - searchField.addListener(new FieldListenerAdapter() { + searchField.addListener(new FieldListenerAdapter() { - /** - * This method will be called when special characters are pressed. - * This method is only interested in the enter key so that it can - * load the images. It simulates pressing the "Find" button. - */ - public void onSpecialKey(final Field field, final EventObject e) { - if (e.getKey() == EventObject.ENTER) { - displayThumbs(searchField.getValueAsString()); // load the - // images in - // the view - } - } - }); + /** + * This method will be called when special characters are pressed. + * This method is only interested in the enter key so that it can + * load the images. It simulates pressing the "Find" button. + */ + public void onSpecialKey(final Field field, final EventObject e) { + if (e.getKey() == EventObject.ENTER) { + displayThumbs(searchField.getValueAsString()); // load the + // images in + // the view + } + } + }); - tb.addField(searchField); + tb.addField(searchField); - final ToolbarButton tbb = new ToolbarButton("Find"); - tbb.setIconCls("search-icon"); - tbb.addListener(new ButtonListenerAdapter() { - public void onClick(final Button button, final EventObject e) { - displayThumbs(searchField.getValueAsString()); - } - }); - tb.addButton(tbb); - return tb; + final ToolbarButton tbb = new ToolbarButton("Find"); + tbb.setIconCls("search-icon"); + tbb.addListener(new ButtonListenerAdapter() { + public void onClick(final Button button, final EventObject e) { + displayThumbs(searchField.getValueAsString()); + } + }); + tb.addButton(tbb); + return tb; } private void initMainPanel(final String title, final int minWidth, final int minHeight) { - setLayout(new BorderLayout()); - setHeight(minHeight); - setWidth(minWidth); - setTitle(title); - addClass("ychooser-dlg"); + setLayout(new BorderLayout()); + setHeight(minHeight); + setWidth(minWidth); + setTitle(title); + addClass("ychooser-dlg"); - eastPanel = new Panel(); - eastPanel.setId("east-panel"); - eastPanel.setCollapsible(false); - eastPanel.setWidth(150); - eastPanel.setPaddings(5); + eastPanel = new Panel(); + eastPanel.setId("east-panel"); + eastPanel.setCollapsible(false); + eastPanel.setWidth(150); + eastPanel.setPaddings(5); - centerPanel = new Panel(); - centerPanel.setId("ychooser-view"); - centerPanel.setCollapsible(false); - centerPanel.setWidth(100); - centerPanel.setHeight(200); - centerPanel.setAutoScroll(true); + centerPanel = new Panel(); + centerPanel.setId("ychooser-view"); + centerPanel.setCollapsible(false); + centerPanel.setWidth(100); + centerPanel.setHeight(200); + centerPanel.setAutoScroll(true); - add(getToolbar(), new BorderLayoutData(RegionPosition.NORTH)); - add(centerPanel, new BorderLayoutData(RegionPosition.CENTER)); - add(eastPanel, new BorderLayoutData(RegionPosition.EAST)); + add(getToolbar(), new BorderLayoutData(RegionPosition.NORTH)); + add(centerPanel, new BorderLayoutData(RegionPosition.CENTER)); + add(eastPanel, new BorderLayoutData(RegionPosition.EAST)); - addOkButton(); - addCancelButton(); + addOkButton(); + addCancelButton(); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/imgchooser/ImageChooserCallback.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/imgchooser/ImageChooserCallback.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/imgchooser/ImageChooserCallback.java 2008-10-21 19:26:47 UTC (rev 917) @@ -18,7 +18,7 @@ * This method will be called by the dialog upon an image been selected * * @param data - * is the data information of the selected image + * is the data information of the selected image */ - public void onImageSelection(ImageData data); + void onImageSelection(ImageData data); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/imgchooser/ImageData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/imgchooser/ImageData.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/imgchooser/ImageData.java 2008-10-21 19:26:47 UTC (rev 917) @@ -17,10 +17,6 @@ private String keyword[] = null; private String lastModified = null; - public String getName() { - return name; - } - public void clear() { name = null; url = null; @@ -31,66 +27,71 @@ keyword = null; } - public void setName(final String name) { - this.name = name; + public String getFileName() { + return fileName; } - public String getUrl() { - return url; + public String getFoundLocation() { + return foundLocation; } - public void setUrl(final String url) { - this.url = url; + public String[] getKeyword() { + return keyword; } - public String getFileName() { - return fileName; + public String getLastModified() { + return lastModified; } - public void setFileName(final String fileName) { - this.fileName = fileName; + public String getName() { + return name; } + public String getSearchString() { + return searchString; + } + public long getSize() { return size; } - public void setSize(final long size) { - this.size = size; + public String getUrl() { + return url; } - public String getSearchString() { - return searchString; + public void setFileName(final String fileName) { + this.fileName = fileName; } - public void setSearchString(final String searchString) { - this.searchString = searchString; + public void setFoundLocation(final String foundLocation) { + this.foundLocation = foundLocation; } - public String getFoundLocation() { - return foundLocation; + public void setKeyword(final String[] keyword) { + this.keyword = keyword; } - public void setFoundLocation(final String foundLocation) { - this.foundLocation = foundLocation; + public void setLastModified(final String lastModified) { + this.lastModified = lastModified; } - public String[] getKeyword() { - return keyword; + public void setName(final String name) { + this.name = name; } - public void setKeyword(final String[] keyword) { - this.keyword = keyword; + public void setSearchString(final String searchString) { + this.searchString = searchString; } - public String getLastModified() { - return lastModified; + public void setSize(final long size) { + this.size = size; } - public void setLastModified(final String lastModified) { - this.lastModified = lastModified; + public void setUrl(final String url) { + this.url = url; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("ImageData["); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -38,54 +38,54 @@ private PopupPanel popupPalette; public ColorWebSafePalettePanel(final ColorWebSafePalettePresenter initPresenter) { - this.presenter = initPresenter; + this.presenter = initPresenter; } public void hide() { - if (popupPalette != null) { - popupPalette.hide(); - } + if (popupPalette != null) { + popupPalette.hide(); + } } public void show(final int left, final int top) { - if (paletteGrid == null) { - createPalette(); - } - popupPalette = new PopupPanel(true, true); - popupPalette.setVisible(false); - popupPalette.show(); - popupPalette.setPopupPosition(left, top); - popupPalette.setWidget(paletteGrid); - popupPalette.setVisible(true); + if (paletteGrid == null) { + createPalette(); + } + popupPalette = new PopupPanel(true, true); + popupPalette.setVisible(false); + popupPalette.show(); + popupPalette.setPopupPosition(left, top); + popupPalette.setWidget(paletteGrid); + popupPalette.setVisible(true); } private void createPalette() { - paletteGrid = new Grid(ROWS, COLS); + paletteGrid = new Grid(ROWS, COLS); - paletteGrid.setCellSpacing(1); - // Put color values in the grid cells + paletteGrid.setCellSpacing(1); + // Put color values in the grid cells - int row; - int col; - int n = 0; - for (int a = 0; a < COLORS.length; a++) { - for (int b = 0; b < COLORS.length; b++) { - for (int c = 0; c < COLORS.length; c++) { - row = n / COLS; - col = n % COLS; - final String currentColor = "#" + COLORS[c] + COLORS[a] + COLORS[b]; - paletteGrid.setText(row, col, " "); - DOM.setStyleAttribute(paletteGrid.getCellFormatter().getElement(row, col), "backgroundColor", - currentColor); - n++; - } - } - } - paletteGrid.addStyleName("kune-WebSafePalette"); - paletteGrid.addTableListener(new TableListener() { - public void onCellClicked(final SourcesTableEvents sender, final int row, final int col) { - presenter.onColorSelected(row, col); - } - }); + int row; + int col; + int n = 0; + for (int a = 0; a < COLORS.length; a++) { + for (int b = 0; b < COLORS.length; b++) { + for (int c = 0; c < COLORS.length; c++) { + row = n / COLS; + col = n % COLS; + final String currentColor = "#" + COLORS[c] + COLORS[a] + COLORS[b]; + paletteGrid.setText(row, col, " "); + DOM.setStyleAttribute(paletteGrid.getCellFormatter().getElement(row, col), "backgroundColor", + currentColor); + n++; + } + } + } + paletteGrid.addStyleName("kune-WebSafePalette"); + paletteGrid.addTableListener(new TableListener() { + public void onCellClicked(final SourcesTableEvents sender, final int row, final int col) { + presenter.onColorSelected(row, col); + } + }); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -31,34 +31,34 @@ } public void hide() { - this.view.hide(); + this.view.hide(); } public void init(final WebSafePaletteView view) { - this.view = view; + this.view = view; } public void show(final int left, final int top, final Listener<String> onColorSelected) { - view.show(left, top); - this.onColorSelected = onColorSelected; + view.show(left, top); + this.onColorSelected = onColorSelected; } protected void onColorSelected(final int row, final int col) { - final String color = getColor(row, col); - onColorSelected.onEvent(color); + final String color = getColor(row, col); + onColorSelected.onEvent(color); } private String getColor(final int row, final int col) { - String color = null; - final int pd = row * WebSafePaletteView.COLS + col; - final int da = pd / 6; - final int ra = pd % 6; - final int aa = da - ra / 6; - final int db = aa / 6; - final int rb = aa % 6; - final int rc = (db - rb / 6) % 6; - color = "rgb(" + ra * 51 + ", " + rc * 51 + ", " + rb * 51 + ")"; - return color; + String color = null; + final int pd = row * WebSafePaletteView.COLS + col; + final int da = pd / 6; + final int ra = pd % 6; + final int aa = da - ra / 6; + final int db = aa / 6; + final int rb = aa % 6; + final int rc = (db - rb / 6) % 6; + color = "rgb(" + ra * 51 + ", " + rc * 51 + ", " + rb * 51 + ")"; + return color; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePaletteView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePaletteView.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePaletteView.java 2008-10-21 19:26:47 UTC (rev 917) @@ -22,11 +22,11 @@ public interface WebSafePaletteView { - final int ROWS = 18; + int ROWS = 18; - final int COLS = 12; + int COLS = 12; - final String COLORS[] = { "0", "3", "6", "9", "C", "F" }; + String COLORS[] = { "0", "3", "6", "9", "C", "F" }; void hide(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateIt.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateIt.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateIt.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,6 +1,5 @@ package org.ourproject.kune.platf.client.ui.rate; - public interface RateIt { void setVisible(boolean visible); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -41,90 +41,90 @@ private final I18nTranslationService i18n; public RateItPanel(final RateItPresenter presenter, final I18nTranslationService i18n, final WorkspaceSkeleton ws) { - this.presenter = presenter; - this.i18n = i18n; - initialize(); - layout(); - setProperties(); - ws.getEntityWorkspace().getContentBottomBar().add(this); + this.presenter = presenter; + this.i18n = i18n; + initialize(); + layout(); + setProperties(); + ws.getEntityWorkspace().getContentBottomBar().add(this); } public void clearRate() { - for (int i = 0; i < 5; i++) { - img.starGrey().applyTo(starImg[i]); - } + for (int i = 0; i < 5; i++) { + img.starGrey().applyTo(starImg[i]); + } } public void onClick(final Widget sender) { - for (int i = 0; i < 5; i++) { - if (sender == starImg[i]) { - presenter.starClicked(i); - } - } + for (int i = 0; i < 5; i++) { + if (sender == starImg[i]) { + presenter.starClicked(i); + } + } } public void setDesc(final String desc) { - rateDesc.setText(desc); + rateDesc.setText(desc); } public void setRate(final Star stars[]) { - for (int i = 0; i < 5; i++) { - stars[i].getImage().applyTo(starImg[i]); - } + for (int i = 0; i < 5; i++) { + stars[i].getImage().applyTo(starImg[i]); + } } public void setStars(final Double rate) { - setRate(Star.genStars(rate.doubleValue())); + setRate(Star.genStars(rate.doubleValue())); } private void initialize() { - rateItLabel = new Label(i18n.t("Rate it:")); - rateGrid = new Grid(1, 7); - starImg = new Image[5]; - rateDesc = new Label(); - for (int i = 0; i < 5; i++) { - starImg[i] = new Image(); - img.starGrey().applyTo(starImg[i]); - starImg[i].addStyleName("rateit-star"); - starImg[i].setStyleName("rateit-star"); - starImg[i].setTitle(i18n.t("Click to rate this")); - starImg[i].addClickListener(this); - starImg[i].addMouseListener(new MouseListenerAdapter() { - public void onMouseEnter(final Widget sender) { - for (int j = 0; j < 5; j++) { - if (sender == starImg[j]) { - presenter.starOver(j); - } - } + rateItLabel = new Label(i18n.t("Rate it:")); + rateGrid = new Grid(1, 7); + starImg = new Image[5]; + rateDesc = new Label(); + for (int i = 0; i < 5; i++) { + starImg[i] = new Image(); + img.starGrey().applyTo(starImg[i]); + starImg[i].addStyleName("rateit-star"); + starImg[i].setStyleName("rateit-star"); + starImg[i].setTitle(i18n.t("Click to rate this")); + starImg[i].addClickListener(this); + starImg[i].addMouseListener(new MouseListenerAdapter() { + public void onMouseEnter(final Widget sender) { + for (int j = 0; j < 5; j++) { + if (sender == starImg[j]) { + presenter.starOver(j); + } + } - } + } - public void onMouseLeave(final Widget sender) { - presenter.revertCurrentRate(); - } - }); - } + public void onMouseLeave(final Widget sender) { + presenter.revertCurrentRate(); + } + }); + } } private void layout() { - initWidget(rateGrid); - rateGrid.setWidget(0, 0, rateItLabel); - for (int i = 0; i < 5; i++) { - rateGrid.setWidget(0, i + 1, starImg[i]); - } - rateGrid.setWidget(0, 6, rateDesc); + initWidget(rateGrid); + rateGrid.setWidget(0, 0, rateItLabel); + for (int i = 0; i < 5; i++) { + rateGrid.setWidget(0, i + 1, starImg[i]); + } + rateGrid.setWidget(0, 6, rateDesc); } private void setProperties() { - rateGrid.setCellPadding(0); - rateGrid.setCellSpacing(0); - rateGrid.setBorderWidth(0); - rateItLabel.addStyleName("kune-Margin-Medium-r"); - // rateItLabel.addStyleName("kune-Margin-Medium-l"); - rateItLabel.addStyleName("kune-RatePanel-Label"); - rateGrid.addStyleName("kune-RatePanel-Stars"); - rateGrid.addStyleName("kune-RatePanel-Stars-RateIt"); - rateDesc.addStyleName("kune-RatePanel-Label"); - rateDesc.addStyleName("kune-Margin-Medium-l"); + rateGrid.setCellPadding(0); + rateGrid.setCellSpacing(0); + rateGrid.setBorderWidth(0); + rateItLabel.addStyleName("kune-Margin-Medium-r"); + // rateItLabel.addStyleName("kune-Margin-Medium-l"); + rateItLabel.addStyleName("kune-RatePanel-Label"); + rateGrid.addStyleName("kune-RatePanel-Stars"); + rateGrid.addStyleName("kune-RatePanel-Stars-RateIt"); + rateDesc.addStyleName("kune-RatePanel-Label"); + rateDesc.addStyleName("kune-Margin-Medium-l"); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -42,107 +42,107 @@ private final StateManager stateManager; public RateItPresenter(final I18nTranslationService i18n, final Session session, - final Provider<ContentServiceAsync> contentServiceProvider, final StateManager stateManager) { - this.i18n = i18n; - this.session = session; - this.contentServiceProvider = contentServiceProvider; - this.stateManager = stateManager; - stateManager.onStateChanged(new Listener<StateDTO>() { - public void onEvent(final StateDTO state) { - setState(state); - } - }); + final Provider<ContentServiceAsync> contentServiceProvider, final StateManager stateManager) { + this.i18n = i18n; + this.session = session; + this.contentServiceProvider = contentServiceProvider; + this.stateManager = stateManager; + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(final StateDTO state) { + setState(state); + } + }); } public void init(final RateItView view) { - this.view = view; - currentRate = NOT_RATED; - isRating = false; + this.view = view; + currentRate = NOT_RATED; + isRating = false; } public void setRate(final Double value) { - currentRate = value; - if (currentRate == null) { - currentRate = NOT_RATED; - } - isRating = false; - setRatePanel(currentRate); + currentRate = value; + if (currentRate == null) { + currentRate = NOT_RATED; + } + isRating = false; + setRatePanel(currentRate); } public void setVisible(final boolean visible) { - view.setVisible(visible); + view.setVisible(visible); } protected void revertCurrentRate() { - if (!isRating) { - setRatePanel(currentRate); - } + if (!isRating) { + setRatePanel(currentRate); + } } protected void starClicked(final int starClicked) { - isRating = true; - final Double newValue = starClicked + 1d == currentRate ? currentRate - 0.5d : starClicked + 1d; - setRatePanel(newValue); - Site.showProgressProcessing(); - final StateDTO currentState = session.getCurrentState(); - contentServiceProvider.get().rateContent(session.getUserHash(), currentState.getStateToken(), newValue, - new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - Site.hideProgress(); - Site.info(i18n.t("Content rated")); - stateManager.reload(); - } - }); + isRating = true; + final Double newValue = starClicked + 1d == currentRate ? currentRate - 0.5d : starClicked + 1d; + setRatePanel(newValue); + Site.showProgressProcessing(); + final StateDTO currentState = session.getCurrentState(); + contentServiceProvider.get().rateContent(session.getUserHash(), currentState.getStateToken(), newValue, + new AsyncCallbackSimple<Object>() { + public void onSuccess(final Object result) { + Site.hideProgress(); + Site.info(i18n.t("Content rated")); + stateManager.reload(); + } + }); } protected void starOver(final int starMouseOver) { - Double value = new Double(starMouseOver + 1); - if (Math.ceil(currentRate.doubleValue()) == value.doubleValue()) { - // use user already rated -> live same value when mouse is over - value = currentRate; - } - if (!isRating) { - // If we are not doing a rate rpc call - setRatePanel(value); - } + Double value = new Double(starMouseOver + 1); + if (Math.ceil(currentRate.doubleValue()) == value.doubleValue()) { + // use user already rated -> live same value when mouse is over + value = currentRate; + } + if (!isRating) { + // If we are not doing a rate rpc call + setRatePanel(value); + } } private void setDesc(final int rateTruncated) { - if (rateTruncated >= 0 && rateTruncated <= 1) { - view.setDesc(i18n.t("Poor")); - } else if (rateTruncated == 2) { - view.setDesc(i18n.t("Below average")); - } else if (rateTruncated == 3) { - view.setDesc(i18n.t("Average")); - } else if (rateTruncated == 4) { - view.setDesc(i18n.t("Above average")); - } else if (rateTruncated == 5) { - view.setDesc(i18n.t("Excellent")); - } else { - view.setDesc(""); - } + if (rateTruncated >= 0 && rateTruncated <= 1) { + view.setDesc(i18n.t("Poor")); + } else if (rateTruncated == 2) { + view.setDesc(i18n.t("Below average")); + } else if (rateTruncated == 3) { + view.setDesc(i18n.t("Average")); + } else if (rateTruncated == 4) { + view.setDesc(i18n.t("Above average")); + } else if (rateTruncated == 5) { + view.setDesc(i18n.t("Excellent")); + } else { + view.setDesc(""); + } } private void setRatePanel(final Double value) { - if (value.equals(NOT_RATED)) { - view.clearRate(); - view.setDesc(""); - } else { - view.setStars(value); - setDesc((int) Math.ceil(value.doubleValue())); - } + if (value.equals(NOT_RATED)) { + view.clearRate(); + view.setDesc(""); + } else { + view.setStars(value); + setDesc((int) Math.ceil(value.doubleValue())); + } } private void setState(final StateDTO state) { - if (state.isRateable()) { - if (session.isLogged()) { - setRate(state.getCurrentUserRate()); - view.setVisible(true); - } else { - view.setVisible(false); - } - } else { - view.setVisible(false); - } + if (state.isRateable()) { + if (session.isLogged()) { + setRate(state.getCurrentUserRate()); + view.setVisible(true); + } else { + view.setVisible(false); + } + } else { + view.setVisible(false); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -35,68 +35,68 @@ private final I18nTranslationService i18n; public RatePanel(final Double rate, final Integer byUsers, final I18nTranslationService i18n, - final WorkspaceSkeleton ws) { - this.i18n = i18n; - initialize(); - layout(); - setProperties(); - if (rate != null) { - setRate(rate); - } - if (byUsers != null) { - setByUsers(byUsers); - } - final Toolbar bottomBar = ws.getEntityWorkspace().getContentBottomBar(); - bottomBar.addFill(); - bottomBar.add(this); + final WorkspaceSkeleton ws) { + this.i18n = i18n; + initialize(); + layout(); + setProperties(); + if (rate != null) { + setRate(rate); + } + if (byUsers != null) { + setByUsers(byUsers); + } + final Toolbar bottomBar = ws.getEntityWorkspace().getContentBottomBar(); + bottomBar.addFill(); + bottomBar.add(this); } public void setByUsers(final Integer byUsers) { - if (byUsers.intValue() == 0) { - rateDesc.setText(i18n.t("(Not rated)")); - } else if (byUsers.intValue() == 1) { - // i18n params pluralization - rateDesc.setText(i18n.t("([%d] user)", byUsers)); - } else { - rateDesc.setText(i18n.t("([%d] users)", byUsers)); - } + if (byUsers.intValue() == 0) { + rateDesc.setText(i18n.t("(Not rated)")); + } else if (byUsers.intValue() == 1) { + // i18n params pluralization + rateDesc.setText(i18n.t("([%d] user)", byUsers)); + } else { + rateDesc.setText(i18n.t("([%d] users)", byUsers)); + } } public void setRate(final Double rate) { - setRate(Star.genStars(rate.doubleValue())); + setRate(Star.genStars(rate.doubleValue())); } private void initialize() { - rateGrid = new Grid(1, 6); - starImg = new Image[5]; - for (int i = 0; i < 5; i++) { - starImg[i] = new Image(); - new Star(Star.GREY).getImage().applyTo(starImg[i]); - } - rateDesc = new Label(); + rateGrid = new Grid(1, 6); + starImg = new Image[5]; + for (int i = 0; i < 5; i++) { + starImg[i] = new Image(); + new Star(Star.GREY).getImage().applyTo(starImg[i]); + } + rateDesc = new Label(); } private void layout() { - initWidget(rateGrid); - for (int i = 0; i < 5; i++) { - rateGrid.setWidget(0, i, starImg[i]); - } - rateGrid.setWidget(0, 5, rateDesc); + initWidget(rateGrid); + for (int i = 0; i < 5; i++) { + rateGrid.setWidget(0, i, starImg[i]); + } + rateGrid.setWidget(0, 5, rateDesc); } private void setProperties() { - rateGrid.setCellPadding(0); - rateGrid.setCellSpacing(0); - rateGrid.setBorderWidth(0); - rateGrid.addStyleName("kune-RatePanel-Stars"); - rateDesc.addStyleName("kune-RatePanel-Label"); - rateDesc.addStyleName("kune-Margin-Medium-lr"); + rateGrid.setCellPadding(0); + rateGrid.setCellSpacing(0); + rateGrid.setBorderWidth(0); + rateGrid.addStyleName("kune-RatePanel-Stars"); + rateDesc.addStyleName("kune-RatePanel-Label"); + rateDesc.addStyleName("kune-Margin-Medium-lr"); } private void setRate(final Star stars[]) { - for (int i = 0; i < 5; i++) { - stars[i].getImage().applyTo(starImg[i]); - } + for (int i = 0; i < 5; i++) { + stars[i].getImage().applyTo(starImg[i]); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -10,29 +10,29 @@ private RateView view; public RatePresenter(final StateManager stateManager) { - stateManager.onStateChanged(new Listener<StateDTO>() { - public void onEvent(final StateDTO state) { - setState(state); - } - }); + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(final StateDTO state) { + setState(state); + } + }); } public void init(final RateView view) { - this.view = view; + this.view = view; } public void setVisible(final boolean visible) { - view.setVisible(visible); + view.setVisible(visible); } private void setState(final StateDTO state) { - if (state.isRateable()) { - view.setVisible(true); - view.setRate(state.getRate()); - view.setByUsers(state.getRateByUsers()); - } else { - view.setVisible(false); - } + if (state.isRateable()) { + view.setVisible(true); + view.setRate(state.getRate()); + view.setByUsers(state.getRateByUsers()); + } else { + view.setVisible(false); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateView.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateView.java 2008-10-21 19:26:47 UTC (rev 917) @@ -21,10 +21,10 @@ public interface RateView { - public void setByUsers(Integer byUsers); + void setByUsers(Integer byUsers); - public void setRate(Double rate); + void setRate(Double rate); - public void setVisible(boolean visible); + void setVisible(boolean visible); } Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/AbstractUploader.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/AbstractUploader.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/AbstractUploader.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,16 @@ +package org.ourproject.kune.platf.client.ui.upload; + +import org.ourproject.kune.platf.client.ui.download.FileParams; + +import com.gwtext.client.core.UrlParam; + +public class AbstractUploader { + + public UrlParam[] genUploadParams(final String userhash, final String currentStateToken) { + // Warning take into account param[size] + final UrlParam param[] = new UrlParam[2]; + param[0] = new UrlParam(FileParams.HASH, userhash); + param[1] = new UrlParam(FileParams.TOKEN, currentStateToken); + return param; + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java 2008-10-21 19:26:47 UTC (rev 917) @@ -2,10 +2,6 @@ public interface FileUploader { - public static final String USERHASH = "userhash"; - public static final String CURRENT_STATE_TOKEN = "currentStateToken"; - public static final String FILENAME = "filename"; - boolean hasUploadingFiles(); void hide(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java 2008-10-21 19:26:47 UTC (rev 917) @@ -10,7 +10,6 @@ import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DeferredCommand; import com.gwtext.client.core.EventObject; -import com.gwtext.client.core.UrlParam; import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.ToolbarButton; import com.gwtext.client.widgets.Window; @@ -18,7 +17,7 @@ import com.gwtextux.client.widgets.upload.UploadDialog; import com.gwtextux.client.widgets.upload.UploadDialogListenerAdapter; -public class FileUploaderDialog implements FileUploaderView { +public class FileUploaderDialog extends AbstractUploader implements FileUploaderView { protected static final String SITE_FILE_UPLOADER = "k-site-file-uploader"; @@ -31,149 +30,145 @@ private final FileUploaderPresenter presenter; public FileUploaderDialog(final FileUploaderPresenter presenter, final I18nUITranslationService i18n, - final WorkspaceSkeleton ws) { - this.presenter = presenter; - this.i18n = i18n; - this.ws = ws; - createDialog(false); + final WorkspaceSkeleton ws) { + this.presenter = presenter; + this.i18n = i18n; + this.ws = ws; + createDialog(false); } public void destroy() { - if (hasUploadingFiles()) { - dialog.stopUpload(); - Site.important(i18n.t("Upload canceled after sign out")); - } - if (dialog != null) { - dialog.destroy(); - dialog = null; - } - if (traybarButton != null) { - traybarButton.destroy(); - traybarButton = null; - } + if (hasUploadingFiles()) { + dialog.stopUpload(); + Site.important(i18n.t("Upload canceled after sign out")); + } + if (dialog != null) { + dialog.destroy(); + dialog = null; + } + if (traybarButton != null) { + traybarButton.destroy(); + traybarButton = null; + } } public boolean hasUploadingFiles() { - return dialog.hasUnuploadedFiles(); + return dialog.hasUnuploadedFiles(); } public void hide() { - dialog.hide(); + dialog.hide(); } public void resetPermittedExtensions() { - final String[] extensions = {}; - setPermittedExtensions(extensions); + final String[] extensions = {}; + setPermittedExtensions(extensions); } public void setPermittedExtensions(final String extensions) { - final Object[] objs = KuneStringUtils.splitTags(extensions).toArray(); - final String[] exts = new String[objs.length]; - for (int i = 0; i < objs.length; i++) { - exts[i] = (String) objs[i]; - } - setPermittedExtensions(exts); + final Object[] objs = KuneStringUtils.splitTags(extensions).toArray(); + final String[] exts = new String[objs.length]; + for (int i = 0; i < objs.length; i++) { + exts[i] = (String) objs[i]; + } + setPermittedExtensions(exts); } public void setUploadParams(final String userhash, final String currentStateToken) { - // Warning take into account param[size] - final UrlParam param[] = new UrlParam[2]; - param[0] = new UrlParam(FileUploader.USERHASH, userhash); - param[1] = new UrlParam(FileUploader.CURRENT_STATE_TOKEN, currentStateToken); - dialog.setBaseParams(param); + dialog.setBaseParams(genUploadParams(userhash, currentStateToken)); } public void show() { - if (traybarButton == null) { - traybarButton = new ToolbarButton(); - traybarButton.setTooltip(i18n.t("Show/hide uploader window")); - traybarButton.setIcon("images/nav/upload.png"); - traybarButton.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(final Button button, final EventObject e) { - if (dialog.isVisible()) { - dialog.hide(); - } else { - dialog.show(); - } - } - }); - ws.getSiteTraybar().addButton(traybarButton); - } - if (dialog == null) { - createDialog(true); - } else { - dialog.show(); - } + if (traybarButton == null) { + traybarButton = new ToolbarButton(); + traybarButton.setTooltip(i18n.t("Show/hide uploader window")); + traybarButton.setIcon("images/nav/upload.png"); + traybarButton.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + if (dialog.isVisible()) { + dialog.hide(); + } else { + dialog.show(); + } + } + }); + ws.getSiteTraybar().addButton(traybarButton); + } + if (dialog == null) { + createDialog(true); + } else { + dialog.show(); + } } private void createDialog(final boolean show) { - dialog = new UploadDialog(i18n.t("File uploader"), false, true); - dialog.setId(SITE_FILE_UPLOADER); - dialog.setAllowCloseOnUpload(true); - dialog.setResetOnHide(false); - dialog.setClosable(true); - dialog.setCloseAction(Window.HIDE); - dialog.setMinimizable(true); - dialog.setUploadAutostart(false); + dialog = new UploadDialog(i18n.t("File uploader"), false, true); + dialog.setId(SITE_FILE_UPLOADER); + dialog.setAllowCloseOnUpload(true); + dialog.setResetOnHide(false); + dialog.setClosable(true); + dialog.setCloseAction(Window.HIDE); + dialog.setMinimizable(true); + dialog.setUploadAutostart(false); - dialog.addListener(new UploadDialogListenerAdapter() { - @Override - public boolean onBeforeAdd(final UploadDialog source, final String filename) { - boolean mustAdd = presenter.checkFolderChange(); - if (!mustAdd) { - Site.important(i18n.t("Wait until current uploads finish to upload files in other location")); - } - return mustAdd; - } + dialog.addListener(new UploadDialogListenerAdapter() { + @Override + public boolean onBeforeAdd(final UploadDialog source, final String filename) { + boolean mustAdd = presenter.checkFolderChange(); + if (!mustAdd) { + Site.important(i18n.t("Wait until current uploads finish to upload files in other location")); + } + return mustAdd; + } - @Override - public void onMinimize(final Window source) { - dialog.hide(); - } + @Override + public void onMinimize(final Window source) { + dialog.hide(); + } - @Override - public void onUploadComplete(final UploadDialog source) { - if (!dialog.isVisible()) { - Site.info(i18n.t("Upload completed")); - traybarButton.destroy(); - traybarButton = null; - } - presenter.onUploadComplete(); - } + @Override + public void onUploadComplete(final UploadDialog source) { + if (!dialog.isVisible()) { + Site.info(i18n.t("Upload completed")); + traybarButton.destroy(); + traybarButton = null; + } + presenter.onUploadComplete(); + } - @Override - public void onUploadError(final UploadDialog source, final String filename, final JavaScriptObject data) { - showError(); - } + @Override + public void onUploadError(final UploadDialog source, final String filename, final JavaScriptObject data) { + showError(); + } - @Override - public void onUploadFailed(final UploadDialog source, final String filename) { - showError(); - } + @Override + public void onUploadFailed(final UploadDialog source, final String filename) { + showError(); + } - private void showError() { - if (!dialog.isVisible()) { - Site.veryImportant(i18n.t("Error uploading")); - } - } + private void showError() { + if (!dialog.isVisible()) { + Site.veryImportant(i18n.t("Error uploading")); + } + } - }); - dialog.setUrl(URL); - if (show) { - dialog.show(); - } + }); + dialog.setUrl(URL); + if (show) { + dialog.show(); + } } private void setPermittedExtensions(final String[] extensions) { - DeferredCommand.addCommand(new Command() { - public void execute() { - if (dialog == null) { - createDialog(false); - } - Log.info("PermittedExtensions: " + extensions.toString() + " length: " + extensions.length); - dialog.setPermittedExtensions(extensions); - } - }); + DeferredCommand.addCommand(new Command() { + public void execute() { + if (dialog == null) { + createDialog(false); + } + Log.info("PermittedExtensions: " + extensions.toString() + " length: " + extensions.length); + dialog.setPermittedExtensions(extensions); + } + }); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -15,61 +15,61 @@ private final Provider<ContextNavigator> navProvider; public FileUploaderPresenter(final Session session, final Provider<ContextNavigator> navProvider) { - this.session = session; - this.navProvider = navProvider; + this.session = session; + this.navProvider = navProvider; } public boolean checkFolderChange() { - final StateToken currentFolderStateToken = session.getCurrentStateToken().clone().clearDocument(); - if (sameContainer()) { - view.setUploadParams(session.getUserHash(), currentFolderStateToken.toString()); - return true; - } - if (view.hasUploadingFiles()) { - return false; - } else { - currentUploadStateToken = currentFolderStateToken; - view.setUploadParams(session.getUserHash(), currentFolderStateToken.toString()); - return true; - } + final StateToken currentFolderStateToken = session.getCurrentStateToken().clone().clearDocument(); + if (sameContainer()) { + view.setUploadParams(session.getUserHash(), currentFolderStateToken.toString()); + return true; + } + if (view.hasUploadingFiles()) { + return false; + } else { + currentUploadStateToken = currentFolderStateToken; + view.setUploadParams(session.getUserHash(), currentFolderStateToken.toString()); + return true; + } } public boolean hasUploadingFiles() { - return view.hasUploadingFiles(); + return view.hasUploadingFiles(); } public void hide() { - view.hide(); + view.hide(); } public void init(final FileUploaderView view) { - this.view = view; - session.onUserSignOut(new Listener0() { - public void onEvent() { - view.destroy(); - } - }); + this.view = view; + session.onUserSignOut(new Listener0() { + public void onEvent() { + view.destroy(); + } + }); } public void onUploadComplete() { - navProvider.get().refresh(currentUploadStateToken); + navProvider.get().refresh(currentUploadStateToken); } public void resetPermittedExtensions() { - view.resetPermittedExtensions(); + view.resetPermittedExtensions(); } public void setPermittedExtensions(final String extensions) { - view.setPermittedExtensions(extensions); + view.setPermittedExtensions(extensions); } public void show() { - view.show(); + view.show(); } private boolean sameContainer() { - final StateToken currentStateToken = session.getCurrentStateToken(); - currentUploadStateToken = currentUploadStateToken == null ? currentStateToken : currentUploadStateToken; - return currentUploadStateToken.equals(currentStateToken); + final StateToken currentStateToken = session.getCurrentStateToken(); + currentUploadStateToken = currentUploadStateToken == null ? currentStateToken : currentUploadStateToken; + return currentUploadStateToken.equals(currentStateToken); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/utils/Convert.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/utils/Convert.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/utils/Convert.java 2008-10-21 19:26:47 UTC (rev 917) @@ -18,10 +18,10 @@ * */ -package org.ourproject.kune.platf.client.utils; - -public class Convert { - public static int toInt(String value) { - return new Integer(value).intValue(); - } -} +package org.ourproject.kune.platf.client.utils; + +public class Convert { + public static int toInt(String value) { + return new Integer(value).intValue(); + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java 2008-10-21 19:26:47 UTC (rev 917) @@ -28,65 +28,65 @@ public static void doTasksDeferred() { - DeferredCommand.addCommand(new IncrementalCommand() { - int i = 0; - int j = 0; + DeferredCommand.addCommand(new IncrementalCommand() { + int i = 0; + int j = 0; - String[] lic = { "gnu-fdl.gif", "bynd80x15.png", "byncsa80x15.png", "byncnd80x15.png", "bync80x15.png", - "by80x15.png", "fal-license.gif" }; + String[] lic = { "gnu-fdl.gif", "bynd80x15.png", "byncsa80x15.png", "byncnd80x15.png", "bync80x15.png", + "by80x15.png", "fal-license.gif" }; - String[] ext = { "default/form/text-bg.gif", "default/form/trigger.gif", "default/form/date-trigger.gif", - "gray/window/left-corners.png", "gray/button/btn-sprite.gif", "gray/window/top-bottom.png", - "gray/window/right-corners.png", "gray/window/left-right.png", "default/sizer/s-handle.gif", - "default/sizer/e-handle.gif", "default/sizer/ne-handle.gif", "default/sizer/se-handle.gif", - "default/sizer/sw-handle.gif", "gray/panel/tool-sprites.gif", "default/sizer/nw-handle.gif", - "gray/tabs/tabs-sprite.gif", "gray/tabs/tab-strip-bg.gif", "default/shadow.png", - "default/shadow-lr.png", "default/shadow-c.png", "default/grid/invalid_line.gif", - "default/form/exclamation.gif", "default/box/tb-blue.gif", "default/grid/loading.gif", - "gray/toolbar/bg.gif", "default/grid/grid3-hrow.gif", "default/dd/drop-no.gif", - "default/grid/col-move-top.gif", "default/grid/col-move-bottom.gif", "default/grid/row-over.gif", - "default/grid/grid-split.gif", "default/grid/page-first-disabled.gif", - "default/grid/page-last-disabled.gif", "default/grid/done.gif", - "default/grid/page-prev-disabled.gif", "default/grid/done.gif", - "default/grid/page-next-disabled.gif", "default/qtip/tip-sprite.gif", - "default/grid/grid3-hrow-over.gif", "default/grid/grid3-hd-btn.gif", - "gray/panel/white-top-bottom.gif", "gray/tabs/tab-close.gif", "gray/toolbar/btn-arrow.gif", - "gray/toolbar/tb-btn-sprite.gif", "gray/panel/light-hd.gif" }; + String[] ext = { "default/form/text-bg.gif", "default/form/trigger.gif", "default/form/date-trigger.gif", + "gray/window/left-corners.png", "gray/button/btn-sprite.gif", "gray/window/top-bottom.png", + "gray/window/right-corners.png", "gray/window/left-right.png", "default/sizer/s-handle.gif", + "default/sizer/e-handle.gif", "default/sizer/ne-handle.gif", "default/sizer/se-handle.gif", + "default/sizer/sw-handle.gif", "gray/panel/tool-sprites.gif", "default/sizer/nw-handle.gif", + "gray/tabs/tabs-sprite.gif", "gray/tabs/tab-strip-bg.gif", "default/shadow.png", + "default/shadow-lr.png", "default/shadow-c.png", "default/grid/invalid_line.gif", + "default/form/exclamation.gif", "default/box/tb-blue.gif", "default/grid/loading.gif", + "gray/toolbar/bg.gif", "default/grid/grid3-hrow.gif", "default/dd/drop-no.gif", + "default/grid/col-move-top.gif", "default/grid/col-move-bottom.gif", "default/grid/row-over.gif", + "default/grid/grid-split.gif", "default/grid/page-first-disabled.gif", + "default/grid/page-last-disabled.gif", "default/grid/done.gif", + "default/grid/page-prev-disabled.gif", "default/grid/done.gif", + "default/grid/page-next-disabled.gif", "default/qtip/tip-sprite.gif", + "default/grid/grid3-hrow-over.gif", "default/grid/grid3-hd-btn.gif", + "gray/panel/white-top-bottom.gif", "gray/tabs/tab-close.gif", "gray/toolbar/btn-arrow.gif", + "gray/toolbar/tb-btn-sprite.gif", "gray/panel/light-hd.gif" }; - public boolean execute() { + public boolean execute() { - while (i < lic.length) { - final String licImg = lic[i]; - Image.prefetch("images/lic/" + licImg); - i++; - } + while (i < lic.length) { + final String licImg = lic[i]; + Image.prefetch("images/lic/" + licImg); + i++; + } - while (j < ext.length) { - final String extImg = ext[j]; - Image.prefetch("js/ext/resources/images/" + extImg); - j++; - } + while (j < ext.length) { + final String extImg = ext[j]; + Image.prefetch("js/ext/resources/images/" + extImg); + j++; + } - boolean notFinished = i + j < lic.length + ext.length; + boolean notFinished = i + j < lic.length + ext.length; - final boolean finished = !notFinished; + final boolean finished = !notFinished; - if (finished) { - // In the future maybe: workspace.getLoginComponent() - } + if (finished) { + // In the future maybe: workspace.getLoginComponent() + } - return notFinished; - } - }); + return notFinished; + } + }); } public static void preFetchImpImages() { - final String[] imgs = { "images/spin-kune-thund-green.gif", "css/img/button-bg-hard.gif", - "css/img/button-bg-soft.gif", "css/img/arrow-down-white.gif", "css/img/arrow-right-white.gif", - "images/lic/bysa80x15.png" }; - for (int i = 0; i < imgs.length; i++) { - final String img = imgs[i]; - Image.prefetch(img); - } + final String[] imgs = { "images/spin-kune-thund-green.gif", "css/img/button-bg-hard.gif", + "css/img/button-bg-soft.gif", "css/img/arrow-down-white.gif", "css/img/arrow-right-white.gif", + "images/lic/bysa80x15.png" }; + for (int i = 0; i < imgs.length; i++) { + final String img = imgs[i]; + Image.prefetch(img); + } } } Added: trunk/src/main/java/org/ourproject/kune/platf/client/utils/Url.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/utils/Url.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/utils/Url.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,35 @@ +package org.ourproject.kune.platf.client.utils; + +import java.util.ArrayList; + +public class Url { + private final String base; + private final ArrayList<UrlParam> params; + + public Url(String base) { + this.base = base; + params = new ArrayList<UrlParam>(); + } + + public Url(String base, UrlParam... iniParams) { + this(base); + for (UrlParam param : iniParams) { + params.add(param); + } + } + + @Override + public String toString() { + String paramPart = ""; + boolean first = true; + for (UrlParam param : params) { + if (first) { + paramPart = "?" + param; + first = false; + } else { + paramPart += "&" + param; + } + } + return base + paramPart; + } +} Added: trunk/src/main/java/org/ourproject/kune/platf/client/utils/UrlParam.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/utils/UrlParam.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/client/utils/UrlParam.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,29 @@ +package org.ourproject.kune.platf.client.utils; + +public class UrlParam { + private final String value; + private final String name; + + public UrlParam(String name, boolean value) { + this.name = name; + this.value = value ? "true" : "false"; + } + + public UrlParam(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public String getValue() { + return value; + } + + @Override + public String toString() { + return name + "=" + value; + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/KunePersistenceService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/KunePersistenceService.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/KunePersistenceService.java 2008-10-21 19:26:47 UTC (rev 917) @@ -34,12 +34,12 @@ PersistenceService persistenceService; public void start() { - try { - persistenceService.start(); - databaseInitializer.initConditional(); - } catch (Exception e) { - throw new RuntimeException(e); - } + try { + persistenceService.start(); + databaseInitializer.initConditional(); + } catch (Exception e) { + throw new RuntimeException(e); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/LoggerMethodInterceptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/LoggerMethodInterceptor.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/LoggerMethodInterceptor.java 2008-10-21 19:26:47 UTC (rev 917) @@ -18,107 +18,107 @@ * */ -package org.ourproject.kune.platf.server; - +package org.ourproject.kune.platf.server; + import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -public class LoggerMethodInterceptor implements MethodInterceptor { - - private static final Log log = LogFactory.getLog(LoggerMethodInterceptor.class); - private final boolean simplifyNames; - - public LoggerMethodInterceptor(final boolean simplifyNames) { - this.simplifyNames = simplifyNames; - } - - public LoggerMethodInterceptor() { - this(true); - } - - public Object invoke(final MethodInvocation invocation) throws Throwable { - logInvocation(invocation); - try { - Object result = invocation.proceed(); - logResult(invocation, result); - return result; - } catch (Throwable e) { - logException(invocation, e); - throw e; - } - } - - protected void log(final String output) { - log.debug(output); - } - - protected void logInvocation(final MethodInvocation invocation) { - StringBuffer buffer = createBuffer(invocation); - addMethodName(invocation, buffer); - addMethodParameters(invocation, buffer); - log(buffer.toString()); - } - - protected void logResult(final MethodInvocation invocation, final Object result) { - StringBuffer buffer = createBuffer(invocation); - addMethodName(invocation, buffer); - if (invocation.getMethod().getReturnType() != null) { - buffer.append(" => "); - buffer.append(getValue(result)); - } - log(buffer.toString()); - } - - protected void logException(final MethodInvocation invocation, final Throwable e) { - StringBuffer buffer = createBuffer(invocation); - addMethodName(invocation, buffer); - buffer.append(" EXCEPTION => "); - buffer.append(e.toString()); - log(buffer.toString()); - } - - private StringBuffer createBuffer(final MethodInvocation invocation) { - StringBuffer buffer = new StringBuffer(); - addTargetCllassName(invocation, buffer); - return buffer; - } - - private void addTargetCllassName(final MethodInvocation invocation, final StringBuffer buffer) { - buffer.append(getSimpleName(invocation.getThis().getClass())); - } - - private void addMethodParameters(final MethodInvocation invocation, final StringBuffer buffer) { - buffer.append("("); - Object[] arguments = invocation.getArguments(); - for (Object arg : arguments) { - buffer.append(getValue(arg)).append(", "); - } - buffer.append(")"); - } - - private void addMethodName(final MethodInvocation invocation, final StringBuffer buffer) { - buffer.append("."); - buffer.append(invocation.getMethod().getName()); - } - - private String getSimpleName(final Class<? extends Object> type) { - String simpleName = type.getSimpleName(); - if (simplifyNames == true) { - int index = simpleName.indexOf('$'); - if (index > 0) { - simpleName = simpleName.substring(0, index); - } - } - return simpleName; - } - - private String getValue(final Object result) { - if (result == null) { - return "null"; - } else { - return result.toString(); - } - } -} + +public class LoggerMethodInterceptor implements MethodInterceptor { + + private static final Log log = LogFactory.getLog(LoggerMethodInterceptor.class); + private final boolean simplifyNames; + + public LoggerMethodInterceptor() { + this(true); + } + + public LoggerMethodInterceptor(final boolean simplifyNames) { + this.simplifyNames = simplifyNames; + } + + public Object invoke(final MethodInvocation invocation) throws Throwable { + logInvocation(invocation); + try { + Object result = invocation.proceed(); + logResult(invocation, result); + return result; + } catch (Throwable e) { + logException(invocation, e); + throw e; + } + } + + protected void log(final String output) { + log.debug(output); + } + + protected void logException(final MethodInvocation invocation, final Throwable e) { + StringBuffer buffer = createBuffer(invocation); + addMethodName(invocation, buffer); + buffer.append(" EXCEPTION => "); + buffer.append(e.toString()); + log(buffer.toString()); + } + + protected void logInvocation(final MethodInvocation invocation) { + StringBuffer buffer = createBuffer(invocation); + addMethodName(invocation, buffer); + addMethodParameters(invocation, buffer); + log(buffer.toString()); + } + + protected void logResult(final MethodInvocation invocation, final Object result) { + StringBuffer buffer = createBuffer(invocation); + addMethodName(invocation, buffer); + if (invocation.getMethod().getReturnType() != null) { + buffer.append(" => "); + buffer.append(getValue(result)); + } + log(buffer.toString()); + } + + private void addMethodName(final MethodInvocation invocation, final StringBuffer buffer) { + buffer.append("."); + buffer.append(invocation.getMethod().getName()); + } + + private void addMethodParameters(final MethodInvocation invocation, final StringBuffer buffer) { + buffer.append("("); + Object[] arguments = invocation.getArguments(); + for (Object arg : arguments) { + buffer.append(getValue(arg)).append(", "); + } + buffer.append(")"); + } + + private void addTargetClassName(final MethodInvocation invocation, final StringBuffer buffer) { + buffer.append(getSimpleName(invocation.getThis().getClass())); + } + + private StringBuffer createBuffer(final MethodInvocation invocation) { + StringBuffer buffer = new StringBuffer(); + addTargetClassName(invocation, buffer); + return buffer; + } + + private String getSimpleName(final Class<? extends Object> type) { + String simpleName = type.getSimpleName(); + if (simplifyNames == true) { + int index = simpleName.indexOf('$'); + if (index > 0) { + simpleName = simpleName.substring(0, index); + } + } + return simpleName; + } + + private String getValue(final Object result) { + if (result == null) { + return "null"; + } else { + return result.toString(); + } + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java 2008-10-21 19:26:47 UTC (rev 917) @@ -38,41 +38,41 @@ * ignored. */ public static MethodInterceptor outermostCall(final MethodInterceptor interceptor) { - return new OutermostCallInterceptor(interceptor); + return new OutermostCallInterceptor(interceptor); } private final MethodInterceptor interceptor; @SuppressWarnings("unchecked") private final ThreadLocal count = new ThreadLocal() { - @Override - protected Integer initialValue() { - return 0; - } + @Override + protected Integer initialValue() { + return 0; + } }; private OutermostCallInterceptor(final MethodInterceptor interceptor) { - this.interceptor = interceptor; + this.interceptor = interceptor; } @SuppressWarnings("unchecked") public Object invoke(final MethodInvocation invocation) throws Throwable { - final int savedCount = (Integer) count.get(); - count.set(savedCount + 1); - try { - if ((Integer) count.get() > 1) { - return invocation.proceed(); - } else { - return interceptor.invoke(invocation); - } - } finally { - count.set(savedCount); - } + final int savedCount = (Integer) count.get(); + count.set(savedCount + 1); + try { + if ((Integer) count.get() > 1) { + return invocation.proceed(); + } else { + return interceptor.invoke(invocation); + } + } finally { + count.set(savedCount); + } } /** Ensure underlying interceptor is injected. */ @Inject void injectInterceptor(final Injector injector) { - injector.injectMembers(interceptor); + injector.injectMembers(interceptor); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java 2008-10-21 19:26:47 UTC (rev 917) @@ -63,9 +63,11 @@ import org.ourproject.kune.platf.server.manager.TagManager; import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; import org.ourproject.kune.platf.server.manager.UserManager; -import org.ourproject.kune.platf.server.manager.impl.FileDownloadManager; -import org.ourproject.kune.platf.server.manager.impl.FileManagerDefault; -import org.ourproject.kune.platf.server.manager.impl.FileUploadManager; +import org.ourproject.kune.platf.server.manager.file.EntityLogoDownloadManager; +import org.ourproject.kune.platf.server.manager.file.EntityLogoUploadManager; +import org.ourproject.kune.platf.server.manager.file.FileDownloadManager; +import org.ourproject.kune.platf.server.manager.file.FileManagerDefault; +import org.ourproject.kune.platf.server.manager.file.FileUploadManager; import org.ourproject.kune.platf.server.manager.impl.GroupManagerDefault; import org.ourproject.kune.platf.server.manager.impl.I18nCountryManagerDefault; import org.ourproject.kune.platf.server.manager.impl.I18nLanguageManagerDefault; @@ -100,59 +102,61 @@ public class PlatformServerModule extends AbstractExtendedModule { @Override protected void configure() { - install(PersistenceService.usingJpa().across(UnitOfWork.TRANSACTION).buildModule()); - bind(KunePersistenceService.class); + install(PersistenceService.usingJpa().across(UnitOfWork.TRANSACTION).buildModule()); + bind(KunePersistenceService.class); - bindManagers(); - bindRPC(); - bindServices(); - bind(KuneProperties.class).to(KunePropertiesDefault.class); - bind(Mapper.class).to(DozerMapper.class); - bind(ServerToolRegistry.class); - bind(FileUploadManager.class); - bind(FileDownloadManager.class); + bindManagers(); + bindRPC(); + bindServices(); + bind(KuneProperties.class).to(KunePropertiesDefault.class); + bind(Mapper.class).to(DozerMapper.class); + bind(ServerToolRegistry.class); + bind(FileUploadManager.class); + bind(FileDownloadManager.class); + bind(EntityLogoUploadManager.class); + bind(EntityLogoDownloadManager.class); - bindInterceptor(Matchers.any(), Matchers.annotatedWith(Authenticated.class), - outermostCall(new AuthenticatedMethodInterceptor())); - bindInterceptor(Matchers.any(), Matchers.annotatedWith(Authorizated.class), - outermostCall(new AuthorizatedMethodInterceptor())); + bindInterceptor(Matchers.any(), Matchers.annotatedWith(Authenticated.class), + outermostCall(new AuthenticatedMethodInterceptor())); + bindInterceptor(Matchers.any(), Matchers.annotatedWith(Authorizated.class), + outermostCall(new AuthorizatedMethodInterceptor())); } private void bindManagers() { - bind(UserManager.class).to(UserManagerDefault.class); - bind(GroupManager.class).to(GroupManagerDefault.class); - bind(ContentManager.class).to(ContentManagerDefault.class); - bind(ToolConfigurationManager.class).to(ToolConfigurationManagerDefault.class); - bind(ContainerManager.class).to(ContainerManagerDefault.class); - bind(LicenseManager.class).to(LicenseManagerDefault.class); - bind(SocialNetworkManager.class).to(SocialNetworkManagerDefault.class); - bind(XmppManager.class).to(XmppManagerDefault.class); - bind(RateManager.class).to(RateManagerDefault.class); - bind(I18nCountryManager.class).to(I18nCountryManagerDefault.class); - bind(I18nLanguageManager.class).to(I18nLanguageManagerDefault.class); - bind(I18nTranslationManager.class).to(I18nTranslationManagerDefault.class); - bind(TagManager.class).to(TagManagerDefault.class); - bind(CommentManager.class).to(CommentManagerDefault.class); - bind(FileManager.class).to(FileManagerDefault.class); + bind(UserManager.class).to(UserManagerDefault.class); + bind(GroupManager.class).to(GroupManagerDefault.class); + bind(ContentManager.class).to(ContentManagerDefault.class); + bind(ToolConfigurationManager.class).to(ToolConfigurationManagerDefault.class); + bind(ContainerManager.class).to(ContainerManagerDefault.class); + bind(LicenseManager.class).to(LicenseManagerDefault.class); + bind(SocialNetworkManager.class).to(SocialNetworkManagerDefault.class); + bind(XmppManager.class).to(XmppManagerDefault.class); + bind(RateManager.class).to(RateManagerDefault.class); + bind(I18nCountryManager.class).to(I18nCountryManagerDefault.class); + bind(I18nLanguageManager.class).to(I18nLanguageManagerDefault.class); + bind(I18nTranslationManager.class).to(I18nTranslationManagerDefault.class); + bind(TagManager.class).to(TagManagerDefault.class); + bind(CommentManager.class).to(CommentManagerDefault.class); + bind(FileManager.class).to(FileManagerDefault.class); } private void bindRPC() { - bind(SiteService.class).to(SiteRPC.class); - bind(GroupService.class).to(GroupRPC.class); - bind(ContentService.class).to(ContentRPC.class); - bind(UserService.class).to(UserRPC.class); - bind(SocialNetworkService.class).to(SocialNetworkRPC.class); - bind(I18nService.class).to(I18nRPC.class); + bind(SiteService.class).to(SiteRPC.class); + bind(GroupService.class).to(GroupRPC.class); + bind(ContentService.class).to(ContentRPC.class); + bind(UserService.class).to(UserRPC.class); + bind(SocialNetworkService.class).to(SocialNetworkRPC.class); + bind(I18nService.class).to(I18nRPC.class); } private void bindServices() { - bind(UserInfoService.class).to(UserInfoServiceDefault.class); - bind(CreationService.class).to(CreationServiceDefault.class); - bind(AccessRightsService.class).to(AccessRightsServiceDefault.class); - bind(AccessService.class).to(AccessServiceDefault.class); - bind(FinderService.class).to(FinderServiceDefault.class); - bind(StateService.class).to(StateServiceDefault.class); - bind(I18nTranslationService.class).to(I18nTranslationServiceDefault.class); - bind(SessionService.class).to(SessionServiceDefault.class); + bind(UserInfoService.class).to(UserInfoServiceDefault.class); + bind(CreationService.class).to(CreationServiceDefault.class); + bind(AccessRightsService.class).to(AccessRightsServiceDefault.class); + bind(AccessService.class).to(AccessServiceDefault.class); + bind(FinderService.class).to(FinderServiceDefault.class); + bind(StateService.class).to(StateServiceDefault.class); + bind(I18nTranslationService.class).to(I18nTranslationServiceDefault.class); + bind(SessionService.class).to(SessionServiceDefault.class); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/Access.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/Access.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/Access.java 2008-10-21 19:26:47 UTC (rev 917) @@ -36,111 +36,111 @@ private AccessRights groupRights; public Access(final Content descriptor, final Container container) { - setContent(descriptor); - setContainer(container); + setContent(descriptor); + setContainer(container); } public Container getContainer() { - return container; + return container; } public AccessLists getContainerAccessLists() { - return containerAccessLists; + return containerAccessLists; } public AccessRights getContainerRights() { - return containerRights; + return containerRights; } public Content getContent() { - return content; + return content; } public AccessLists getContentAccessLists() { - return contentAccessLists; + return contentAccessLists; } public AccessRights getContentRights() { - return contentRights; + return contentRights; } public AccessLists getGroupAccessLists() { - return groupAccessLists; + return groupAccessLists; } public AccessRights getGroupRights() { - return groupRights; + return groupRights; } public boolean hasContainerRights() { - return containerRights != null; + return containerRights != null; } public boolean hasContentRights() { - return contentRights != null; + return contentRights != null; } public boolean hasGroupRights() { - return groupRights != null; + return groupRights != null; } public void setContainer(final Container container) { - this.container = container; - containerAccessLists = container != null ? getContainerAccessLists(container) : null; - groupAccessLists = containerAccessLists; + this.container = container; + containerAccessLists = container != null ? getContainerAccessLists(container) : null; + groupAccessLists = containerAccessLists; } public void setContainerRights(final AccessRights accessRights) { - this.containerRights = accessRights; - if (equalsAccessLists()) { - this.contentRights = accessRights; - } + this.containerRights = accessRights; + if (equalsAccessLists()) { + this.contentRights = accessRights; + } } public void setContent(final Content descriptor) { - this.content = descriptor; - contentAccessLists = descriptor != null ? getContentAccessList(descriptor) : null; + this.content = descriptor; + contentAccessLists = descriptor != null ? getContentAccessList(descriptor) : null; } public void setContentRights(final AccessRights accessRights) { - this.contentRights = accessRights; - if (equalsAccessLists()) { - this.containerRights = accessRights; - } + this.contentRights = accessRights; + if (equalsAccessLists()) { + this.containerRights = accessRights; + } } public void setContentWidthFolderRights(final Content content) { - setContent(content); - this.contentRights = containerRights; + setContent(content); + this.contentRights = containerRights; } public void setGroupRights(final AccessRights accessRights) { - this.groupRights = accessRights; + this.groupRights = accessRights; } private boolean equalsAccessLists() { - if (contentAccessLists == containerAccessLists) { - return true; - } else if (contentAccessLists != null) { - return contentAccessLists.equals(containerAccessLists); - } else { - return containerAccessLists.equals(contentAccessLists); - } + if (contentAccessLists == containerAccessLists) { + return true; + } else if (contentAccessLists != null) { + return contentAccessLists.equals(containerAccessLists); + } else { + return containerAccessLists.equals(contentAccessLists); + } } private AccessLists getContentAccessList(final Content descriptor) { - AccessLists accessLists; - if (descriptor.hasAccessList()) { - accessLists = descriptor.getAccessLists(); - } else { - final SocialNetwork socialNetwork = descriptor.getContainer().getOwner().getSocialNetwork(); - accessLists = socialNetwork.getAccessLists(); - } - return accessLists; + AccessLists accessLists; + if (descriptor.hasAccessList()) { + accessLists = descriptor.getAccessLists(); + } else { + final SocialNetwork socialNetwork = descriptor.getContainer().getOwner().getSocialNetwork(); + accessLists = socialNetwork.getAccessLists(); + } + return accessLists; } private AccessLists getContainerAccessLists(final Container container) { - return container.getOwner().getSocialNetwork().getAccessLists(); + return container.getOwner().getSocialNetwork().getAccessLists(); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java 2008-10-21 19:26:47 UTC (rev 917) @@ -26,40 +26,40 @@ boolean isVisible; public AccessRights() { - this(false, false, false); + this(false, false, false); } public AccessRights(final boolean isAdministrable, final boolean isEditable, final boolean isVisible) { - this.isAdministrable = isAdministrable; - this.isEditable = isEditable; - this.isVisible = isVisible; + this.isAdministrable = isAdministrable; + this.isEditable = isEditable; + this.isVisible = isVisible; } public boolean isAdministrable() { - return isAdministrable; + return isAdministrable; } public boolean isEditable() { - return isEditable; + return isEditable; } public boolean isVisible() { - return isVisible; + return isVisible; } public void setAdministrable(final boolean isAdministrable) { - this.isAdministrable = isAdministrable; + this.isAdministrable = isAdministrable; } public void setEditable(final boolean isEditable) { - this.isEditable = isEditable; + this.isEditable = isEditable; } public void setVisible(final boolean isVisible) { - this.isVisible = isVisible; + this.isVisible = isVisible; } public String toString() { - return "AccessRights[a: " + isAdministrable + ", e: " + isEditable + ", v: " + isVisible + "]"; + return "AccessRights[a: " + isAdministrable + ", e: " + isEditable + ", v: " + isVisible + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java 2008-10-21 19:26:47 UTC (rev 917) @@ -25,6 +25,6 @@ public interface AccessRightsService { - public AccessRights get(User user, AccessLists lists); + AccessRights get(User user, AccessLists lists); } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -36,48 +36,48 @@ // TODO: check performance public AccessRights get(final Group userGroup, final AccessLists accessList) { - boolean isAdministrable = false; - boolean isEditable = false; - boolean isVisible = false; + boolean isAdministrable = false; + boolean isEditable = false; + boolean isVisible = false; - // FIXME, future: admin users can admin, edit, view everything - // (not now while we are doing tests) - isVisible = isEditable = isAdministrable = canAccess(userGroup, accessList, AccessRol.Administrator); - if (!isEditable) { - isVisible = isEditable = canAccess(userGroup, accessList, AccessRol.Editor); - } - if (!isVisible) { - isVisible = accessList.getViewers().isEmpty() || canAccess(userGroup, accessList, AccessRol.Viewer); - } + // FIXME, future: admin users can admin, edit, view everything + // (not now while we are doing tests) + isVisible = isEditable = isAdministrable = canAccess(userGroup, accessList, AccessRol.Administrator); + if (!isEditable) { + isVisible = isEditable = canAccess(userGroup, accessList, AccessRol.Editor); + } + if (!isVisible) { + isVisible = accessList.getViewers().isEmpty() || canAccess(userGroup, accessList, AccessRol.Viewer); + } - return new AccessRights(isAdministrable, isEditable, isVisible); + return new AccessRights(isAdministrable, isEditable, isVisible); } public AccessRights get(final User user, final AccessLists lists) { - return get(user.getUserGroup(), lists); + return get(user.getUserGroup(), lists); } private boolean canAccess(final Group searchedGroup, final AccessLists lists, final AccessRol rol) { - final GroupList list = lists.getList(rol); - return depthFirstSearch(new HashSet<Group>(), searchedGroup, list, rol); + final GroupList list = lists.getList(rol); + return depthFirstSearch(new HashSet<Group>(), searchedGroup, list, rol); } /* * http://en.wikipedia.org/wiki/Depth-first_search */ private boolean depthFirstSearch(final HashSet<Group> visited, final Group searchedGroup, final GroupList list, - final AccessRol rol) { - if (list.includes(searchedGroup)) { - return true; - } - final ArrayList<Group> noVisitedYet = list.duplicate(); - noVisitedYet.removeAll(visited); - for (final Group group : noVisitedYet) { - visited.add(group); - final SocialNetwork socialNetwork = group.getSocialNetwork(); - final GroupList groupList = socialNetwork.getAccessLists().getList(rol); - return depthFirstSearch(visited, searchedGroup, groupList, rol); - } - return false; + final AccessRol rol) { + if (list.includes(searchedGroup)) { + return true; + } + final ArrayList<Group> noVisitedYet = list.duplicate(); + noVisitedYet.removeAll(visited); + for (final Group group : noVisitedYet) { + visited.add(group); + final SocialNetwork socialNetwork = group.getSocialNetwork(); + final GroupList groupList = socialNetwork.getAccessLists().getList(rol); + return depthFirstSearch(visited, searchedGroup, groupList, rol); + } + return false; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.java 2008-10-21 19:26:47 UTC (rev 917) @@ -18,6 +18,7 @@ * */ package org.ourproject.kune.platf.server.access; + public enum AccessRol { Administrator, Editor, Viewer } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -92,17 +92,17 @@ final Long contentId = checkAndParse(token.getDocument()); final Long folderId = checkAndParse(token.getFolder()); + String group = token.getGroup(); if (token.hasAll()) { - return findByContentReference(token.getGroup(), token.getTool(), folderId, contentId); + return findByContentReference(group, token.getTool(), folderId, contentId); } else if (token.hasGroupToolAndFolder()) { - return findByFolderReference(token.getGroup(), token.getTool(), folderId); + return findByFolderReference(group, token.getTool(), folderId); } else if (token.hasGroupAndTool()) { - return findByRootOnGroup(token.getGroup(), token.getTool()); + return findByRootOnGroup(group, token.getTool()); } else if (token.hasGroup()) { - Content defaultOfGroup = findDefaultOfGroup(token.getGroup()); - return defaultOfGroup == null ? Content.NO_CONTENT : defaultOfGroup; + return findDefaultContentOfGroup(group); } else if (token.hasNothing()) { - return findDefaultOfGroup(defaultGroup); + return findDefaultContentOfGroup(defaultGroup); } else { throw new ContentNotFoundException(); } @@ -164,14 +164,14 @@ } } - private Content findDefaultOfGroup(final Group group) { + private Content findDefaultContentOfGroup(final Group group) { final Content defaultContent = group.getDefaultContent(); - return defaultContent; + return defaultContent == null ? Content.NO_CONTENT : defaultContent; } - private Content findDefaultOfGroup(final String groupName) throws GroupNotFoundException { + private Content findDefaultContentOfGroup(final String groupName) throws GroupNotFoundException { final Group group = groupManager.findByShortName(groupName); - return findDefaultOfGroup(group); + return findDefaultContentOfGroup(group); } private Content generateFolderFakeContent(final Container container) { 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptor.java 2008-10-21 19:26:47 UTC (rev 917) @@ -46,40 +46,40 @@ Provider<SessionService> sessionServiceProvider; public Object invoke(final MethodInvocation invocation) throws Throwable { - final Object[] arguments = invocation.getArguments(); - // Some browsers getCookie returns "null" as String instead of null - final String userHash = arguments[0] == null || arguments[0].equals("null") ? null : (String) arguments[0]; + final Object[] arguments = invocation.getArguments(); + // Some browsers getCookie returns "null" as String instead of null + final String userHash = arguments[0] == null || arguments[0].equals("null") ? null : (String) arguments[0]; - log.info("Method: " + invocation.getMethod().getName()); - log.info("Userhash received: " + userHash); - log.info("--------------------------------------------------------------------------------"); - final UserSession userSession = userSessionProvider.get(); - final SessionService sessionService = sessionServiceProvider.get(); + log.info("Method: " + invocation.getMethod().getName()); + log.info("Userhash received: " + userHash); + log.info("--------------------------------------------------------------------------------"); + final UserSession userSession = userSessionProvider.get(); + final SessionService sessionService = sessionServiceProvider.get(); - final Authenticated authAnnotation = invocation.getStaticPart().getAnnotation(Authenticated.class); - final boolean mandatory = authAnnotation.mandatory(); + final Authenticated authAnnotation = invocation.getStaticPart().getAnnotation(Authenticated.class); + final boolean mandatory = authAnnotation.mandatory(); - if (userHash == null && mandatory) { - sessionService.getNewSession(); - throw new UserMustBeLoggedException(); - } else if (userSession.isUserNotLoggedIn() && mandatory) { - sessionService.getNewSession(); - log.info("Session expired (not logged in server and mandatory)"); - throw new SessionExpiredException(); - } else if (userSession.isUserNotLoggedIn() && userHash == null) { - // Ok, do nothing - } else if (userSession.isUserNotLoggedIn() && userHash != null) { - sessionService.getNewSession(); - log.info("Session expired (not logged in server)"); - throw new SessionExpiredException(); - } else if (!userSession.getHash().equals(userHash)) { - userSession.logout(); - sessionService.getNewSession(); - log.info("Session expired (userHash different in server)"); - throw new SessionExpiredException(); - } - final Object result = invocation.proceed(); - return result; + if (userHash == null && mandatory) { + sessionService.getNewSession(); + throw new UserMustBeLoggedException(); + } else if (userSession.isUserNotLoggedIn() && mandatory) { + sessionService.getNewSession(); + log.info("Session expired (not logged in server and mandatory)"); + throw new SessionExpiredException(); + } else if (userSession.isUserNotLoggedIn() && userHash == null) { + // Ok, do nothing + } else if (userSession.isUserNotLoggedIn() && userHash != null) { + sessionService.getNewSession(); + log.info("Session expired (not logged in server)"); + throw new SessionExpiredException(); + } else if (!userSession.getHash().equals(userHash)) { + userSession.logout(); + sessionService.getNewSession(); + log.info("Session expired (userHash different in server)"); + throw new SessionExpiredException(); + } + final Object result = invocation.proceed(); + return result; } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java 2008-10-21 19:26:47 UTC (rev 917) @@ -54,71 +54,72 @@ private Provider<AccessService> accessServiceProvider; public Object invoke(final MethodInvocation invocation) throws Throwable { - final Object[] arguments = invocation.getArguments(); - final StateToken token = (StateToken) arguments[1]; + final Object[] arguments = invocation.getArguments(); + final StateToken token = (StateToken) arguments[1]; - final UserSession userSession = userSessionProvider.get(); - final GroupManager groupManager = groupManagerProvider.get(); - final AccessService accessService = accessServiceProvider.get(); + final UserSession userSession = userSessionProvider.get(); + final GroupManager groupManager = groupManagerProvider.get(); + final AccessService accessService = accessServiceProvider.get(); - final Authorizated authoAnnotation = invocation.getStaticPart().getAnnotation(Authorizated.class); - final AccessRol accessRol = authoAnnotation.accessRolRequired(); - final ActionLevel actionLevel = authoAnnotation.actionLevel(); + final Authorizated authoAnnotation = invocation.getStaticPart().getAnnotation(Authorizated.class); + final AccessRol accessRol = authoAnnotation.accessRolRequired(); + final ActionLevel actionLevel = authoAnnotation.actionLevel(); - final User user = userSession.getUser(); - Group group = Group.NO_GROUP; - try { - group = groupManager.findByShortName(token.getGroup()); - } catch (final NoResultException e) { - // continue, and check later - } + final User user = userSession.getUser(); + Group group = Group.NO_GROUP; + try { + group = groupManager.findByShortName(token.getGroup()); + } catch (final NoResultException e) { + // continue, and check later + } - switch (actionLevel) { - case content: - default: - final Content content = accessService.accessToContent(ContentUtils.parseId(token.getDocument()), user, - accessRol); - if (!content.getContainer().getOwner().equals(group)) { - throw new AccessViolationException(); - } - if (!content.getContainer().getId().equals(ContentUtils.parseId(token.getFolder()))) { - throw new AccessViolationException(); - } - if (!content.getContainer().getToolName().equals(token.getTool())) { - throw new AccessViolationException(); - } - case container: - final Container container = accessService.accessToContainer(ContentUtils.parseId(token.getFolder()), user, - accessRol); - if (!container.getOwner().equals(group)) { - throw new AccessViolationException(); - } - case tool: - case group: - break; - } + switch (actionLevel) { + case content: + default: + final Content content = accessService.accessToContent(ContentUtils.parseId(token.getDocument()), user, + accessRol); + if (!content.getContainer().getOwner().equals(group)) { + throw new AccessViolationException(); + } + if (!content.getContainer().getId().equals(ContentUtils.parseId(token.getFolder()))) { + throw new AccessViolationException(); + } + if (!content.getContainer().getToolName().equals(token.getTool())) { + throw new AccessViolationException(); + } + case container: + final Container container = accessService.accessToContainer(ContentUtils.parseId(token.getFolder()), user, + accessRol); + if (!container.getOwner().equals(group)) { + throw new AccessViolationException(); + } + case tool: + case group: + break; + } - if (!correctMember(user, group, accessRol)) { - throw new AccessViolationException(); - } + if (!correctMember(user, group, accessRol)) { + throw new AccessViolationException(); + } - return invocation.proceed(); + return invocation.proceed(); } private boolean correctMember(final User user, final Group group, final AccessRol memberType) - throws AccessViolationException { + throws AccessViolationException { - final AccessRights accessRights = accessRightsServiceProvider.get().get(user, - group.getSocialNetwork().getAccessLists()); + final AccessRights accessRights = accessRightsServiceProvider.get().get( + user, + group.getSocialNetwork().getAccessLists()); - switch (memberType) { - case Administrator: - return accessRights.isAdministrable(); - case Editor: - return accessRights.isEditable(); - default: - return accessRights.isVisible(); - } + switch (memberType) { + case Administrator: + return accessRights.isAdministrable(); + case Editor: + return accessRights.isEditable(); + default: + return accessRights.isVisible(); + } } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -46,60 +46,60 @@ @Inject public ContainerManagerDefault(final Provider<EntityManager> provider) { - super(provider, Container.class); + super(provider, Container.class); } public Container createFolder(final Group group, final Container parent, final String name, - final I18nLanguage language) { - final List<Container> parentAbsolutePath = parent.getAbsolutePath(); - final List<Container> childAbsolutePath = new ArrayList<Container>(); + final I18nLanguage language) { + final List<Container> parentAbsolutePath = parent.getAbsolutePath(); + final List<Container> childAbsolutePath = new ArrayList<Container>(); - for (final Iterator<Container> iterator = parentAbsolutePath.iterator(); iterator.hasNext();) { - final Container parentRef = iterator.next(); - childAbsolutePath.add(parentRef); - } - final Container child = new Container(name, group, parent.getToolName()); - childAbsolutePath.add(child); - child.setLanguage(language); - child.setAbsolutePath(childAbsolutePath); - parent.addChild(child); - // child.setParent(parent); - persist(child); - return child; + for (final Iterator<Container> iterator = parentAbsolutePath.iterator(); iterator.hasNext();) { + final Container parentRef = iterator.next(); + childAbsolutePath.add(parentRef); + } + final Container child = new Container(name, group, parent.getToolName()); + childAbsolutePath.add(child); + child.setLanguage(language); + child.setAbsolutePath(childAbsolutePath); + parent.addChild(child); + // child.setParent(parent); + persist(child); + return child; } public Container createRootFolder(final Group group, final String toolName, final String name, final String type) { - final Container container = new Container(name, group, toolName); - container.setTypeId(type); - final List<Container> absolutePath = new ArrayList<Container>(); - absolutePath.add(container); - container.setAbsolutePath(absolutePath); - return persist(container); + final Container container = new Container(name, group, toolName); + container.setTypeId(type); + final List<Container> absolutePath = new ArrayList<Container>(); + absolutePath.add(container); + container.setAbsolutePath(absolutePath); + return persist(container); } public String renameFolder(final Group group, final Container container, final String newName) - throws DefaultException { - if (container.isRoot()) { - throw new RuntimeException("Root folder cannot be renamed"); - } - container.setName(newName); - persist(container); - return newName; + throws DefaultException { + if (container.isRoot()) { + throw new RuntimeException("Root folder cannot be renamed"); + } + container.setName(newName); + persist(container); + return newName; } public SearchResult<Container> search(final String search) { - return this.search(search, null, null); + return this.search(search, null, null); } public SearchResult<Container> search(final String search, final Integer firstResult, final Integer maxResults) { - final MultiFieldQueryParser parser = new MultiFieldQueryParser(new String[] { "name" }, new StandardAnalyzer()); - Query query; - try { - query = parser.parse(search); - } catch (final ParseException e) { - throw new RuntimeException("Error parsing search"); - } - return super.search(query, firstResult, maxResults); + final MultiFieldQueryParser parser = new MultiFieldQueryParser(new String[] { "name" }, new StandardAnalyzer()); + Query query; + try { + query = parser.parse(search); + } catch (final ParseException e) { + throw new RuntimeException("Error parsing search"); + } + return super.search(query, firstResult, maxResults); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -62,155 +62,155 @@ @Inject public ContentManagerDefault(final Provider<EntityManager> provider, final FinderService finder, - final User userFinder, final I18nLanguage languageFinder, final TagManager tagManager) { - super(provider, Content.class); - this.finder = finder; - this.userFinder = userFinder; - this.languageFinder = languageFinder; - this.tagManager = tagManager; + final User userFinder, final I18nLanguage languageFinder, final TagManager tagManager) { + super(provider, Content.class); + this.finder = finder; + this.userFinder = userFinder; + this.languageFinder = languageFinder; + this.tagManager = tagManager; } public void addAuthor(final User user, final Long contentId, final String authorShortName) throws DefaultException { - final Content content = finder.getContent(contentId); - final User author = userFinder.getByShortName(authorShortName); - if (author == null) { - throw new UserNotFoundException(); - } - content.addAuthor(author); + final Content content = finder.getContent(contentId); + final User author = userFinder.getByShortName(authorShortName); + if (author == null) { + throw new UserNotFoundException(); + } + content.addAuthor(author); } public Content createContent(final String title, final String body, final User author, final Container container) { - final Content descriptor = new Content(); - descriptor.addAuthor(author); - descriptor.setLanguage(author.getLanguage()); - // FIXME: remove this when UI take publishing into account - descriptor.setPublishedOn(new Date()); - container.addContent(descriptor); - descriptor.setContainer(container); - final Revision revision = new Revision(descriptor); - revision.setTitle(title); - revision.setBody(body); - descriptor.addRevision(revision); - return persist(descriptor); + final Content descriptor = new Content(); + descriptor.addAuthor(author); + descriptor.setLanguage(author.getLanguage()); + // FIXME: remove this when UI take publishing into account + descriptor.setPublishedOn(new Date()); + container.addContent(descriptor); + descriptor.setContainer(container); + final Revision revision = new Revision(descriptor); + revision.setTitle(title); + revision.setBody(body); + descriptor.addRevision(revision); + return persist(descriptor); } public void delContent(final User user, final Long contentId) throws DefaultException { - final Content content = finder.getContent(contentId); - content.setStatus(ContentStatus.inTheDustbin); - content.setDeletedOn(new Date()); + final Content content = finder.getContent(contentId); + content.setStatus(ContentStatus.inTheDustbin); + content.setDeletedOn(new Date()); } public Double getRateAvg(final Content content) { - return finder.getRateAvg(content); + return finder.getRateAvg(content); } public Long getRateByUsers(final Content content) { - return finder.getRateByUsers(content); + return finder.getRateByUsers(content); } public Double getRateContent(final User rater, final Content content) { - final Rate rate = finder.getRate(rater, content); - if (rate != null) { - return rate.getValue(); - } else { - return null; - } + final Rate rate = finder.getRate(rater, content); + if (rate != null) { + return rate.getValue(); + } else { + return null; + } } public void rateContent(final User rater, final Long contentId, final Double value) throws DefaultException { - final Content content = finder.getContent(contentId); - final Rate oldRate = finder.getRate(rater, content); - if (oldRate == null) { - final Rate rate = new Rate(rater, content, value); - super.persist(rate, Rate.class); - } else { - oldRate.setValue(value); - super.persist(oldRate, Rate.class); - } + final Content content = finder.getContent(contentId); + final Rate oldRate = finder.getRate(rater, content); + if (oldRate == null) { + final Rate rate = new Rate(rater, content, value); + super.persist(rate, Rate.class); + } else { + oldRate.setValue(value); + super.persist(oldRate, Rate.class); + } } public void removeAuthor(final User user, final Long contentId, final String authorShortName) - throws DefaultException { - final Content content = finder.getContent(contentId); - final User author = userFinder.getByShortName(authorShortName); - if (author == null) { - throw new UserNotFoundException(); - } - content.removeAuthor(author); + throws DefaultException { + final Content content = finder.getContent(contentId); + final User author = userFinder.getByShortName(authorShortName); + if (author == null) { + throw new UserNotFoundException(); + } + content.removeAuthor(author); } public String renameContent(final User user, final Long contentId, final String newTitle) throws DefaultException { - final Content content = finder.getContent(contentId); - content.getLastRevision().setTitle(newTitle); - return newTitle; + final Content content = finder.getContent(contentId); + content.getLastRevision().setTitle(newTitle); + return newTitle; } public Content save(final User editor, final Content descriptor, final String content) { - final Revision revision = new Revision(descriptor); - revision.setEditor(editor); - revision.setTitle(descriptor.getTitle()); - revision.setBody(content); - descriptor.addRevision(revision); - return persist(descriptor); + final Revision revision = new Revision(descriptor); + revision.setEditor(editor); + revision.setTitle(descriptor.getTitle()); + revision.setBody(content); + descriptor.addRevision(revision); + return persist(descriptor); } public SearchResult<Content> search(final String search) { - return this.search(search, null, null); + return this.search(search, null, null); } public SearchResult<Content> search(final String search, final Integer firstResult, final Integer maxResults) { - final MultiFieldQueryParser parser = new MultiFieldQueryParser(new String[] { "authors.name", - "authors.shortName", "container.name", "language.code", "language.englishName", "language.nativeName", - "lastRevision.body", "lastRevision.title", "tags.name" }, new StandardAnalyzer()); - Query query; - try { - query = parser.parse(search); - } catch (final ParseException e) { - throw new RuntimeException("Error parsing search"); - } - return super.search(query, firstResult, maxResults); + final MultiFieldQueryParser parser = new MultiFieldQueryParser(new String[] { "authors.name", + "authors.shortName", "container.name", "language.code", "language.englishName", "language.nativeName", + "lastRevision.body", "lastRevision.title", "tags.name" }, new StandardAnalyzer()); + Query query; + try { + query = parser.parse(search); + } catch (final ParseException e) { + throw new RuntimeException("Error parsing search"); + } + return super.search(query, firstResult, maxResults); } public I18nLanguage setLanguage(final User user, final Long contentId, final String languageCode) - throws DefaultException { - final Content content = finder.getContent(contentId); - final I18nLanguage language = languageFinder.findByCode(languageCode); - if (language == null) { - throw new I18nNotFoundException(); - } - content.setLanguage(language); - return language; + throws DefaultException { + final Content content = finder.getContent(contentId); + final I18nLanguage language = languageFinder.findByCode(languageCode); + if (language == null) { + throw new I18nNotFoundException(); + } + content.setLanguage(language); + return language; } public void setPublishedOn(final User user, final Long contentId, final Date publishedOn) throws DefaultException { - final Content content = finder.getContent(contentId); - content.setPublishedOn(publishedOn); + final Content content = finder.getContent(contentId); + content.setPublishedOn(publishedOn); } public void setStatus(final Long contentId, final ContentStatus status) { - final Content content = finder.getContent(contentId); - content.setStatus(status); + final Content content = finder.getContent(contentId); + content.setStatus(status); } public void setTags(final User user, final Long contentId, final String tags) throws DefaultException { - final Content content = finder.getContent(contentId); - final ArrayList<String> tagsStripped = KuneStringUtils.splitTags(tags); - final ArrayList<Tag> tagList = new ArrayList<Tag>(); - for (final Iterator<String> i = tagsStripped.iterator(); i.hasNext();) { - final String tagString = i.next(); - Tag tag; - try { - tag = tagManager.findByTagName(tagString); - } catch (final NoResultException e) { - tag = new Tag(tagString); - tagManager.persist(tag); - } - if (!tagList.contains(tag)) { - tagList.add(tag); - } - } - content.setTags(tagList); + final Content content = finder.getContent(contentId); + final ArrayList<String> tagsStripped = KuneStringUtils.splitTags(tags); + final ArrayList<Tag> tagList = new ArrayList<Tag>(); + for (final Iterator<String> i = tagsStripped.iterator(); i.hasNext();) { + final String tagString = i.next(); + Tag tag; + try { + tag = tagManager.findByTagName(tagString); + } catch (final NoResultException e) { + tag = new Tag(tagString); + tagManager.persist(tag); + } + if (!tagList.contains(tag)) { + tagList.add(tag); + } + } + content.setTags(tagList); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentUtils.java 2008-10-21 19:26:47 UTC (rev 917) @@ -5,10 +5,10 @@ public class ContentUtils { public static Long parseId(final String id) throws ContentNotFoundException { - try { - return new Long(id); - } catch (final NumberFormatException e) { - throw new ContentNotFoundException(); - } + try { + return new Long(id); + } catch (final NumberFormatException e) { + throw new ContentNotFoundException(); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationServiceDefault.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationServiceDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -38,30 +38,30 @@ @Inject public CreationServiceDefault(final ContainerManager containerManager, final ContentManager contentManager, - final ServerToolRegistry toolRegistry) { - this.containerManager = containerManager; - this.contentManager = contentManager; - this.tools = toolRegistry; + final ServerToolRegistry toolRegistry) { + this.containerManager = containerManager; + this.contentManager = contentManager; + this.tools = toolRegistry; } public Content createContent(final String title, final String body, final User user, final Container container) { - final String toolName = container.getToolName(); - final Content content = contentManager.createContent(title, body, user, container); - tools.get(toolName).onCreateContent(content, container); - return content; + final String toolName = container.getToolName(); + final Content content = contentManager.createContent(title, body, user, container); + tools.get(toolName).onCreateContent(content, container); + return content; } public Container createFolder(final Group group, final Long parentFolderId, final String name, - final I18nLanguage language, final String typeId) { - final Container parent = containerManager.find(parentFolderId); - final String toolName = parent.getToolName(); - final Container child = containerManager.createFolder(group, parent, name, language); - tools.get(toolName).onCreateContainer(child, parent, typeId); - return child; + final I18nLanguage language, final String typeId) { + final Container parent = containerManager.find(parentFolderId); + final String toolName = parent.getToolName(); + final Container child = containerManager.createFolder(group, parent, name, language); + tools.get(toolName).onCreateContainer(child, parent, typeId); + return child; } public Content saveContent(final User editor, final Content descriptor, final String content) { - return contentManager.save(editor, descriptor, content); + return contentManager.save(editor, descriptor, content); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/AccessLists.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/AccessLists.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/AccessLists.java 2008-10-21 19:26:47 UTC (rev 917) @@ -44,67 +44,67 @@ private Long id; public AccessLists() { - this.admins = new GroupList(); - this.editors = new GroupList(); - this.viewers = new GroupList(); + this.admins = new GroupList(); + this.editors = new GroupList(); + this.viewers = new GroupList(); } public void addAdmin(final Group group) { - admins.add(group); + admins.add(group); } public void addEditor(final Group group) { - editors.add(group); + editors.add(group); } public void addViewer(final Group group) { - viewers.add(group); + viewers.add(group); } public GroupList getAdmins() { - return admins; + return admins; } public GroupList getEditors() { - return editors; + return editors; } public Long getId() { - return id; + return id; } public GroupList getList(final AccessRol rol) { - if (rol == AccessRol.Administrator) { - return getAdmins(); - } else if (rol == AccessRol.Editor) { - return getEditors(); - } else { - return getViewers(); - } + if (rol == AccessRol.Administrator) { + return getAdmins(); + } else if (rol == AccessRol.Editor) { + return getEditors(); + } else { + return getViewers(); + } } public GroupList getViewers() { - return viewers; + return viewers; } public void removeAdmin(final Group group) { - admins.remove(group); + admins.remove(group); } public void removeEditor(final Group group) { - editors.remove(group); + editors.remove(group); } public void removeViewer(final Group group) { - viewers.remove(group); + viewers.remove(group); } public void setId(final Long id) { - this.id = id; + this.id = id; } @Override public String toString() { - return "AccessList[admins :" + admins + "; editors: " + editors + "; viewers: " + viewers + "]"; + return "AccessList[admins :" + admins + "; editors: " + editors + "; viewers: " + viewers + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/BasicMimeType.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/BasicMimeType.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/BasicMimeType.java 2008-10-21 19:26:47 UTC (rev 917) @@ -9,42 +9,42 @@ private String subtype; public BasicMimeType() { - this(null, null); + this(null, null); } public BasicMimeType(final String mimetype) { - if (mimetype != null) { - final String[] split = mimetype.split("/", 2); - type = split[0]; - if (split.length > 1 && split[1].length() > 0) { - subtype = split[1]; - } - } + if (mimetype != null) { + final String[] split = mimetype.split("/", 2); + type = split[0]; + if (split.length > 1 && split[1].length() > 0) { + subtype = split[1]; + } + } } public BasicMimeType(final String type, final String subtype) { - this.type = type; - this.subtype = subtype; + this.type = type; + this.subtype = subtype; } public String getSubtype() { - return subtype; + return subtype; } public String getType() { - return type; + return type; } public void setSubtype(final String subtype) { - this.subtype = subtype; + this.subtype = subtype; } public void setType(final String type) { - this.type = type; + this.type = type; } public String toString() { - return subtype == null ? type : type + "/" + subtype; + return subtype == null ? type : type + "/" + subtype; } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/ChatUserParams.java 2008-10-21 19:26:47 UTC (rev 917) @@ -17,47 +17,47 @@ private String chatColor; public ChatUserParams() { - this(null, false, SubscriptionMode.autoAcceptAll, null); + this(null, false, SubscriptionMode.autoAcceptAll, null); }; public ChatUserParams(final String avatar, final boolean publishRoster, final SubscriptionMode subscriptionMode, - final String chatColor) { - this.avatar = avatar; - this.publishRoster = publishRoster; - this.subscriptionMode = subscriptionMode; - this.chatColor = chatColor; + final String chatColor) { + this.avatar = avatar; + this.publishRoster = publishRoster; + this.subscriptionMode = subscriptionMode; + this.chatColor = chatColor; } public String getAvatar() { - return avatar; + return avatar; } public String getChatColor() { - return chatColor; + return chatColor; } public SubscriptionMode getSubscriptionMode() { - return subscriptionMode; + return subscriptionMode; } public boolean isPublishRoster() { - return publishRoster; + return publishRoster; } public void setAvatar(final String avatar) { - this.avatar = avatar; + this.avatar = avatar; } public void setChatColor(final String chatColor) { - this.chatColor = chatColor; + this.chatColor = chatColor; } public void setPublishRoster(final boolean publishRoster) { - this.publishRoster = publishRoster; + this.publishRoster = publishRoster; } public void setSubscriptionMode(final SubscriptionMode subscriptionMode) { - this.subscriptionMode = subscriptionMode; + this.subscriptionMode = subscriptionMode; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/CustomProperties.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/CustomProperties.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/CustomProperties.java 2008-10-21 19:26:47 UTC (rev 917) @@ -25,36 +25,36 @@ private HashMap<Class<?>, Object> data; public CustomProperties() { - data = new HashMap<Class<?>, Object>(); + data = new HashMap<Class<?>, Object>(); } public HashMap<Class<?>, Object> getData() { - return data; + return data; } @SuppressWarnings("unchecked") public <T> T getData(final Class<T> type) { - return (T) data.get(type); + return (T) data.get(type); } public Long getId() { - return id; + return id; } public <T> boolean hasPropertie(final Class<T> type) { - return data.containsKey(type); + return data.containsKey(type); } @SuppressWarnings("unchecked") public <T> T setData(final Class<T> type, final T value) { - return (T) data.put(type, value); + return (T) data.put(type, value); } public void setData(final HashMap<Class<?>, Object> data) { - this.data = data; + this.data = data; } public void setId(final Long id) { - this.id = id; + this.id = id; } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java 2008-10-21 19:26:47 UTC (rev 917) @@ -26,14 +26,17 @@ import javax.persistence.CascadeType; import javax.persistence.Column; +import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.Lob; import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.Table; +import javax.persistence.Transient; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; @@ -62,7 +65,7 @@ @Enumerated(EnumType.STRING) @Column(nullable = false) - GroupType type; + GroupType groupType; @Id @DocumentId @@ -84,7 +87,7 @@ private Content defaultContent; @OneToOne - private Content groupLogo; + private Content groupFullLogo; @OneToOne(cascade = CascadeType.ALL) private SocialNetwork socialNetwork; @@ -97,6 +100,12 @@ private String workspaceTheme; + @Lob + private byte[] logo; + + @Embedded + private BasicMimeType logoMime; + public Group() { this(null, null, null, null); } @@ -111,7 +120,7 @@ this.toolsConfig = new HashMap<String, ToolConfiguration>(); this.socialNetwork = new SocialNetwork(); this.defaultLicense = defaultLicense; - this.type = type; + this.groupType = type; this.admissionType = AdmissionType.Moderated; } @@ -178,14 +187,30 @@ return defaultLicense; } - public Content getGroupLogo() { - return groupLogo; + public Content getGroupFullLogo() { + return groupFullLogo; } + public GroupType getGroupType() { + return groupType; + } + + public boolean getHasLogo() { + return hasLogo(); + } + public Long getId() { return id; } + public byte[] getLogo() { + return logo; + } + + public BasicMimeType getLogoMime() { + return logoMime; + } + public String getLongName() { return longName; } @@ -210,10 +235,6 @@ return toolsConfig; } - public GroupType getType() { - return type; - } - public String getWorkspaceTheme() { return workspaceTheme; } @@ -226,6 +247,11 @@ return result; } + @Transient + public boolean hasLogo() { + return (logo != null && logo.length > 0 && logoMime != null); + } + public void setAdmissionType(final AdmissionType admissionType) { this.admissionType = admissionType; } @@ -238,14 +264,26 @@ this.defaultLicense = defaultLicense; } - public void setGroupLogo(final Content groupLogo) { - this.groupLogo = groupLogo; + public void setGroupFullLogo(final Content groupFullLogo) { + this.groupFullLogo = groupFullLogo; } + public void setGroupType(final GroupType groupType) { + this.groupType = groupType; + } + public void setId(final Long id) { this.id = id; } + public void setLogo(byte[] logo) { + this.logo = logo; + } + + public void setLogoMime(BasicMimeType logoMime) { + this.logoMime = logoMime; + } + public void setLongName(final String longName) { this.longName = longName; } @@ -263,10 +301,6 @@ return config; } - public void setType(final GroupType type) { - this.type = type; - } - public void setWorkspaceTheme(final String workspaceTheme) { this.workspaceTheme = workspaceTheme; } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupList.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupList.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupList.java 2008-10-21 19:26:47 UTC (rev 917) @@ -51,72 +51,72 @@ private GroupListMode mode; public GroupList() { - this(new ArrayList<Group>()); - this.mode = GroupListMode.NORMAL; + this(new ArrayList<Group>()); + this.mode = GroupListMode.NORMAL; } public GroupList(final List<Group> list) { - this.list = list; + this.list = list; } public void add(final Group group) { - // No group duplicate - // TODO: Get this outside Domain? - if (!list.contains(group)) { - list.add(group); - } - // TODO: Get this outside Domain? - if (getMode() == GroupListMode.NOBODY) { - setMode(GroupListMode.NORMAL); - } + // No group duplicate + // TODO: Get this outside Domain? + if (!list.contains(group)) { + list.add(group); + } + // TODO: Get this outside Domain? + if (getMode() == GroupListMode.NOBODY) { + setMode(GroupListMode.NORMAL); + } } public ArrayList<Group> duplicate() { - return new ArrayList<Group>(list); + return new ArrayList<Group>(list); } public Long getId() { - return id; + return id; } public List<Group> getList() { - return list; + return list; } public GroupListMode getMode() { - return mode; + return mode; } public boolean includes(final Group group) { - return mode.checkIfIncludes(group, this.list); + return mode.checkIfIncludes(group, this.list); } public boolean isEmpty() { - return list.size() == 0; + return list.size() == 0; } public void remove(final Group group) { - list.remove(group); - // TODO: Get this outside Domain? - if (list.isEmpty()) { - setMode(GroupListMode.NOBODY); - } + list.remove(group); + // TODO: Get this outside Domain? + if (list.isEmpty()) { + setMode(GroupListMode.NOBODY); + } } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setList(final List<Group> list) { - this.list = list; + this.list = list; } public void setMode(final GroupListMode mode) { - this.mode = mode; + this.mode = mode; } public String toString() { - return "GroupList[(" + mode + "): " + list + "]"; + return "GroupList[(" + mode + "): " + list + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupListMode.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupListMode.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupListMode.java 2008-10-21 19:26:47 UTC (rev 917) @@ -25,13 +25,13 @@ NORMAL, NOBODY, EVERYONE; public boolean checkIfIncludes(Group group, List<Group> list) { - switch (this) { - case NOBODY: - return false; - case EVERYONE: - return true; - default: - return list.contains(group); - } + switch (this) { + case NOBODY: + return false; + case EVERYONE: + return true; + default: + return list.contains(group); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasId.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasId.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasId.java 2008-10-21 19:26:47 UTC (rev 917) @@ -21,7 +21,7 @@ package org.ourproject.kune.platf.server.domain; public interface HasId { - public Long getId(); + Long getId(); - public void setId(Long id); + void setId(Long id); } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nCountry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nCountry.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nCountry.java 2008-10-21 19:26:47 UTC (rev 917) @@ -179,8 +179,7 @@ } @Finder(query = "FROM I18nCountry WHERE code = :country") - public I18nCountry findByCode(@Named("country") - final String country) { + public I18nCountry findByCode(@Named("country") final String country) { return null; } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java 2008-10-21 19:26:47 UTC (rev 917) @@ -103,184 +103,183 @@ private String scope; public I18nLanguage() { - this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); + this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); } // Only for tests public I18nLanguage(final Long id, final String englishName, final String nativeName, final String code) { - this.id = id; - this.englishName = englishName; - this.nativeName = nativeName; - this.code = code; + this.id = id; + this.englishName = englishName; + this.nativeName = nativeName; + this.code = code; } // code is iso6391 || iso6392 || rfc3306 (see DatabaInicializer) public I18nLanguage(final Long id, final String code, final String direction, final String englishName, - final String englishNameLocale, final String englishNameModifier, final String iso6391, - final String iso6392, final String iso6393, final Boolean macroLanguage, final String nativeName, - final String nativeNameLocale, final String nativeNameModifier, final String pluralization, - final String rfc3066, final String scope) { - this.id = id; - this.iso6391 = iso6391; - this.iso6392 = iso6392; - this.iso6393 = iso6393; - this.rfc3066 = rfc3066; - this.englishName = englishName; - this.englishNameLocale = englishNameLocale; - this.englishNameModifier = englishNameModifier; - this.nativeName = nativeName; - this.nativeNameLocale = nativeNameLocale; - this.nativeNameModifier = nativeNameModifier; - this.macroLanguage = macroLanguage; - this.direction = direction; - this.pluralization = pluralization; - this.scope = scope; - this.code = code; + final String englishNameLocale, final String englishNameModifier, final String iso6391, + final String iso6392, final String iso6393, final Boolean macroLanguage, final String nativeName, + final String nativeNameLocale, final String nativeNameModifier, final String pluralization, + final String rfc3066, final String scope) { + this.id = id; + this.iso6391 = iso6391; + this.iso6392 = iso6392; + this.iso6393 = iso6393; + this.rfc3066 = rfc3066; + this.englishName = englishName; + this.englishNameLocale = englishNameLocale; + this.englishNameModifier = englishNameModifier; + this.nativeName = nativeName; + this.nativeNameLocale = nativeNameLocale; + this.nativeNameModifier = nativeNameModifier; + this.macroLanguage = macroLanguage; + this.direction = direction; + this.pluralization = pluralization; + this.scope = scope; + this.code = code; } @Finder(query = "FROM I18nLanguage l WHERE code = :language") - public I18nLanguage findByCode(@Named("language") - final String language) { - return null; + public I18nLanguage findByCode(@Named("language") final String language) { + return null; } @Finder(query = "FROM I18nLanguage") public List<I18nLanguage> getAll() { - return null; + return null; } public String getCode() { - return code; + return code; } public String getDirection() { - return this.direction; + return this.direction; } public String getEnglishName() { - return this.englishName; + return this.englishName; } public String getEnglishNameLocale() { - return this.englishNameLocale; + return this.englishNameLocale; } public String getEnglishNameModifier() { - return this.englishNameModifier; + return this.englishNameModifier; } public Long getId() { - return this.id; + return this.id; } public String getIso6391() { - return this.iso6391; + return this.iso6391; } public String getIso6392() { - return this.iso6392; + return this.iso6392; } public String getIso6393() { - return this.iso6393; + return this.iso6393; } public Boolean getMacroLanguage() { - return this.macroLanguage; + return this.macroLanguage; } public String getNativeName() { - return this.nativeName; + return this.nativeName; } public String getNativeNameLocale() { - return this.nativeNameLocale; + return this.nativeNameLocale; } public String getNativeNameModifier() { - return this.nativeNameModifier; + return this.nativeNameModifier; } public String getPluralization() { - return this.pluralization; + return this.pluralization; } public String getRfc3066() { - return this.rfc3066; + return this.rfc3066; } public String getScope() { - return this.scope; + return this.scope; } @Column(unique = true) public void setCode(final String code) { - this.code = code; + this.code = code; } public void setDirection(final String direction) { - this.direction = direction; + this.direction = direction; } public void setEnglishName(final String englishName) { - this.englishName = englishName; + this.englishName = englishName; } public void setEnglishNameLocale(final String englishNameLocale) { - this.englishNameLocale = englishNameLocale; + this.englishNameLocale = englishNameLocale; } public void setEnglishNameModifier(final String englishNameModifier) { - this.englishNameModifier = englishNameModifier; + this.englishNameModifier = englishNameModifier; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setIso6391(final String iso6391) { - this.iso6391 = iso6391; + this.iso6391 = iso6391; } public void setIso6392(final String iso6392) { - this.iso6392 = iso6392; + this.iso6392 = iso6392; } public void setIso6393(final String iso6393) { - this.iso6393 = iso6393; + this.iso6393 = iso6393; } public void setMacroLanguage(final Boolean macroLanguage) { - this.macroLanguage = macroLanguage; + this.macroLanguage = macroLanguage; } public void setNativeName(final String nativeName) { - this.nativeName = nativeName; + this.nativeName = nativeName; } public void setNativeNameLocale(final String nativeNameLocale) { - this.nativeNameLocale = nativeNameLocale; + this.nativeNameLocale = nativeNameLocale; } public void setNativeNameModifier(final String nativeNameModifier) { - this.nativeNameModifier = nativeNameModifier; + this.nativeNameModifier = nativeNameModifier; } public void setPluralization(final String pluralization) { - this.pluralization = pluralization; + this.pluralization = pluralization; } public void setRfc3066(final String rfc3066) { - this.rfc3066 = rfc3066; + this.rfc3066 = rfc3066; } public void setScope(final String scope) { - this.scope = scope; + this.scope = scope; } @Override public String toString() { - return "I18nLanguage[" + englishName + "]"; + return "I18nLanguage[" + englishName + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nTranslation.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nTranslation.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nTranslation.java 2008-10-21 19:26:47 UTC (rev 917) @@ -49,10 +49,10 @@ @Indexed @Table(name = "globalize_translations") @NamedQueries( { - @NamedQuery(name = "untranslated", query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :language and text=null"), - @NamedQuery(name = "translated", query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :language and text!=null"), - @NamedQuery(name = "untranslatedcount", query = "SELECT COUNT(gt.id) FROM I18nTranslation gt WHERE gt.language = :language and text=null"), - @NamedQuery(name = "translatedcount", query = "SELECT COUNT(gt.id) FROM I18nTranslation gt WHERE gt.language = :language and text!=null") }) + @NamedQuery(name = "untranslated", query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :language and text=null"), + @NamedQuery(name = "translated", query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :language and text!=null"), + @NamedQuery(name = "untranslatedcount", query = "SELECT COUNT(gt.id) FROM I18nTranslation gt WHERE gt.language = :language and text=null"), + @NamedQuery(name = "translatedcount", query = "SELECT COUNT(gt.id) FROM I18nTranslation gt WHERE gt.language = :language and text!=null") }) public class I18nTranslation implements HasId { public static final String DEF_NAMESPACE = "kune_core"; @@ -96,167 +96,157 @@ private String text; public I18nTranslation() { - this(null, null, null, null, null, null, null, null); + this(null, null, null, null, null, null, null, null); } public I18nTranslation(final String trKey, final I18nLanguage language, final String text) { - this("", null, DEF_PLUR_INDEX, "", text, trKey, DEF_NAMESPACE, language); + this("", null, DEF_PLUR_INDEX, "", text, trKey, DEF_NAMESPACE, language); } public I18nTranslation(final String facet, final Integer itemId, final Integer pluralizationIndex, - final String tableName, final String text, final String trKey, final String type, - final I18nLanguage language) { - this.type = type; - this.trKey = trKey; - this.tableName = tableName; - this.itemId = itemId; - this.facet = facet; - this.language = language; - this.pluralizationIndex = pluralizationIndex; - this.text = text; + final String tableName, final String text, final String trKey, final String type, + final I18nLanguage language) { + this.type = type; + this.trKey = trKey; + this.tableName = tableName; + this.itemId = itemId; + this.facet = facet; + this.language = language; + this.pluralizationIndex = pluralizationIndex; + this.text = text; } public I18nTranslation cloneForNewLanguage() { - final I18nTranslation clone = new I18nTranslation(); - clone.type = type; - clone.trKey = trKey; - clone.tableName = tableName; - clone.itemId = itemId; - clone.facet = facet; - clone.language = null; - clone.pluralizationIndex = pluralizationIndex; - clone.text = null; - return clone; + final I18nTranslation clone = new I18nTranslation(); + clone.type = type; + clone.trKey = trKey; + clone.tableName = tableName; + clone.itemId = itemId; + clone.facet = facet; + clone.language = null; + clone.pluralizationIndex = pluralizationIndex; + clone.text = null; + return clone; } @Finder(query = "SELECT gt FROM I18nTranslation gt JOIN gt.language gl WHERE gl.code = :language") - public List<I18nTranslation> findByLanguage(@Named("language") - final String language) { - return null; + public List<I18nTranslation> findByLanguage(@Named("language") final String language) { + return null; } public String getFacet() { - return this.facet; + return this.facet; } public Long getId() { - return this.id; + return this.id; } public Integer getItemId() { - return this.itemId; + return this.itemId; } public I18nLanguage getLanguage() { - return language; + return language; } @Finder(query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :deflanguage AND gt.trKey NOT IN (SELECT gt.trKey FROM I18nTranslation gt WHERE gt.language = :language)") - public List<I18nTranslation> getNonExistentFromDefault(@Named("deflanguage") - final I18nLanguage deflanguage, @Named("language") - final I18nLanguage language) { - return null; + public List<I18nTranslation> getNonExistentFromDefault(@Named("deflanguage") final I18nLanguage deflanguage, + @Named("language") final I18nLanguage language) { + return null; } public Integer getPluralizationIndex() { - return this.pluralizationIndex; + return this.pluralizationIndex; } public String getTableName() { - return this.tableName; + return this.tableName; } public String getText() { - return this.text; + return this.text; } @Finder(namedQuery = TRANSLATED_QUERY) - public List<I18nTranslation> getTranslatedLexicon(@Named("language") - final I18nLanguage language) { - return null; + public List<I18nTranslation> getTranslatedLexicon(@Named("language") final I18nLanguage language) { + return null; } @Finder(namedQuery = TRANSLATED_QUERY) - public List<I18nTranslation> getTranslatedLexicon(@Named("language") - final I18nLanguage language, @FirstResult - final int first, @MaxResults - final int max) { - return null; + public List<I18nTranslation> getTranslatedLexicon(@Named("language") final I18nLanguage language, + @FirstResult final int first, @MaxResults final int max) { + return null; } @Finder(namedQuery = TRANSLATED_COUNT_QUERY) - public Long getTranslatedLexiconCount(@Named("language") - final I18nLanguage language) { - return null; + public Long getTranslatedLexiconCount(@Named("language") final I18nLanguage language) { + return null; } public String getTrKey() { - return this.trKey; + return this.trKey; } public String getType() { - return this.type; + return this.type; } @Finder(namedQuery = UNTRANSLATED_QUERY) - public List<I18nTranslation> getUnstranslatedLexicon(@Named("language") - final I18nLanguage language) { - return null; + public List<I18nTranslation> getUnstranslatedLexicon(@Named("language") final I18nLanguage language) { + return null; } @Finder(namedQuery = UNTRANSLATED_QUERY) - public List<I18nTranslation> getUnstranslatedLexicon(@Named("language") - final I18nLanguage language, @FirstResult - final int first, @MaxResults - final int max) { - return null; + public List<I18nTranslation> getUnstranslatedLexicon(@Named("language") final I18nLanguage language, + @FirstResult final int first, @MaxResults final int max) { + return null; } @Finder(namedQuery = UNTRANSLATED_COUNT_QUERY) - public Long getUnstranslatedLexiconCount(@Named("language") - final I18nLanguage language) { - return null; + public Long getUnstranslatedLexiconCount(@Named("language") final I18nLanguage language) { + return null; } public void setFacet(final String facet) { - this.facet = facet; + this.facet = facet; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setItemId(final Integer itemId) { - this.itemId = itemId; + this.itemId = itemId; } public void setLanguage(final I18nLanguage language) { - this.language = language; + this.language = language; } public void setPluralizationIndex(final Integer pluralizationIndex) { - this.pluralizationIndex = pluralizationIndex; + this.pluralizationIndex = pluralizationIndex; } public void setTableName(final String tableName) { - this.tableName = tableName; + this.tableName = tableName; } public void setText(final String text) { - this.text = text; + this.text = text; } public void setTrKey(final String trKey) { - this.trKey = trKey; + this.trKey = trKey; } public void setType(final String type) { - this.type = type; + this.type = type; } @Override public String toString() { - return "I18nTranslation[" + trKey + " (" + language + ") " + text + "]"; + return "I18nTranslation[" + trKey + " (" + language + ") " + text + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/License.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/License.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/License.java 2008-10-21 19:26:47 UTC (rev 917) @@ -56,121 +56,120 @@ private String imageUrl; public License() { - this(null, null, null, null, false, false, false, null, null); + this(null, null, null, null, false, false, false, null, null); } public License(final String shortName, final String longName, final String description, final String url, - final boolean isCC, final boolean isCopyleft, final boolean isDeprecated, final String rdf, - final String imageUrl) { - this.shortName = shortName; - this.longName = longName; - this.description = description; - this.url = url; - this.isCC = isCC; - this.isCopyleft = isCopyleft; - this.isDeprecated = isDeprecated; - this.rdf = rdf; - this.imageUrl = imageUrl; + final boolean isCC, final boolean isCopyleft, final boolean isDeprecated, final String rdf, + final String imageUrl) { + this.shortName = shortName; + this.longName = longName; + this.description = description; + this.url = url; + this.isCC = isCC; + this.isCopyleft = isCopyleft; + this.isDeprecated = isDeprecated; + this.rdf = rdf; + this.imageUrl = imageUrl; } public Long getId() { - return id; + return id; } public void setId(final Long id) { - this.id = id; + this.id = id; } public String getShortName() { - return shortName; + return shortName; } public void setShortName(final String shortName) { - this.shortName = shortName; + this.shortName = shortName; } public String getLongName() { - return longName; + return longName; } public void setLongName(final String longName) { - this.longName = longName; + this.longName = longName; } public String getDescription() { - return description; + return description; } public void setDescription(final String description) { - this.description = description; + this.description = description; } public String getImageUrl() { - return imageUrl; + return imageUrl; } public void setImageUrl(final String imageUrl) { - this.imageUrl = imageUrl; + this.imageUrl = imageUrl; } public String getRdf() { - return rdf; + return rdf; } public void setRdf(final String rdf) { - this.rdf = rdf; + this.rdf = rdf; } public String getUrl() { - return url; + return url; } public void setUrl(final String url) { - this.url = url; + this.url = url; } public boolean isCC() { - return isCC; + return isCC; } public boolean isCopyleft() { - return isCopyleft; + return isCopyleft; } public boolean isDeprecated() { - return isDeprecated; + return isDeprecated; } public void setCC(final boolean isCC) { - this.isCC = isCC; + this.isCC = isCC; } public void setCopyleft(final boolean isCopyleft) { - this.isCopyleft = isCopyleft; + this.isCopyleft = isCopyleft; } public void setDeprecated(final boolean isDeprecated) { - this.isDeprecated = isDeprecated; + this.isDeprecated = isDeprecated; } @Finder(query = "from License l where l.shortName = :shortName") - public License findByShortName(@Named("shortName") - final String shortName) { - return null; + public License findByShortName(@Named("shortName") final String shortName) { + return null; } @Finder(query = "from License") public List<License> getAll() { - return null; + return null; } @Finder(query = "from License where isCC = true") public List<License> getCC() { - return null; + return null; } @Finder(query = "from License where isCC = false") public List<License> getNotCC() { - return null; + return null; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/Rate.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/Rate.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Rate.java 2008-10-21 19:26:47 UTC (rev 917) @@ -91,21 +91,17 @@ } @Finder(query = "SELECT r FROM Rate r WHERE r.rater = :user AND r.content = :content") - public Rate find(@Named("user") - final User user, @Named("content") - final Content content) { + public Rate find(@Named("user") final User user, @Named("content") final Content content) { return null; } @Finder(query = "SELECT AVG(r.value) FROM Rate r WHERE r.content = :content") - public Double calculateRate(@Named("content") - final Content content) { + public Double calculateRate(@Named("content") final Content content) { return null; } @Finder(query = "SELECT count(*) FROM Rate r WHERE r.content = :content") - public Long calculateRateNumberOfUsers(@Named("content") - final Content content) { + public Long calculateRateNumberOfUsers(@Named("content") final Content content) { return null; } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/SocialNetwork.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/SocialNetwork.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/SocialNetwork.java 2008-10-21 19:26:47 UTC (rev 917) @@ -41,83 +41,83 @@ GroupList pendingCollaborators; public SocialNetwork() { - accessLists = new AccessLists(); - pendingCollaborators = new GroupList(); + accessLists = new AccessLists(); + pendingCollaborators = new GroupList(); } public void addAdmin(final Group group) { - accessLists.addAdmin(group); + accessLists.addAdmin(group); } public void addCollaborator(final Group group) { - accessLists.addEditor(group); + accessLists.addEditor(group); } public void addPendingCollaborator(final Group group) { - pendingCollaborators.add(group); + pendingCollaborators.add(group); } public void addViewer(final Group group) { - accessLists.addViewer(group); + accessLists.addViewer(group); } public AccessLists getAccessLists() { - return accessLists; + return accessLists; } public Long getId() { - return id; + return id; } public GroupList getPendingCollaborators() { - return pendingCollaborators; + return pendingCollaborators; } public boolean isAdmin(final Group group) { - return accessLists.getAdmins().includes(group); + return accessLists.getAdmins().includes(group); } public boolean isCollab(final Group group) { - return accessLists.getEditors().includes(group); + return accessLists.getEditors().includes(group); } public boolean isPendingCollab(final Group group) { - return pendingCollaborators.getList().contains(group); + return pendingCollaborators.getList().contains(group); } public boolean isViewer(final Group group) { - return accessLists.getViewers().includes(group); + return accessLists.getViewers().includes(group); } public void removeAdmin(final Group group) { - accessLists.removeAdmin(group); + accessLists.removeAdmin(group); } public void removeCollaborator(final Group group) { - accessLists.removeEditor(group); + accessLists.removeEditor(group); } public void removePendingCollaborator(final Group group) { - pendingCollaborators.getList().remove(group); + pendingCollaborators.getList().remove(group); } public void removeViewer(final Group group) { - accessLists.removeViewer(group); + accessLists.removeViewer(group); } public void setAccessLists(final AccessLists accessList) { - this.accessLists = accessList; + this.accessLists = accessList; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setPendingCollaborators(final GroupList pendingCollaborators) { - this.pendingCollaborators = pendingCollaborators; + this.pendingCollaborators = pendingCollaborators; } public String toString() { - return "SocialNetwork[accessList: " + accessLists + "; pendingsCollabs: " + pendingCollaborators + "]"; + return "SocialNetwork[accessList: " + accessLists + "; pendingsCollabs: " + pendingCollaborators + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/Tag.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/Tag.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Tag.java 2008-10-21 19:26:47 UTC (rev 917) @@ -81,8 +81,7 @@ } @Finder(query = "FROM Tag g WHERE g.name = :name") - public Tag findByTagName(@Named("name") - final String tag) { + public Tag findByTagName(@Named("name") final String tag) { return null; } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/TagResult.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/TagResult.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/TagResult.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.server.domain; - public class TagResult { private String name; private Long count; 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2008-10-21 19:26:47 UTC (rev 917) @@ -107,8 +107,8 @@ final String adminEmail = properties.getAdminEmail(); final String adminPassword = properties.getAdminPassword(); // FIXME: - final User user = new User(adminShortName, adminName, adminEmail, adminPassword, languageManager - .findByCode("en"), countryManager.findByCode("GB"), TimeZone.getDefault()); + final User user = new User(adminShortName, adminName, adminEmail, adminPassword, + languageManager.findByCode("en"), countryManager.findByCode("GB"), TimeZone.getDefault()); groupManager.createUserGroup(user, false); final String siteName = properties.getDefaultSiteName(); @@ -123,34 +123,33 @@ groupManager.reIndex(); final Content defaultContent = siteGroup.getDefaultContent(); - contentManager - .save(user, defaultContent, - "<img src=\"http://kune.ourproject.org/IMG/cache-200x37/siteon0-200x37.png\" " - + "align=\"right\">This a initial demo of " - + "<a href=\"http://kune.ourproject.org\">kune</a>." - + "<br><div style=\"text-align: right;\"><br></div>" - + "Kune is currently under initial development.<br>" - + "<br>To test it, <a href=\"#signin\">sign in registering an user</a>, " - + "but take into account that:<br><ul><li>kune is not optimized yet, " - + "then the initial load and other operations maybe are slow.</li>" - + "<li>Don\'t use passwords that you are using in other sites " - + "(kune isn\'t secure yet storing passwords).</li>" - + "<li>The site is divided in two main areas: the public " - + "space and the workspace:</li><ul>" - + "<li>The workspace is the most important part of kune, " - + "because is where users collaborate and communicates which each others. " - + "This part is the most dynamic and we are using modern " - + "(and sometimes experimental) web technologies to improve the end user " - + "experience. I heavily under development.<br></li>" - + "<li>The public space is currently lest developed. " - + "Our main goal is to offer customs and configurable styles " - + "for groups/users contents.</li></ul></ul><font size=\"4\"><br>" - + "We need your feedback<br><br></font>Please help us to improve this software " - + "reporting <a href=\"http://code.google.com/p/kune/issues\">bugs and/or " - + "suggestions</a>. Also you <a href=\"#translate\">help us to translate it</a> " - + "into other languages.<br><br>Thank you,<br>" - + "<br>--<br><span style=\"font-style: italic;\">" - + "The kune development team</span><br><br>"); + contentManager.save(user, defaultContent, + "<img src=\"http://kune.ourproject.org/IMG/cache-200x37/siteon0-200x37.png\" " + + "align=\"right\">This a initial demo of " + + "<a href=\"http://kune.ourproject.org\">kune</a>." + + "<br><div style=\"text-align: right;\"><br></div>" + + "Kune is currently under initial development.<br>" + + "<br>To test it, <a href=\"#signin\">sign in registering an user</a>, " + + "but take into account that:<br><ul><li>kune is not optimized yet, " + + "then the initial load and other operations maybe are slow.</li>" + + "<li>Don\'t use passwords that you are using in other sites " + + "(kune isn\'t secure yet storing passwords).</li>" + + "<li>The site is divided in two main areas: the public " + + "space and the workspace:</li><ul>" + + "<li>The workspace is the most important part of kune, " + + "because is where users collaborate and communicates which each others. " + + "This part is the most dynamic and we are using modern " + + "(and sometimes experimental) web technologies to improve the end user " + + "experience. I heavily under development.<br></li>" + + "<li>The public space is currently lest developed. " + + "Our main goal is to offer customs and configurable styles " + + "for groups/users contents.</li></ul></ul><font size=\"4\"><br>" + + "We need your feedback<br><br></font>Please help us to improve this software " + + "reporting <a href=\"http://code.google.com/p/kune/issues\">bugs and/or " + + "suggestions</a>. Also you <a href=\"#translate\">help us to translate it</a> " + + "into other languages.<br><br>Thank you,<br>" + + "<br>--<br><span style=\"font-style: italic;\">" + + "The kune development team</span><br><br>"); contentManager.renameContent(user, defaultContent.getId(), "Welcome to kune demo"); contentManager.setStatus(defaultContent.getId(), ContentStatus.publishedOnline); } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/FileManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/FileManager.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/FileManager.java 2008-10-21 19:26:47 UTC (rev 917) @@ -9,9 +9,9 @@ * Create a new file adding a numeric sequence if the file already exists * * @param dir - * the directory (use File.separator for dir delimiters) + * the directory (use File.separator for dir delimiters) * @param fileName - * (the new file name) + * (the new file name) * @return if 'file.txt' exists it creates 'file 1.txt' and if 'file 1.txt' * exists it creates 'file 2.txt' and so on * @throws IOException @@ -20,7 +20,7 @@ /** * @param dir - * the directory (use File.separator for dir delimiters) + * the directory (use File.separator for dir delimiters) * @return true if and only if the directory was created, along with all * necessary parent directories; false otherwise */ @@ -28,7 +28,7 @@ /** * @param dir - * the directory (use File.separator for dir delimiters) + * the directory (use File.separator for dir delimiters) */ void rmdir(String dir); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/Manager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/Manager.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/Manager.java 2008-10-21 19:26:47 UTC (rev 917) @@ -22,10 +22,10 @@ public interface Manager<T, X> { - public T find(X id); + T find(X id); - public T persist(T entity); + T merge(T entity); - public T merge(T entity); + T persist(T entity); } Added: 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,47 @@ +package org.ourproject.kune.platf.server.manager.file; + +import java.io.IOException; + +import javax.servlet.ServletException; +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.FileParams; +import org.ourproject.kune.platf.server.domain.Group; +import org.ourproject.kune.platf.server.manager.GroupManager; + +import com.google.inject.Inject; + +public class EntityLogoDownloadManager extends FileDownloadManagerAbstract { + + private static final long serialVersionUID = 1L; + + @Inject + GroupManager groupManager; + + @Override + protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, + IOException { + + // final String userHash = req.getParameter(FileParams.HASH); + final StateToken stateToken = new StateToken(req.getParameter(FileParams.TOKEN)); + + Group group = groupManager.findByShortName(stateToken.getGroup()); + + if (group == Group.NO_GROUP) { + throw new ServletException("Group not found trying to get the logo"); + } + + if (!group.hasLogo()) { + throw new ServletException("This Group has no logo"); + } + + byte[] logo = group.getLogo(); + + resp.setContentLength(logo.length); + resp.setContentType(group.getLogoMime().toString()); + resp.setHeader("Content-Disposition", "attachment; filename=\"" + group.getShortName() + "-logo\""); + resp.getOutputStream().write(logo); + } +} Added: 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,85 @@ +package org.ourproject.kune.platf.server.manager.file; + +import java.io.File; + +import net.sf.json.JSONObject; + +import org.apache.commons.fileupload.FileItem; +import org.ourproject.kune.platf.client.dto.StateToken; +import org.ourproject.kune.platf.server.access.AccessRol; +import org.ourproject.kune.platf.server.auth.ActionLevel; +import org.ourproject.kune.platf.server.auth.Authenticated; +import org.ourproject.kune.platf.server.auth.Authorizated; +import org.ourproject.kune.platf.server.domain.BasicMimeType; +import org.ourproject.kune.platf.server.domain.Group; +import org.ourproject.kune.platf.server.manager.GroupManager; +import org.ourproject.kune.workspace.client.entitylogo.EntityLogoView; + +import com.google.inject.Inject; +import com.wideplay.warp.persist.TransactionType; +import com.wideplay.warp.persist.Transactional; + +public class EntityLogoUploadManager extends FileJsonUploadManagerAbstract { + + private static final long serialVersionUID = 1L; + + @Inject + GroupManager groupManager; + + @Override + protected JSONObject createJsonResponse(final boolean success, final String message) { + /** + * Expect result with this format: + * {"success":false,"errors":[{"id":"email","msg":"Already exists"}, + * {"id":"username","msg":"Already taken"}]} + */ + + JSONObject response = null; + try { + response = new JSONObject(); + response.put("success", success); + JSONObject[] jsonError = new JSONObject[1]; + jsonError[0] = new JSONObject(); + if (!success) { + jsonError[0].put("id", EntityLogoView.LOGO_FORM_FIELD); + jsonError[0].put("msg", message); + } + response.put("errors", jsonError); + } catch (final Exception e) { + log.error("Error building response"); + } + return response; + } + + @Override + @Authenticated + @Authorizated(accessRolRequired = AccessRol.Administrator, actionLevel = ActionLevel.group) + @Transactional(type = TransactionType.READ_WRITE) + protected void createUploadedFile(String userHash, StateToken stateToken, String fileName, FileItem file) + throws Exception { + BasicMimeType mimeType = new BasicMimeType(file.getContentType()); + if (!mimeType.getType().equals("image")) { + throw new Exception("Trying to set a non image (" + file.getContentType() + ") as group logo"); + } + Group group = groupManager.findByShortName(stateToken.getGroup()); + + if (group == Group.NO_GROUP) { + throw new Exception("Group not found trying to set the logo"); + } + + File tmpOrigFile = File.createTempFile("logoOrig", ""); + file.write(tmpOrigFile); + File tmpDestFile = File.createTempFile("logoDest", ""); + + boolean result = ImageUtilsDefault.scaleImageToMax(tmpOrigFile.getAbsolutePath(), + tmpDestFile.getAbsolutePath(), + EntityLogoView.LOGO_ICON_DEFAULT_HEIGHT); + if (result) { + group.setLogo(FileUtils.getBytesFromFile(tmpDestFile)); + group.setLogoMime(mimeType); + } else { + throw new Exception("Cannot create group logo thumb"); + } + } + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java (from rev 912, trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,105 @@ +package org.ourproject.kune.platf.server.manager.file; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.OutputStream; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.ourproject.kune.platf.client.dto.StateToken; +import org.ourproject.kune.platf.client.errors.ContentNotFoundException; +import org.ourproject.kune.platf.client.ui.download.FileParams; +import org.ourproject.kune.platf.client.ui.download.ImageSize; +import org.ourproject.kune.platf.server.access.AccessRol; +import org.ourproject.kune.platf.server.auth.ActionLevel; +import org.ourproject.kune.platf.server.auth.Authenticated; +import org.ourproject.kune.platf.server.auth.Authorizated; +import org.ourproject.kune.platf.server.content.ContentManager; +import org.ourproject.kune.platf.server.content.ContentUtils; +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 com.google.inject.Inject; + +/** + * Some snippets from: + * http://www.onjava.com/pub/a/onjava/excerpt/jebp_3/index1.html?page=1 + * + */ +public class FileDownloadManager extends FileDownloadManagerAbstract { + + private static final long serialVersionUID = 1L; + + @Inject + ContentManager contentManager; + @Inject + KuneProperties kuneProperties; + + @Override + protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, + IOException { + + final String userHash = req.getParameter(FileParams.HASH); + final StateToken stateToken = new StateToken(req.getParameter(FileParams.TOKEN)); + final String downloadS = req.getParameter(FileParams.DOWNLOAD); + String imageSizeS = req.getParameter(FileParams.IMGSIZE); + final ImageSize imgsize = imageSizeS == null ? null : ImageSize.valueOf(imageSizeS); + final boolean download = downloadS != null && downloadS.equals("true") ? true : false; + + final Content cnt = getContentForDownload(userHash, stateToken); + + final String absDir = kuneProperties.get(KuneProperties.UPLOAD_LOCATION) + FileUtils.toDir(stateToken); + String filename = cnt.getFilename(); + String extension = FileUtils.getFileNameExtension(filename, true); + BasicMimeType mimeType = cnt.getMimeType(); + + if (mimeType.getType().equals("image")) { + String imgsizePrefix = imgsize == null ? "" : "." + imgsize; + String filenameWithoutExtension = FileUtils.getFileNameWithoutExtension(filename, extension); + String filenameResized = filenameWithoutExtension + imgsizePrefix + extension; + if (new File(absDir + filenameResized).exists()) { + // thumb can fail + filename = filenameResized; + } + } + + final String absFilename = absDir + filename; + + doBuildResp(resp, absFilename, cnt.getTitle(), mimeType, extension, download); + } + + private void doBuildResp(final HttpServletResponse resp, final String filename, final String otherName, + final BasicMimeType mimeType, final String extension, final boolean download) throws FileNotFoundException, + IOException { + final File file = new File(filename); + + resp.setContentLength((int) file.length()); + if (mimeType == null || download) { + resp.setContentType("application/x-download"); + } else if (mimeType.getType().equals("image")) { + resp.setContentType(mimeType.toString()); + } else { + resp.setContentType("application/x-download"); + } + resp.setHeader("Content-Disposition", "attachment; filename=\"" + otherName + extension + "\""); + + final OutputStream out = resp.getOutputStream(); + returnFile(filename, out); + } + + @Authenticated(mandatory = false) + @Authorizated(accessRolRequired = AccessRol.Viewer, actionLevel = ActionLevel.content) + private Content getContentForDownload(final String userHash, final StateToken stateToken) throws ServletException { + try { + return contentManager.find(ContentUtils.parseId(stateToken.getDocument())); + } catch (final ContentNotFoundException e) { + // what response to send in this case ? + throw new ServletException(); + } + + } +} Property changes on: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java ___________________________________________________________________ Name: svn:mergeinfo + Added: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerAbstract.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerAbstract.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerAbstract.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,31 @@ +package org.ourproject.kune.platf.server.manager.file; + +import java.io.BufferedInputStream; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import javax.servlet.http.HttpServlet; + +public abstract class FileDownloadManagerAbstract extends HttpServlet { + + private static final long serialVersionUID = 1L; + + public void returnFile(final String filename, final OutputStream out) throws FileNotFoundException, IOException { + InputStream in = null; + try { + in = new BufferedInputStream(new FileInputStream(filename)); + final byte[] buf = new byte[4 * 1024]; // 4K buffer + int bytesRead; + while ((bytesRead = in.read(buf)) != -1) { + out.write(buf, 0, bytesRead); + } + } finally { + if (in != null) { + in.close(); + } + } + } +} Added: 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,50 @@ +package org.ourproject.kune.platf.server.manager.file; + +import java.io.IOException; +import java.io.Writer; + +import javax.servlet.http.HttpServletResponse; + +import net.sf.json.JSONObject; + +import org.ourproject.kune.platf.client.services.I18nTranslationService; + +import com.google.inject.Inject; + +public abstract class FileJsonUploadManagerAbstract extends FileUploadManagerAbstract { + + private static final long serialVersionUID = 1L; + + @Inject + I18nTranslationService i18n; + + @Override + protected void beforeRespond(HttpServletResponse response, Writer w) throws IOException { + super.beforeRespond(response, w); + response.setCharacterEncoding("utf-8"); + response.setContentType("text/html"); + } + + protected JSONObject createJsonResponse(final boolean success, final String message) { + return new JSONObject(); + } + + @Override + protected void onFileUploadException(HttpServletResponse response) throws IOException { + doResponse(response, createJsonResponse(false, i18n.t("Error: File too large")).toString()); + } + + @Override + protected void onOtherException(HttpServletResponse response, Exception e) throws IOException { + super.onOtherException(response, e); + log.info("Exception: " + e.getCause()); + e.printStackTrace(); + doResponse(response, createJsonResponse(false, i18n.t("Error uploading file")).toString()); + } + + @Override + protected void onSuccess(HttpServletResponse response) throws IOException { + doResponse(response, createJsonResponse(true, i18n.t("Success uploading")).toString()); + } + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileManagerDefault.java (from rev 909, trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileManagerDefault.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileManagerDefault.java 2008-10-14 13:39:30 UTC (rev 909) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileManagerDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,38 @@ +package org.ourproject.kune.platf.server.manager.file; + +import java.io.File; +import java.io.IOException; + +import org.ourproject.kune.platf.server.manager.FileManager; + +import com.google.inject.Singleton; + +@Singleton +public class FileManagerDefault implements FileManager { + + public File createFileWithSequentialName(final String dir, final String fileName) throws IOException { + String fileNameProposal = new String(fileName); + File file = new File(dir, fileNameProposal); + while (file.exists()) { + fileNameProposal = FileUtils.getNextSequentialFileName(fileNameProposal, true); + file = new File(dir, fileNameProposal); + } + file.createNewFile(); + return file; + } + + public boolean mkdir(final String dir) { + return (new File(dir)).mkdirs(); + } + + public void rmdir(final String dir) { + final File file = new File(dir); + if (!file.isDirectory()) { + throw new RuntimeException("rmdir: " + dir + ": Not a directory"); + } + if (file.listFiles().length != 0) { + throw new RuntimeException("rmdir: " + dir + ": Directory not empty"); + } + file.delete(); + } +} Property changes on: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileManagerDefault.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java (from rev 911, trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java 2008-10-15 14:12:54 UTC (rev 911) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,150 @@ +package org.ourproject.kune.platf.server.manager.file; + +import java.io.File; + +import magick.MagickException; +import net.sf.json.JSONObject; + +import org.apache.commons.fileupload.FileItem; +import org.ourproject.kune.docs.server.DocumentServerTool; +import org.ourproject.kune.platf.client.dto.StateToken; +import org.ourproject.kune.platf.client.services.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; +import org.ourproject.kune.platf.server.access.AccessService; +import org.ourproject.kune.platf.server.auth.ActionLevel; +import org.ourproject.kune.platf.server.auth.Authenticated; +import org.ourproject.kune.platf.server.auth.Authorizated; +import org.ourproject.kune.platf.server.content.ContentManager; +import org.ourproject.kune.platf.server.content.ContentUtils; +import org.ourproject.kune.platf.server.domain.BasicMimeType; +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 org.ourproject.kune.platf.server.manager.FileManager; +import org.ourproject.kune.platf.server.properties.KuneProperties; + +import com.google.inject.Inject; +import com.google.inject.servlet.RequestScoped; +import com.wideplay.warp.persist.TransactionType; +import com.wideplay.warp.persist.Transactional; + +@RequestScoped +public class FileUploadManager extends FileJsonUploadManagerAbstract { + + private static final long serialVersionUID = 1L; + + @Inject + UserSession userSession; + @Inject + ContentManager contentManager; + @Inject + AccessService accessService; + @Inject + FileManager fileManager; + @Inject + I18nTranslationService i18n; + + @Override + protected JSONObject createJsonResponse(final boolean success, final String message) { + /** + * + * http://max-bazhenov.com/dev/upload-dialog-2.0/index.php + * + * Server side handler. + * + * The files in the queue are posted one at a time, the file field name + * is 'file'. The handler should return json encoded object with + * following properties: { success: true|false, // required error: + * 'Error or success message' // optional, also can be named 'message' } + */ + + JSONObject response = null; + try { + response = new JSONObject(); + response.put("success", success); + response.put("error", message); + response.put("code", "232"); + } catch (final Exception e) { + log.error("Error building response"); + } + return response; + } + + @Override + protected void createUploadedFile(String userHash, StateToken stateToken, String fileName, FileItem file) + throws Exception { + createUploadedFileWrapped(userHash, stateToken, fileName, file); + } + + @Authenticated + @Authorizated(accessRolRequired = AccessRol.Editor, actionLevel = ActionLevel.container) + @Transactional(type = TransactionType.READ_WRITE) + Content createUploadedFileWrapped(final String userHash, final StateToken stateToken, final String fileName, + final FileItem fileUploadItem) throws Exception { + final String relDir = FileUtils.toDir(stateToken); + final String absDir = kuneProperties.get(KuneProperties.UPLOAD_LOCATION) + relDir; + fileManager.mkdir(absDir); + + File file = null; + try { + final String filenameUTF8 = new String(fileName.getBytes(), UTF8); + file = fileManager.createFileWithSequentialName(absDir, filenameUTF8); + fileUploadItem.write(file); + + final String mimetype = fileUploadItem.getContentType(); + BasicMimeType basicMimeType = new BasicMimeType(mimetype); + log.info("Mimetype: " + basicMimeType); + final String extension = FileUtils.getFileNameExtension(file.getName(), false); + + if (basicMimeType.getType().equals("image")) { + generateThumbs(absDir, file.getName(), extension); + } + + // Persist + final User user = userSession.getUser(); + final Container container = accessService.accessToContainer(ContentUtils.parseId(stateToken.getFolder()), + user, AccessRol.Editor); + final String preview = "Preview of this file (in development)"; + final Content content = contentManager.createContent(FileUtils.getFileNameWithoutExtension(file.getName(), + extension), + preview, user, container); + content.setTypeId(DocumentServerTool.TYPE_UPLOADEDFILE); + content.setMimeType(basicMimeType); + content.setFilename(file.getName()); + return content; + } catch (final Exception e) { + if (file != null && file.exists()) { + file.delete(); + } + throw e; + } + } + + private void generateThumbs(String absDir, String filename, String extension) { + try { + String fileOrig = absDir + filename; + String withoutExtension = FileUtils.getFileNameWithoutExtension(filename, extension); + + String resizeName = absDir + withoutExtension + "." + ImageSize.sized + "." + extension; + String thumbName = absDir + withoutExtension + "." + ImageSize.thumb + "." + extension; + String iconName = absDir + withoutExtension + "." + ImageSize.ico + "." + extension; + + int resizeWidth = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_RESIZEWIDTH)); + int thumbSize = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_THUMBSIZE)); + int cropSize = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_CROPSIZE)); + int iconSize = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_ICONSIZE)); + + ImageUtilsDefault.scaleImageToMax(fileOrig, resizeName, resizeWidth); + ImageUtilsDefault.createThumb(fileOrig, thumbName, thumbSize, cropSize); + ImageUtilsDefault.createThumb(fileOrig, iconName, iconSize); + + } catch (NumberFormatException e) { + log.error("Image sizes in kune.properties are not integers"); + e.printStackTrace(); + } catch (MagickException e) { + log.info("Problem generating image thumb for " + filename); + } + } +} Property changes on: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java ___________________________________________________________________ Name: svn:mergeinfo + Added: 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,125 @@ +package org.ourproject.kune.platf.server.manager.file; + +import java.io.File; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.util.Iterator; +import java.util.List; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; +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.FileParams; +import org.ourproject.kune.platf.server.properties.KuneProperties; + +import com.google.inject.Inject; + +public abstract class FileUploadManagerAbstract extends HttpServlet { + + private static final long serialVersionUID = 1L; + + public static final Log log = LogFactory.getLog(FileUploadManager.class); + + protected static final String UTF8 = "UTF-8"; + + @Inject + KuneProperties kuneProperties; + + protected void beforePostStart() { + } + + protected void beforeRespond(final HttpServletResponse response, final Writer w) throws IOException { + } + + protected void createUploadedFile(String userHash, StateToken stateToken, String fileName, FileItem file) + throws Exception { + } + + @Override + @SuppressWarnings( { "unchecked", "deprecation" }) + protected void doPost(final HttpServletRequest req, final HttpServletResponse response) throws ServletException, + IOException { + + beforePostStart(); + + final DiskFileItemFactory factory = new DiskFileItemFactory(); + // maximum size that will be stored in memory + factory.setSizeThreshold(4096); + // the location for saving data that is larger than getSizeThreshold() + factory.setRepository(new File("/tmp")); + + if (!ServletFileUpload.isMultipartContent(req)) { + log.warn("Not a multipart upload"); + } + + final ServletFileUpload upload = new ServletFileUpload(factory); + // maximum size before a FileUploadException will be thrown + upload.setSizeMax(new Integer(kuneProperties.get(KuneProperties.UPLOAD_MAX_FILE_SIZE)) * 1024 * 1024); + + try { + final List fileItems = upload.parseRequest(req); + String userHash = null; + StateToken stateToken = null; + String fileName = null; + FileItem file = null; + for (final Iterator iterator = fileItems.iterator(); iterator.hasNext();) { + final FileItem item = (FileItem) iterator.next(); + if (item.isFormField()) { + final String name = item.getFieldName(); + final String value = item.getString(); + log.info("name: " + name + " value: " + value); + if (name.equals(FileParams.HASH)) { + userHash = value; + } + if (name.equals(FileParams.TOKEN)) { + stateToken = new StateToken(value); + } + } else { + fileName = item.getName(); + log.info("file: " + fileName + " fieldName: " + item.getFieldName() + " size: " + item.getSize()); + file = item; + } + } + createUploadedFile(userHash, stateToken, fileName, file); + onSuccess(response); + } catch (final FileUploadException e) { + onFileUploadException(response); + } catch (final Exception e) { + onOtherException(response, e); + } + } + + protected void doResponse(final HttpServletResponse response, String additionalResponse) throws IOException { + final Writer w = new OutputStreamWriter(response.getOutputStream()); + if (additionalResponse != null) { + w.write(additionalResponse); + } + w.close(); + response.setStatus(HttpServletResponse.SC_OK); + } + + protected void onFileUploadException(final HttpServletResponse response) throws IOException { + doResponse(response, null); + } + + protected void onOtherException(HttpServletResponse response, final Exception e) throws IOException { + log.info("Exception: " + e.getCause()); + e.printStackTrace(); + doResponse(response, null); + } + + protected void onSuccess(HttpServletResponse response) throws IOException { + doResponse(response, null); + } + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java (from rev 911, trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUtils.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUtils.java 2008-10-15 14:12:54 UTC (rev 911) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,113 @@ +package org.ourproject.kune.platf.server.manager.file; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +import org.ourproject.kune.platf.client.dto.StateToken; + +public class FileUtils { + + public static final String SLASH = File.separator; + + /** + * Snippet from: + * http://www.java-tips.org/java-se-tips/java.io/reading-a-file + * -into-a-byte-array.html + */ + public static byte[] getBytesFromFile(File file) throws IOException { + InputStream is = new FileInputStream(file); + + // Get the size of the file + long length = file.length(); + + if (length > Integer.MAX_VALUE) { + // File is too large + } + + // Create the byte array to hold the data + byte[] bytes = new byte[(int) length]; + + // Read in the bytes + int offset = 0; + int numRead = 0; + while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) { + offset += numRead; + } + + // Ensure all the bytes have been read in + if (offset < bytes.length) { + throw new IOException("Could not completely read file " + file.getName()); + } + + // Close the input stream and return bytes + is.close(); + return bytes; + } + + /** + * For filename extension info see: + * http://en.wikipedia.org/wiki/File_name_extension + * + * @param filename + * @return + */ + public static String getFileNameExtension(final String filename, final boolean withDot) { + // also we can use FilenameUtils + if (filename == null) { + return ""; + } + final int dotIndex = filename.lastIndexOf("."); + if (dotIndex == -1 || dotIndex == 0) { + return ""; + } else { + if (withDot) { + final String ext = filename.substring(dotIndex); + return ext.length() == 1 ? "" : ext; + } else { + return filename.substring(dotIndex + 1); + } + } + } + + public static String getFileNameWithoutExtension(final String fileName, final String extension) { + final int extlength = extension.length(); + if (extlength > 0) { + boolean withDot = extension.charAt(0) == '.'; + return fileName.substring(0, fileName.length() - extlength - (withDot ? 0 : 1)); + } else { + return fileName; + } + } + + public static String getNextSequentialFileName(final String fileName) { + final int lastSpace = fileName.lastIndexOf(" "); + if (lastSpace != -1) { + final String suffix = fileName.substring(lastSpace + 1); + try { + final Integer i = new Integer(suffix); + return fileName.substring(0, lastSpace + 1) + (i + 1); + } catch (final NumberFormatException e) { + } + } + return fileName + " 1"; + } + + public static String getNextSequentialFileName(final String fileName, boolean preserveExtension) { + if (!preserveExtension) { + return getNextSequentialFileName(fileName); + } + final int dotIndex = fileName.lastIndexOf("."); + if (dotIndex == -1 || dotIndex == 0) { + return getNextSequentialFileName(fileName); + } else { + final String ext = fileName.substring(dotIndex); + return getNextSequentialFileName(fileName.substring(0, dotIndex)) + ext; + } + } + + public static String toDir(final StateToken stateToken) { + return SLASH + stateToken.getGroup() + SLASH + stateToken.getTool() + SLASH + stateToken.getFolder() + SLASH; + } +} Property changes on: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/ImageUtilsDefault.java (from rev 910, trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/ImageUtilsDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,127 @@ +package org.ourproject.kune.platf.server.manager.file; + +import java.awt.Dimension; +import java.awt.Rectangle; + +import magick.ImageInfo; +import magick.MagickException; +import magick.MagickImage; + +public class ImageUtilsDefault { + + /** + * http://en.wikipedia.org/wiki/Thumbnail + * + */ + public static void createThumb(String fileOrig, String fileDest, int cropDimension) throws MagickException { + createThumb(fileOrig, fileDest, cropDimension, cropDimension); + } + + public static void createThumb(String fileOrig, String fileDest, int thumbDimension, int cropDimension) + throws MagickException { + if (thumbDimension < cropDimension) { + throw new IndexOutOfBoundsException("Thumb dimension must be bigger than crop dimension"); + } + MagickImage imageOrig = createImage(fileOrig); + Dimension origDimension = imageOrig.getDimension(); + int origHeight = origDimension.height; + int origWidth = origDimension.width; + Dimension proportionalDim = calculatePropDim(origWidth, origHeight, thumbDimension, true); + MagickImage scaled = scaleImage(imageOrig, proportionalDim.width, proportionalDim.height); + int x = calculateCenteredCoordinate(proportionalDim.width, cropDimension); + int y = calculateCenteredCoordinate(proportionalDim.height, cropDimension); + cropImage(scaled, fileDest, x, y, cropDimension, cropDimension); + } + + public static boolean cropImage(String fileOrig, String fileDest, int x, int y, int width, int height) + throws MagickException { + Rectangle rectangle = new Rectangle(x, y, width, height); + return cropImage(fileOrig, fileDest, rectangle); + } + + public static boolean cropImage(String fileOrig, String fileDest, Rectangle rectangle) throws MagickException { + return cropImage(createImage(fileOrig), fileDest, rectangle); + } + + public static Dimension getDimension(String file) throws MagickException { + MagickImage imageOrig = createImage(file); + return imageOrig.getDimension(); + } + + public static boolean scaleImage(String fileOrig, String fileDest, Dimension dimension) throws MagickException { + MagickImage imageOrig = createImage(fileOrig); + return scaleImage(imageOrig, fileDest, (int) dimension.getWidth(), (int) dimension.getHeight()); + } + + public static boolean scaleImage(String fileOrig, String fileDest, int width, int height) throws MagickException { + MagickImage imageOrig = createImage(fileOrig); + return scaleImage(imageOrig, fileDest, width, height); + } + + public static boolean scaleImageToMax(String fileOrig, String fileDest, int maxSize) throws MagickException { + MagickImage imageOrig = createImage(fileOrig); + Dimension origDimension = imageOrig.getDimension(); + int origHeight = origDimension.height; + int origWidth = origDimension.width; + Dimension proportionalDim = calculatePropDim(origWidth, origHeight, maxSize, false); + MagickImage scaled = scaleImage(imageOrig, proportionalDim.width, proportionalDim.height); + + return writeImage(scaled, fileDest); + } + + static int calculateCenteredCoordinate(int size, int crop) { + int i = (size - crop) / 2; + return i < 0 ? 0 : i; + } + + static Dimension calculatePropDim(int origWidth, int origHeight, int maxSize) { + return calculatePropDim(origWidth, origHeight, maxSize, true); + } + + static Dimension calculatePropDim(int origWidth, int origHeight, int maxSize, boolean toShortest) { + boolean higher = origHeight > origWidth; + int propHeight = origHeight * maxSize / origWidth; + int propWidth = origWidth * maxSize / origHeight; + double height = toShortest ? (higher ? propHeight : maxSize) : (higher ? maxSize : propHeight); + double width = toShortest ? (!higher ? propWidth : maxSize) : (!higher ? maxSize : propWidth); + if ((higher && origHeight <= maxSize) || (!higher && origWidth <= maxSize)) { + return new Dimension(origWidth, origHeight); + } + return new Dimension((int) width, (int) height); + } + + private static ImageInfo createEmptyImageInfo() throws MagickException { + ImageInfo info = new ImageInfo(); + return info; + } + + private static MagickImage createImage(String file) throws MagickException { + return new MagickImage(new ImageInfo(file)); + } + + private static boolean cropImage(MagickImage fileOrig, String fileDest, int x, int y, int width, int height) + throws MagickException { + Rectangle rectangle = new Rectangle(x, y, width, height); + return cropImage(fileOrig, fileDest, rectangle); + } + + private static boolean cropImage(MagickImage fileOrig, String fileDest, Rectangle rectangle) throws MagickException { + MagickImage cropped = fileOrig.cropImage(rectangle); + return writeImage(cropped, fileDest); + } + + private static MagickImage scaleImage(MagickImage imageOrig, int width, int height) throws MagickException { + return imageOrig.scaleImage(width, height); + } + + private static boolean scaleImage(MagickImage imageOrig, String fileDest, int width, int height) + throws MagickException { + MagickImage imageDest = scaleImage(imageOrig, width, height); + return writeImage(imageDest, fileDest); + } + + private static boolean writeImage(MagickImage imageDest, String fileDest) throws MagickException { + imageDest.setFileName(fileDest); + return imageDest.writeImage(createEmptyImageInfo()); + } +} Property changes on: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/ImageUtilsDefault.java ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/DefaultManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/DefaultManager.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/DefaultManager.java 2008-10-21 19:26:47 UTC (rev 917) @@ -36,71 +36,70 @@ private final Class<T> entityClass; public DefaultManager(final Provider<EntityManager> provider, final Class<T> entityClass) { - this.provider = provider; - this.entityClass = entityClass; + this.provider = provider; + this.entityClass = entityClass; } public T find(final Long primaryKey) { - return getEntityManager().find(entityClass, primaryKey); + return getEntityManager().find(entityClass, primaryKey); } public <E> E merge(final E entity, final Class<E> entityClass) { - getEntityManager().merge(entity); - return entity; + getEntityManager().merge(entity); + return entity; } public T merge(final T entity) { - return getEntityManager().merge(entity); + return getEntityManager().merge(entity); } public <E> E persist(final E entity, final Class<E> entityClass) { - getEntityManager().persist(entity); - return entity; + getEntityManager().persist(entity); + return entity; } public T persist(final T entity) { - return persist(entity, entityClass); + return persist(entity, entityClass); } @SuppressWarnings("unchecked") public void reIndex() { - // Inject this? - final FullTextEntityManager fullTextEm = Search.createFullTextEntityManager(getEntityManager()); - fullTextEm.purgeAll(entityClass); - fullTextEm.getTransaction().commit(); - fullTextEm.getTransaction().begin(); - final List<T> entities = fullTextEm.createQuery("SELECT e FROM " + entityClass.getSimpleName() + " AS e") - .getResultList(); - for (final T e : entities) { - fullTextEm.index(e); - } - fullTextEm.getSearchFactory().optimize(entityClass); + // Inject this? + final FullTextEntityManager fullTextEm = Search.createFullTextEntityManager(getEntityManager()); + fullTextEm.purgeAll(entityClass); + fullTextEm.getTransaction().commit(); + fullTextEm.getTransaction().begin(); + final List<T> entities = fullTextEm.createQuery("SELECT e FROM " + entityClass.getSimpleName() + " AS e").getResultList(); + for (final T e : entities) { + fullTextEm.index(e); + } + fullTextEm.getSearchFactory().optimize(entityClass); } public SearchResult<T> search(final Query query) { - return search(query, null, null); + return search(query, null, null); } @SuppressWarnings("unchecked") public SearchResult<T> search(final Query query, final Integer firstResult, final Integer maxResults) { - final FullTextQuery emQuery = Search.createFullTextEntityManager(getEntityManager()).createFullTextQuery(query, - entityClass); - if (firstResult != null && maxResults != null) { - emQuery.setFirstResult(firstResult); - emQuery.setMaxResults(maxResults); - } - return new SearchResult<T>(new Long(emQuery.getResultSize()), emQuery.getResultList()); + final FullTextQuery emQuery = Search.createFullTextEntityManager(getEntityManager()).createFullTextQuery(query, + entityClass); + if (firstResult != null && maxResults != null) { + emQuery.setFirstResult(firstResult); + emQuery.setMaxResults(maxResults); + } + return new SearchResult<T>(new Long(emQuery.getResultSize()), emQuery.getResultList()); } /** * use carefully!!! */ protected <X> X find(final Class<X> entityClass, final Long primaryKey) { - return getEntityManager().find(entityClass, primaryKey); + return getEntityManager().find(entityClass, primaryKey); } private EntityManager getEntityManager() { - return provider.get(); + return provider.get(); } } Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,125 +0,0 @@ -package org.ourproject.kune.platf.server.manager.impl; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.ContentNotFoundException; -import org.ourproject.kune.platf.client.ui.download.FileParams; -import org.ourproject.kune.platf.client.ui.download.ImageSize; -import org.ourproject.kune.platf.server.access.AccessRol; -import org.ourproject.kune.platf.server.auth.ActionLevel; -import org.ourproject.kune.platf.server.auth.Authenticated; -import org.ourproject.kune.platf.server.auth.Authorizated; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.content.ContentUtils; -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 com.google.inject.Inject; - -/** - * Some snippets from: - * http://www.onjava.com/pub/a/onjava/excerpt/jebp_3/index1.html?page=1 - * - */ -public class FileDownloadManager extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Inject - ContentManager contentManager; - @Inject - KuneProperties kuneProperties; - - public void returnFile(final String filename, final OutputStream out) throws FileNotFoundException, IOException { - InputStream in = null; - try { - in = new BufferedInputStream(new FileInputStream(filename)); - final byte[] buf = new byte[4 * 1024]; // 4K buffer - int bytesRead; - while ((bytesRead = in.read(buf)) != -1) { - out.write(buf, 0, bytesRead); - } - } finally { - if (in != null) { - in.close(); - } - } - } - - @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, - IOException { - - final String userHash = req.getParameter(FileParams.HASH); - final StateToken stateToken = new StateToken(req.getParameter(FileParams.TOKEN)); - final String downloadS = req.getParameter(FileParams.DOWNLOAD); - String imageSizeS = req.getParameter(FileParams.IMGSIZE); - final ImageSize imgsize = imageSizeS == null ? null : ImageSize.valueOf(imageSizeS); - final boolean download = downloadS != null && downloadS.equals("true") ? true : false; - - final Content cnt = getContentForDownload(userHash, stateToken); - - final String absDir = kuneProperties.get(KuneProperties.UPLOAD_LOCATION) + FileUtils.toDir(stateToken); - String filename = cnt.getFilename(); - String extension = FileUtils.getFileNameExtension(filename, true); - BasicMimeType mimeType = cnt.getMimeType(); - - if (mimeType.getType().equals("image")) { - String imgsizePrefix = imgsize == null ? "" : "." + imgsize; - String filenameWithoutExtension = FileUtils.getFileNameWithoutExtension(filename, extension); - String filenameResized = filenameWithoutExtension + imgsizePrefix + extension; - if (new File(absDir + filenameResized).exists()) { - // thumb can fail - filename = filenameResized; - } - } - - final String absFilename = absDir + filename; - - doBuildResp(resp, absFilename, cnt.getTitle(), mimeType, extension, download); - } - - private void doBuildResp(final HttpServletResponse resp, final String filename, final String otherName, - final BasicMimeType mimeType, final String extension, final boolean download) throws FileNotFoundException, - IOException { - final File file = new File(filename); - - resp.setContentLength((int) file.length()); - if (mimeType == null || download) { - resp.setContentType("application/x-download"); - } else if (mimeType.getType().equals("image")) { - resp.setContentType(mimeType.toString()); - } else { - resp.setContentType("application/x-download"); - } - resp.setHeader("Content-Disposition", "attachment; filename=\"" + otherName + extension + "\""); - - final OutputStream out = resp.getOutputStream(); - returnFile(filename, out); - } - - @Authenticated(mandatory = false) - @Authorizated(accessRolRequired = AccessRol.Viewer, actionLevel = ActionLevel.content) - private Content getContentForDownload(final String userHash, final StateToken stateToken) throws ServletException { - try { - return contentManager.find(ContentUtils.parseId(stateToken.getDocument())); - } catch (final ContentNotFoundException e) { - // what response to send in this case ? - throw new ServletException(); - } - - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileManagerDefault.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileManagerDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,38 +0,0 @@ -package org.ourproject.kune.platf.server.manager.impl; - -import java.io.File; -import java.io.IOException; - -import org.ourproject.kune.platf.server.manager.FileManager; - -import com.google.inject.Singleton; - -@Singleton -public class FileManagerDefault implements FileManager { - - public File createFileWithSequentialName(final String dir, final String fileName) throws IOException { - String fileNameProposal = new String(fileName); - File file = new File(dir, fileNameProposal); - while (file.exists()) { - fileNameProposal = FileUtils.getNextSequentialFileName(fileNameProposal, true); - file = new File(dir, fileNameProposal); - } - file.createNewFile(); - return file; - } - - public boolean mkdir(final String dir) { - return (new File(dir)).mkdirs(); - } - - public void rmdir(final String dir) { - final File file = new File(dir); - if (!file.isDirectory()) { - throw new RuntimeException("rmdir: " + dir + ": Not a directory"); - } - if (file.listFiles().length != 0) { - throw new RuntimeException("rmdir: " + dir + ": Directory not empty"); - } - file.delete(); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,231 +0,0 @@ -package org.ourproject.kune.platf.server.manager.impl; - -import java.io.File; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.util.Iterator; -import java.util.List; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import magick.MagickException; -import net.sf.json.JSONObject; - -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.docs.server.DocumentServerTool; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.services.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.download.ImageSize; -import org.ourproject.kune.platf.client.ui.upload.FileUploader; -import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.access.AccessRol; -import org.ourproject.kune.platf.server.access.AccessService; -import org.ourproject.kune.platf.server.auth.ActionLevel; -import org.ourproject.kune.platf.server.auth.Authenticated; -import org.ourproject.kune.platf.server.auth.Authorizated; -import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.content.ContentUtils; -import org.ourproject.kune.platf.server.domain.BasicMimeType; -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 org.ourproject.kune.platf.server.manager.FileManager; -import org.ourproject.kune.platf.server.properties.KuneProperties; - -import com.google.inject.Inject; -import com.google.inject.servlet.RequestScoped; -import com.wideplay.warp.persist.TransactionType; -import com.wideplay.warp.persist.Transactional; - -@RequestScoped -public class FileUploadManager extends HttpServlet { - - private static final long serialVersionUID = 1L; - - public static final Log log = LogFactory.getLog(FileUploadManager.class); - - private static final String UTF8 = "UTF-8"; - - @Inject - KuneProperties kuneProperties; - @Inject - UserSession userSession; - @Inject - ContentManager contentManager; - @Inject - AccessService accessService; - @Inject - FileManager fileManager; - @Inject - I18nTranslationService i18n; - - @Override - @SuppressWarnings( { "unchecked", "deprecation" }) - protected void doPost(final HttpServletRequest req, final HttpServletResponse response) throws ServletException, - IOException { - - JSONObject jsonResponse = createSuccessResponse(); - - final DiskFileItemFactory factory = new DiskFileItemFactory(); - // maximum size that will be stored in memory - factory.setSizeThreshold(4096); - // the location for saving data that is larger than getSizeThreshold() - factory.setRepository(new File("/tmp")); - - if (!ServletFileUpload.isMultipartContent(req)) { - log.warn("Not a multipart upload"); - } - - final ServletFileUpload upload = new ServletFileUpload(factory); - // maximum size before a FileUploadException will be thrown - upload.setSizeMax(new Integer(kuneProperties.get(KuneProperties.UPLOAD_MAX_FILE_SIZE)) * 1024 * 1024); - - try { - final List fileItems = upload.parseRequest(req); - String userHash = null; - StateToken stateToken = null; - String fileName = null; - FileItem file = null; - for (final Iterator iterator = fileItems.iterator(); iterator.hasNext();) { - final FileItem item = (FileItem) iterator.next(); - if (item.isFormField()) { - final String name = item.getFieldName(); - final String value = item.getString(); - log.info("name: " + name + " value: " + value); - if (name.equals(FileUploader.USERHASH)) { - userHash = value; - } - if (name.equals(FileUploader.CURRENT_STATE_TOKEN)) { - stateToken = new StateToken(value); - } - } else { - fileName = item.getName(); - log.info("file: " + fileName + " fieldName: " + item.getFieldName() + " size: " + item.getSize()); - file = item; - } - } - createUploadedFile(userHash, stateToken, fileName, file); - } catch (final FileUploadException e) { - jsonResponse = createJsonResponse(false, i18n.t("Error: File too large")); - } catch (final Exception e) { - jsonResponse = createJsonResponse(false, i18n.t("Error uploading file")); - log.info("Exception: " + e.getCause()); - e.printStackTrace(); - } - - final Writer w = new OutputStreamWriter(response.getOutputStream()); - response.setCharacterEncoding("utf-8"); - response.setContentType("text/html"); - // response.setContentType("text/json"); - w.write(jsonResponse.toString()); - w.close(); - response.setStatus(HttpServletResponse.SC_OK); - } - - @Authenticated - @Authorizated(accessRolRequired = AccessRol.Editor, actionLevel = ActionLevel.container) - @Transactional(type = TransactionType.READ_WRITE) - Content createUploadedFile(final String userHash, final StateToken stateToken, final String fileName, - final FileItem fileUploadItem) throws Exception { - final String relDir = FileUtils.toDir(stateToken); - final String absDir = kuneProperties.get(KuneProperties.UPLOAD_LOCATION) + relDir; - fileManager.mkdir(absDir); - - File file = null; - try { - final String filenameUTF8 = new String(fileName.getBytes(), UTF8); - file = fileManager.createFileWithSequentialName(absDir, filenameUTF8); - fileUploadItem.write(file); - - final String mimetype = fileUploadItem.getContentType(); - BasicMimeType basicMimeType = new BasicMimeType(mimetype); - log.info("Mimetype: " + basicMimeType); - final String extension = FileUtils.getFileNameExtension(file.getName(), false); - - if (basicMimeType.getType().equals("image")) { - generateThumbs(absDir, file.getName(), extension); - } - - // Persist - final User user = userSession.getUser(); - final Container container = accessService.accessToContainer(ContentUtils.parseId(stateToken.getFolder()), - user, AccessRol.Editor); - final String preview = "Preview of this file (in development)"; - final Content content = contentManager.createContent(FileUtils.getFileNameWithoutExtension(file.getName(), - extension), preview, user, container); - content.setTypeId(DocumentServerTool.TYPE_UPLOADEDFILE); - content.setMimeType(basicMimeType); - content.setFilename(file.getName()); - return content; - } catch (final Exception e) { - if (file != null && file.exists()) { - file.delete(); - } - throw e; - } - } - - private JSONObject createJsonResponse(final boolean success, final String message) { - /** - * - * http://max-bazhenov.com/dev/upload-dialog-2.0/index.php - * - * Server side handler. - * - * The files in the queue are posted one at a time, the file field name - * is 'file'. The handler should return json encoded object with - * following properties: { success: true|false, // required error: - * 'Error or success message' // optional, also can be named 'message' } - */ - - JSONObject response = null; - try { - response = new JSONObject(); - response.put("success", success); - response.put("error", message); - response.put("code", "232"); - } catch (final Exception e) { - log.error("Error building response"); - } - return response; - } - - private JSONObject createSuccessResponse() { - return createJsonResponse(true, i18n.t("Success uploading")); - } - - private void generateThumbs(String absDir, String filename, String extension) { - try { - String fileOrig = absDir + filename; - String withoutExtension = FileUtils.getFileNameWithoutExtension(filename, extension); - - String resizeName = absDir + withoutExtension + "." + ImageSize.sized + "." + extension; - String thumbName = absDir + withoutExtension + "." + ImageSize.thumb + "." + extension; - String iconName = absDir + withoutExtension + "." + ImageSize.ico + "." + extension; - - int resizeWidth = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_RESIZEWIDTH)); - int thumbSize = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_THUMBSIZE)); - int cropSize = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_CROPSIZE)); - int iconSize = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_ICONSIZE)); - - ImageUtilsDefault.scaleImageToMax(fileOrig, resizeName, resizeWidth); - ImageUtilsDefault.createThumb(fileOrig, thumbName, thumbSize, cropSize); - ImageUtilsDefault.createThumb(fileOrig, iconName, iconSize); - - } catch (NumberFormatException e) { - log.error("Image sizes in kune.properties are not integers"); - e.printStackTrace(); - } catch (MagickException e) { - log.info("Problem generating image thumb for " + filename); - } - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUtils.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUtils.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,75 +0,0 @@ -package org.ourproject.kune.platf.server.manager.impl; - -import java.io.File; - -import org.ourproject.kune.platf.client.dto.StateToken; - -public class FileUtils { - - public static final String SLASH = File.separator; - - /** - * For filename extension info see: - * http://en.wikipedia.org/wiki/File_name_extension - * - * @param filename - * @return - */ - public static String getFileNameExtension(final String filename, final boolean withDot) { - // also we can use FilenameUtils - if (filename == null) { - return ""; - } - final int dotIndex = filename.lastIndexOf("."); - if (dotIndex == -1 || dotIndex == 0) { - return ""; - } else { - if (withDot) { - final String ext = filename.substring(dotIndex); - return ext.length() == 1 ? "" : ext; - } else { - return filename.substring(dotIndex + 1); - } - } - } - - public static String getFileNameWithoutExtension(final String fileName, final String extension) { - final int extlength = extension.length(); - if (extlength > 0) { - boolean withDot = extension.charAt(0) == '.'; - return fileName.substring(0, fileName.length() - extlength - (withDot ? 0 : 1)); - } else { - return fileName; - } - } - - public static String getNextSequentialFileName(final String fileName) { - final int lastSpace = fileName.lastIndexOf(" "); - if (lastSpace != -1) { - final String suffix = fileName.substring(lastSpace + 1); - try { - final Integer i = new Integer(suffix); - return fileName.substring(0, lastSpace + 1) + (i + 1); - } catch (final NumberFormatException e) { - } - } - return fileName + " 1"; - } - - public static String getNextSequentialFileName(final String fileName, boolean preserveExtension) { - if (!preserveExtension) { - return getNextSequentialFileName(fileName); - } - final int dotIndex = fileName.lastIndexOf("."); - if (dotIndex == -1 || dotIndex == 0) { - return getNextSequentialFileName(fileName); - } else { - final String ext = fileName.substring(dotIndex); - return getNextSequentialFileName(fileName.substring(0, dotIndex)) + ext; - } - } - - public static String toDir(final StateToken stateToken) { - return SLASH + stateToken.getGroup() + SLASH + stateToken.getTool() + SLASH + stateToken.getFolder() + SLASH; - } -} 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -89,13 +89,13 @@ UserMustBeLoggedException { final String defaultSiteWorkspaceTheme = kuneProperties.get(KuneProperties.WS_THEMES_DEF); if (User.isKnownUser(user)) { - if (group.getType().equals(GroupType.COMMUNITY)) { + if (group.getGroupType().equals(GroupType.COMMUNITY)) { group.setAdmissionType(AdmissionType.Open); - } else if (group.getType().equals(GroupType.ORGANIZATION)) { + } else if (group.getGroupType().equals(GroupType.ORGANIZATION)) { group.setAdmissionType(AdmissionType.Moderated); - } else if (group.getType().equals(GroupType.PROJECT)) { + } else if (group.getGroupType().equals(GroupType.PROJECT)) { group.setAdmissionType(AdmissionType.Moderated); - } else if (group.getType().equals(GroupType.ORPHANED_PROJECT)) { + } else if (group.getGroupType().equals(GroupType.ORPHANED_PROJECT)) { group.setAdmissionType(AdmissionType.Open); } final String licName = group.getDefaultLicense().getShortName(); @@ -192,7 +192,7 @@ public void setGroupLogo(final Group group, final Content content) { if (content.getMimeType().getType().equals("image")) { - group.setGroupLogo(content); + group.setGroupFullLogo(content); } else { new DefaultException("Trying to set not a image as group logo"); } @@ -217,7 +217,7 @@ final AccessLists lists = network.getAccessLists(); lists.getEditors().setMode(GroupListMode.NOBODY); lists.getViewers().setMode(GroupListMode.EVERYONE); - if (!group.getType().equals(GroupType.ORPHANED_PROJECT)) { + if (!group.getGroupType().equals(GroupType.ORPHANED_PROJECT)) { network.addAdmin(userGroup); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -40,7 +40,7 @@ @Singleton public class I18nTranslationManagerDefault extends DefaultManager<I18nTranslation, Long> implements - I18nTranslationManager { + I18nTranslationManager { private final I18nTranslation finder; private final ConcurrentHashMap<String, HashMap<String, String>> langCache; @@ -48,133 +48,133 @@ @Inject public I18nTranslationManagerDefault(final Provider<EntityManager> provider, final I18nTranslation finder, - final I18nLanguageManager languageManager) { - super(provider, I18nTranslation.class); - this.finder = finder; - this.languageManager = languageManager; - langCache = new ConcurrentHashMap<String, HashMap<String, String>>(); + final I18nLanguageManager languageManager) { + super(provider, I18nTranslation.class); + this.finder = finder; + this.languageManager = languageManager; + langCache = new ConcurrentHashMap<String, HashMap<String, String>>(); } public HashMap<String, String> getLexicon(final String language) { - HashMap<String, String> map = langCache.get(language); - if (map == null) { - map = getLexiconFromDb(language); - } - return map; + HashMap<String, String> map = langCache.get(language); + if (map == null) { + map = getLexiconFromDb(language); + } + return map; } public List<I18nTranslation> getTranslatedLexicon(final String languageCode) { - final I18nLanguage language = languageManager.findByCode(languageCode); - return finder.getTranslatedLexicon(language); + final I18nLanguage language = languageManager.findByCode(languageCode); + return finder.getTranslatedLexicon(language); } public SearchResult<I18nTranslation> getTranslatedLexicon(final String languageCode, final Integer firstResult, - final Integer maxResults) { - final I18nLanguage language = languageManager.findByCode(languageCode); - final List<I18nTranslation> list = finder.getTranslatedLexicon(language, firstResult, maxResults); - final Long count = finder.getTranslatedLexiconCount(language); - return new SearchResult<I18nTranslation>(count, list); + final Integer maxResults) { + final I18nLanguage language = languageManager.findByCode(languageCode); + final List<I18nTranslation> list = finder.getTranslatedLexicon(language, firstResult, maxResults); + final Long count = finder.getTranslatedLexiconCount(language); + return new SearchResult<I18nTranslation>(count, list); } public String getTranslation(final String language, final String text) { - final HashMap<String, String> lexicon = getLexicon(language); - final String escapedText = KuneStringUtils.escapeHtmlLight(text); - if (lexicon.containsKey(escapedText)) { - final String translation = lexicon.get(escapedText); - return translation; - } else { - // new key, add to language and default language and let - // untranslated - if (!getLexicon(I18nTranslation.DEFAULT_LANG).containsKey(text)) { - final I18nTranslation newTranslation = new I18nTranslation("", null, I18nTranslation.DEF_PLUR_INDEX, - "", I18nTranslation.UNTRANSLATED_VALUE, escapedText, I18nTranslation.DEF_NAMESPACE, - languageManager.findByCode(I18nTranslation.DEFAULT_LANG)); - persist(newTranslation); - langCache.clear(); - } - return I18nTranslation.UNTRANSLATED_VALUE; - } + final HashMap<String, String> lexicon = getLexicon(language); + final String escapedText = KuneStringUtils.escapeHtmlLight(text); + if (lexicon.containsKey(escapedText)) { + final String translation = lexicon.get(escapedText); + return translation; + } else { + // new key, add to language and default language and let + // untranslated + if (!getLexicon(I18nTranslation.DEFAULT_LANG).containsKey(text)) { + final I18nTranslation newTranslation = new I18nTranslation("", null, I18nTranslation.DEF_PLUR_INDEX, + "", I18nTranslation.UNTRANSLATED_VALUE, escapedText, I18nTranslation.DEF_NAMESPACE, + languageManager.findByCode(I18nTranslation.DEFAULT_LANG)); + persist(newTranslation); + langCache.clear(); + } + return I18nTranslation.UNTRANSLATED_VALUE; + } } public String getTranslation(final String language, final String text, final Integer arg) { - String translation = getTranslation(language, text); - translation = translation.replaceFirst("\\[%d\\]", arg.toString()); - return translation; + String translation = getTranslation(language, text); + translation = translation.replaceFirst("\\[%d\\]", arg.toString()); + return translation; } public String getTranslation(final String language, final String text, final String arg) { - String translation = getTranslation(language, text); - translation = translation.replaceFirst("\\[%s\\]", arg); - return translation; + String translation = getTranslation(language, text); + translation = translation.replaceFirst("\\[%s\\]", arg); + return translation; } public List<I18nTranslation> getUntranslatedLexicon(final String languageCode) { - final I18nLanguage language = initUnstranlated(languageCode); - return finder.getUnstranslatedLexicon(language); + final I18nLanguage language = initUnstranlated(languageCode); + return finder.getUnstranslatedLexicon(language); } public SearchResult<I18nTranslation> getUntranslatedLexicon(final String languageCode, final Integer firstResult, - final Integer maxResults) { - final I18nLanguage language = initUnstranlated(languageCode); - final Long count = finder.getUnstranslatedLexiconCount(language); - final List<I18nTranslation> list = finder.getUnstranslatedLexicon(language, firstResult, maxResults); - return new SearchResult<I18nTranslation>(count, list); + final Integer maxResults) { + final I18nLanguage language = initUnstranlated(languageCode); + final Long count = finder.getUnstranslatedLexiconCount(language); + final List<I18nTranslation> list = finder.getUnstranslatedLexicon(language, firstResult, maxResults); + return new SearchResult<I18nTranslation>(count, list); } public String setTranslation(final String id, final String translation) throws DefaultException { - final I18nTranslation trans = super.find(new Long(id)); - if (trans != null) { - final String escapedTranslation = KuneStringUtils.escapeHtmlLight(translation); - trans.setText(escapedTranslation); - persist(trans); - return escapedTranslation; - } else { - throw new DefaultException("Trying to translate a unknown item"); - } + final I18nTranslation trans = super.find(new Long(id)); + if (trans != null) { + final String escapedTranslation = KuneStringUtils.escapeHtmlLight(translation); + trans.setText(escapedTranslation); + persist(trans); + return escapedTranslation; + } else { + throw new DefaultException("Trying to translate a unknown item"); + } } public void setTranslation(final String languageId, final String text, final String translation) { - final I18nLanguage language = languageManager.findByCode(languageId); - final I18nTranslation newTranslation = new I18nTranslation(text, language, translation); - persist(newTranslation); - if (languageId != I18nTranslation.DEFAULT_LANG) { - langCache.remove(languageId); - } else { - langCache.clear(); - } + final I18nLanguage language = languageManager.findByCode(languageId); + final I18nTranslation newTranslation = new I18nTranslation(text, language, translation); + persist(newTranslation); + if (languageId != I18nTranslation.DEFAULT_LANG) { + langCache.remove(languageId); + } else { + langCache.clear(); + } } @SuppressWarnings("unchecked") private HashMap<String, String> getLexiconFromDb(final String language) { - HashMap<String, String> map = new HashMap<String, String>(); - final List<I18nTranslation> set = finder.findByLanguage(language); - if (!language.equals(I18nTranslation.DEFAULT_LANG)) { - map = (HashMap<String, String>) getLexicon(I18nTranslation.DEFAULT_LANG).clone(); - } - for (final Iterator<I18nTranslation> iterator = set.iterator(); iterator.hasNext();) { - final I18nTranslation trans = iterator.next(); - map.put(trans.getTrKey(), trans.getText()); - } - langCache.put(language, map); - return map; + HashMap<String, String> map = new HashMap<String, String>(); + final List<I18nTranslation> set = finder.findByLanguage(language); + if (!language.equals(I18nTranslation.DEFAULT_LANG)) { + map = (HashMap<String, String>) getLexicon(I18nTranslation.DEFAULT_LANG).clone(); + } + for (final Iterator<I18nTranslation> iterator = set.iterator(); iterator.hasNext();) { + final I18nTranslation trans = iterator.next(); + map.put(trans.getTrKey(), trans.getText()); + } + langCache.put(language, map); + return map; } private I18nLanguage initUnstranlated(final String languageCode) { - final I18nLanguage defLanguage = languageManager.findByCode(I18nTranslation.DEFAULT_LANG); - I18nLanguage language; - if (languageCode.equals(I18nTranslation.DEFAULT_LANG)) { - language = defLanguage; - } else { - language = languageManager.findByCode(languageCode); - final List<I18nTranslation> list = finder.getNonExistentFromDefault(defLanguage, language); - for (final Iterator<I18nTranslation> iterator = list.iterator(); iterator.hasNext();) { - final I18nTranslation defTrans = iterator.next(); - final I18nTranslation newTrans = defTrans.cloneForNewLanguage(); - newTrans.setLanguage(language); - persist(newTrans); - } - } - return language; + final I18nLanguage defLanguage = languageManager.findByCode(I18nTranslation.DEFAULT_LANG); + I18nLanguage language; + if (languageCode.equals(I18nTranslation.DEFAULT_LANG)) { + language = defLanguage; + } else { + language = languageManager.findByCode(languageCode); + final List<I18nTranslation> list = finder.getNonExistentFromDefault(defLanguage, language); + for (final Iterator<I18nTranslation> iterator = list.iterator(); iterator.hasNext();) { + final I18nTranslation defTrans = iterator.next(); + final I18nTranslation newTrans = defTrans.cloneForNewLanguage(); + newTrans.setLanguage(language); + persist(newTrans); + } + } + return language; } } Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,127 +0,0 @@ -package org.ourproject.kune.platf.server.manager.impl; - -import java.awt.Dimension; -import java.awt.Rectangle; - -import magick.ImageInfo; -import magick.MagickException; -import magick.MagickImage; - -public class ImageUtilsDefault { - - /** - * http://en.wikipedia.org/wiki/Thumbnail - * - */ - public static void createThumb(String fileOrig, String fileDest, int cropDimension) throws MagickException { - createThumb(fileOrig, fileDest, cropDimension, cropDimension); - } - - public static void createThumb(String fileOrig, String fileDest, int thumbDimension, int cropDimension) - throws MagickException { - if (thumbDimension < cropDimension) { - throw new IndexOutOfBoundsException("Thumb dimension must be bigger than crop dimension"); - } - MagickImage imageOrig = createImage(fileOrig); - Dimension origDimension = imageOrig.getDimension(); - int origHeight = origDimension.height; - int origWidth = origDimension.width; - Dimension proportionalDim = calculatePropDim(origWidth, origHeight, thumbDimension, true); - MagickImage scaled = scaleImage(imageOrig, proportionalDim.width, proportionalDim.height); - int x = calculateCenteredCoordinate(proportionalDim.width, cropDimension); - int y = calculateCenteredCoordinate(proportionalDim.height, cropDimension); - cropImage(scaled, fileDest, x, y, cropDimension, cropDimension); - } - - public static boolean cropImage(String fileOrig, String fileDest, int x, int y, int width, int height) - throws MagickException { - Rectangle rectangle = new Rectangle(x, y, width, height); - return cropImage(fileOrig, fileDest, rectangle); - } - - public static boolean cropImage(String fileOrig, String fileDest, Rectangle rectangle) throws MagickException { - return cropImage(createImage(fileOrig), fileDest, rectangle); - } - - public static Dimension getDimension(String file) throws MagickException { - MagickImage imageOrig = createImage(file); - return imageOrig.getDimension(); - } - - public static boolean scaleImage(String fileOrig, String fileDest, Dimension dimension) throws MagickException { - MagickImage imageOrig = createImage(fileOrig); - return scaleImage(imageOrig, fileDest, (int) dimension.getWidth(), (int) dimension.getHeight()); - } - - public static boolean scaleImage(String fileOrig, String fileDest, int width, int height) throws MagickException { - MagickImage imageOrig = createImage(fileOrig); - return scaleImage(imageOrig, fileDest, width, height); - } - - public static boolean scaleImageToMax(String fileOrig, String fileDest, int maxSize) throws MagickException { - MagickImage imageOrig = createImage(fileOrig); - Dimension origDimension = imageOrig.getDimension(); - int origHeight = origDimension.height; - int origWidth = origDimension.width; - Dimension proportionalDim = calculatePropDim(origWidth, origHeight, maxSize, false); - MagickImage scaled = scaleImage(imageOrig, proportionalDim.width, proportionalDim.height); - - return writeImage(scaled, fileDest); - } - - static int calculateCenteredCoordinate(int size, int crop) { - int i = (size - crop) / 2; - return i < 0 ? 0 : i; - } - - static Dimension calculatePropDim(int origWidth, int origHeight, int maxSize) { - return calculatePropDim(origWidth, origHeight, maxSize, true); - } - - static Dimension calculatePropDim(int origWidth, int origHeight, int maxSize, boolean toShortest) { - boolean higher = origHeight > origWidth; - int propHeight = origHeight * maxSize / origWidth; - int propWidth = origWidth * maxSize / origHeight; - double height = toShortest ? (higher ? propHeight : maxSize) : (higher ? maxSize : propHeight); - double width = toShortest ? (!higher ? propWidth : maxSize) : (!higher ? maxSize : propWidth); - if ((higher && origHeight <= maxSize) || (!higher && origWidth <= maxSize)) { - return new Dimension(origWidth, origHeight); - } - return new Dimension((int) width, (int) height); - } - - private static ImageInfo createEmptyImageInfo() throws MagickException { - ImageInfo info = new ImageInfo(); - return info; - } - - private static MagickImage createImage(String file) throws MagickException { - return new MagickImage(new ImageInfo(file)); - } - - private static boolean cropImage(MagickImage fileOrig, String fileDest, int x, int y, int width, int height) - throws MagickException { - Rectangle rectangle = new Rectangle(x, y, width, height); - return cropImage(fileOrig, fileDest, rectangle); - } - - private static boolean cropImage(MagickImage fileOrig, String fileDest, Rectangle rectangle) throws MagickException { - MagickImage cropped = fileOrig.cropImage(rectangle); - return writeImage(cropped, fileDest); - } - - private static MagickImage scaleImage(MagickImage imageOrig, int width, int height) throws MagickException { - return imageOrig.scaleImage(width, height); - } - - private static boolean scaleImage(MagickImage imageOrig, String fileDest, int width, int height) - throws MagickException { - MagickImage imageDest = scaleImage(imageOrig, width, height); - return writeImage(imageDest, fileDest); - } - - private static boolean writeImage(MagickImage imageDest, String fileDest) throws MagickException { - imageDest.setFileName(fileDest); - return imageDest.writeImage(createEmptyImageInfo()); - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/LicenseManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/LicenseManagerDefault.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/LicenseManagerDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -37,31 +37,31 @@ @Inject public LicenseManagerDefault(final Provider<EntityManager> provider) { - super(provider, License.class); + super(provider, License.class); } public List<License> getAll() { - return licenseFinder.getAll(); + return licenseFinder.getAll(); } public List<License> getNotCC() { - return licenseFinder.getNotCC(); + return licenseFinder.getNotCC(); } public List<License> getCC() { - return licenseFinder.getCC(); + return licenseFinder.getCC(); } public License persist(final License license) { - return super.persist(license); + return super.persist(license); } @Inject public void setLicenseFinder(final License licenseFinder) { - this.licenseFinder = licenseFinder; + this.licenseFinder = licenseFinder; } public License findByShortName(String shortName) { - return licenseFinder.findByShortName(shortName); + return licenseFinder.findByShortName(shortName); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -53,223 +53,223 @@ @Inject public SocialNetworkManagerDefault(final Provider<EntityManager> provider, final Group finder, - final AccessRightsService accessRightsService) { - super(provider, SocialNetwork.class); - this.finder = finder; - this.accessRightsService = accessRightsService; + final AccessRightsService accessRightsService) { + super(provider, SocialNetwork.class); + this.finder = finder; + this.accessRightsService = accessRightsService; } public void acceptJoinGroup(final User userLogged, final Group group, final Group inGroup) throws DefaultException, - AccessViolationException { - final SocialNetwork sn = inGroup.getSocialNetwork(); - checkUserLoggedIsAdmin(userLogged, sn); - final List<Group> pendingCollabs = sn.getPendingCollaborators().getList(); - if (pendingCollabs.contains(group)) { - sn.addCollaborator(group); - sn.removePendingCollaborator(group); - } else { - throw new DefaultException("User is not a pending collaborator"); - } + AccessViolationException { + final SocialNetwork sn = inGroup.getSocialNetwork(); + checkUserLoggedIsAdmin(userLogged, sn); + final List<Group> pendingCollabs = sn.getPendingCollaborators().getList(); + if (pendingCollabs.contains(group)) { + sn.addCollaborator(group); + sn.removePendingCollaborator(group); + } else { + throw new DefaultException("User is not a pending collaborator"); + } } public void addGroupToAdmins(final User userLogged, final Group group, final Group inGroup) throws DefaultException { - checkGroupAddingToSelf(group, inGroup); - final SocialNetwork sn = inGroup.getSocialNetwork(); - checkUserLoggedIsAdmin(userLogged, sn); - checkGroupIsNotAlreadyAMember(group, sn); - sn.addAdmin(group); - if (sn.isPendingCollab(group)) { - sn.removePendingCollaborator(group); - } + checkGroupAddingToSelf(group, inGroup); + final SocialNetwork sn = inGroup.getSocialNetwork(); + checkUserLoggedIsAdmin(userLogged, sn); + checkGroupIsNotAlreadyAMember(group, sn); + sn.addAdmin(group); + if (sn.isPendingCollab(group)) { + sn.removePendingCollaborator(group); + } } public void addGroupToCollabs(final User userLogged, final Group group, final Group inGroup) - throws DefaultException { - checkGroupAddingToSelf(group, inGroup); - final SocialNetwork sn = inGroup.getSocialNetwork(); - checkUserLoggedIsAdmin(userLogged, sn); - checkGroupIsNotAlreadyAMember(group, sn); - sn.addCollaborator(group); - if (sn.isPendingCollab(group)) { - sn.removePendingCollaborator(group); - } + throws DefaultException { + checkGroupAddingToSelf(group, inGroup); + final SocialNetwork sn = inGroup.getSocialNetwork(); + checkUserLoggedIsAdmin(userLogged, sn); + checkGroupIsNotAlreadyAMember(group, sn); + sn.addCollaborator(group); + if (sn.isPendingCollab(group)) { + sn.removePendingCollaborator(group); + } } public void addGroupToViewers(final User userLogged, final Group group, final Group inGroup) - throws DefaultException { - checkGroupAddingToSelf(group, inGroup); - final SocialNetwork sn = inGroup.getSocialNetwork(); - checkUserLoggedIsAdmin(userLogged, sn); - checkGroupIsNotAlreadyAMember(group, sn); - sn.addViewer(group); - if (sn.isPendingCollab(group)) { - sn.removePendingCollaborator(group); - } + throws DefaultException { + checkGroupAddingToSelf(group, inGroup); + final SocialNetwork sn = inGroup.getSocialNetwork(); + checkUserLoggedIsAdmin(userLogged, sn); + checkGroupIsNotAlreadyAMember(group, sn); + sn.addViewer(group); + if (sn.isPendingCollab(group)) { + sn.removePendingCollaborator(group); + } } public void deleteMember(final User userLogged, final Group group, final Group inGroup) throws DefaultException, - AccessViolationException { - final SocialNetwork sn = inGroup.getSocialNetwork(); + AccessViolationException { + final SocialNetwork sn = inGroup.getSocialNetwork(); - checkUserLoggedIsAdmin(userLogged, sn); - unJoinGroup(group, inGroup); + checkUserLoggedIsAdmin(userLogged, sn); + unJoinGroup(group, inGroup); } public void denyJoinGroup(final User userLogged, final Group group, final Group inGroup) throws DefaultException { - final SocialNetwork sn = inGroup.getSocialNetwork(); - checkUserLoggedIsAdmin(userLogged, sn); - final List<Group> pendingCollabs = sn.getPendingCollaborators().getList(); - if (pendingCollabs.contains(group)) { - sn.removePendingCollaborator(group); - } else { - throw new DefaultException("Person/Group is not a pending collaborator"); - } + final SocialNetwork sn = inGroup.getSocialNetwork(); + checkUserLoggedIsAdmin(userLogged, sn); + final List<Group> pendingCollabs = sn.getPendingCollaborators().getList(); + if (pendingCollabs.contains(group)) { + sn.removePendingCollaborator(group); + } else { + throw new DefaultException("Person/Group is not a pending collaborator"); + } } public ParticipationData findParticipation(final User userLogged, final Group group) - throws AccessViolationException { - get(userLogged, group); // check access - final Long groupId = group.getId(); - final List<Group> adminInGroups = finder.findAdminInGroups(groupId); - // Don't show self user group - if (group.getType().equals(GroupType.PERSONAL)) { - adminInGroups.remove(group); - } - // adminInGroups.remove(userLogged.getUserGroup()); - final List<Group> collabInGroups = finder.findCollabInGroups(groupId); - return new ParticipationData(adminInGroups, collabInGroups); + throws AccessViolationException { + get(userLogged, group); // check access + final Long groupId = group.getId(); + final List<Group> adminInGroups = finder.findAdminInGroups(groupId); + // Don't show self user group + if (group.getGroupType().equals(GroupType.PERSONAL)) { + adminInGroups.remove(group); + } + // adminInGroups.remove(userLogged.getUserGroup()); + final List<Group> collabInGroups = finder.findCollabInGroups(groupId); + return new ParticipationData(adminInGroups, collabInGroups); } public SocialNetwork get(final User petitioner, final Group group) throws AccessViolationException { - final SocialNetwork sn = group.getSocialNetwork(); - if (!sn.getAccessLists().getViewers().includes(petitioner.getUserGroup())) { - throw new AccessViolationException(); - } - return sn; + final SocialNetwork sn = group.getSocialNetwork(); + if (!sn.getAccessLists().getViewers().includes(petitioner.getUserGroup())) { + throw new AccessViolationException(); + } + return sn; } public SocialNetworkRequestResult requestToJoin(final User userLogged, final Group inGroup) - throws DefaultException, UserMustBeLoggedException { - final SocialNetwork sn = inGroup.getSocialNetwork(); - if (!User.isKnownUser(userLogged)) { - throw new UserMustBeLoggedException(); - } - final AdmissionType admissionType = inGroup.getAdmissionType(); - if (admissionType == null) { - throw new RuntimeException(); - } - final Group userGroup = userLogged.getUserGroup(); - checkGroupIsNotAlreadyAMember(userGroup, sn); - if (isModerated(admissionType)) { - sn.addPendingCollaborator(userGroup); - return SocialNetworkRequestResult.moderated; - } else if (isOpen(admissionType)) { - if (inGroup.getType().equals(GroupType.ORPHANED_PROJECT)) { - sn.addAdmin(userGroup); - inGroup.setType(GroupType.PROJECT); - inGroup.setAdmissionType(AdmissionType.Moderated); - persist(inGroup, Group.class); - } else { - sn.addCollaborator(userGroup); - } - return SocialNetworkRequestResult.accepted; - } else if (isClosed(admissionType)) { - return SocialNetworkRequestResult.denied; - } else { - throw new DefaultException("State not expected in SocialNetworkManagerDefault class"); - } + throws DefaultException, UserMustBeLoggedException { + final SocialNetwork sn = inGroup.getSocialNetwork(); + if (!User.isKnownUser(userLogged)) { + throw new UserMustBeLoggedException(); + } + final AdmissionType admissionType = inGroup.getAdmissionType(); + if (admissionType == null) { + throw new RuntimeException(); + } + final Group userGroup = userLogged.getUserGroup(); + checkGroupIsNotAlreadyAMember(userGroup, sn); + if (isModerated(admissionType)) { + sn.addPendingCollaborator(userGroup); + return SocialNetworkRequestResult.moderated; + } else if (isOpen(admissionType)) { + if (inGroup.getGroupType().equals(GroupType.ORPHANED_PROJECT)) { + sn.addAdmin(userGroup); + inGroup.setGroupType(GroupType.PROJECT); + inGroup.setAdmissionType(AdmissionType.Moderated); + persist(inGroup, Group.class); + } else { + sn.addCollaborator(userGroup); + } + return SocialNetworkRequestResult.accepted; + } else if (isClosed(admissionType)) { + return SocialNetworkRequestResult.denied; + } else { + throw new DefaultException("State not expected in SocialNetworkManagerDefault class"); + } } public void setAdminAsCollab(final User userLogged, final Group group, final Group inGroup) throws DefaultException { - final SocialNetwork sn = inGroup.getSocialNetwork(); - checkUserLoggedIsAdmin(userLogged, sn); - if (sn.isAdmin(group)) { - if (sn.getAccessLists().getAdmins().getList().size() == 1) { - throw new LastAdminInGroupException(); - } - sn.removeAdmin(group); - sn.addCollaborator(group); - } else { - throw new DefaultException("Person/Group is not an admin"); - } + final SocialNetwork sn = inGroup.getSocialNetwork(); + checkUserLoggedIsAdmin(userLogged, sn); + if (sn.isAdmin(group)) { + if (sn.getAccessLists().getAdmins().getList().size() == 1) { + throw new LastAdminInGroupException(); + } + sn.removeAdmin(group); + sn.addCollaborator(group); + } else { + throw new DefaultException("Person/Group is not an admin"); + } } public void setCollabAsAdmin(final User userLogged, final Group group, final Group inGroup) throws DefaultException { - final SocialNetwork sn = inGroup.getSocialNetwork(); - checkUserLoggedIsAdmin(userLogged, sn); - if (sn.isCollab(group)) { - sn.removeCollaborator(group); - sn.addAdmin(group); - } else { - throw new DefaultException("Person/Group is not a collaborator"); - } + final SocialNetwork sn = inGroup.getSocialNetwork(); + checkUserLoggedIsAdmin(userLogged, sn); + if (sn.isCollab(group)) { + sn.removeCollaborator(group); + sn.addAdmin(group); + } else { + throw new DefaultException("Person/Group is not a collaborator"); + } } public void unJoinGroup(final Group groupToUnJoin, final Group inGroup) throws DefaultException { - final SocialNetwork sn = inGroup.getSocialNetwork(); + final SocialNetwork sn = inGroup.getSocialNetwork(); - if (sn.isAdmin(groupToUnJoin)) { - if (sn.getAccessLists().getAdmins().getList().size() == 1) { - if (sn.getAccessLists().getEditors().getList().size() > 0) { - throw new LastAdminInGroupException(); - } else { - inGroup.setType(GroupType.ORPHANED_PROJECT); - inGroup.setAdmissionType(AdmissionType.Open); - } - } - sn.removeAdmin(groupToUnJoin); - } else if (sn.isCollab(groupToUnJoin)) { - sn.removeCollaborator(groupToUnJoin); - } else { - throw new DefaultException("Person/Group is not a collaborator"); - } + if (sn.isAdmin(groupToUnJoin)) { + if (sn.getAccessLists().getAdmins().getList().size() == 1) { + if (sn.getAccessLists().getEditors().getList().size() > 0) { + throw new LastAdminInGroupException(); + } else { + inGroup.setGroupType(GroupType.ORPHANED_PROJECT); + inGroup.setAdmissionType(AdmissionType.Open); + } + } + sn.removeAdmin(groupToUnJoin); + } else if (sn.isCollab(groupToUnJoin)) { + sn.removeCollaborator(groupToUnJoin); + } else { + throw new DefaultException("Person/Group is not a collaborator"); + } } void addAdmin(final User newAdmin, final Group group) { - final SocialNetwork sn = group.getSocialNetwork(); - sn.addAdmin(newAdmin.getUserGroup()); + final SocialNetwork sn = group.getSocialNetwork(); + sn.addAdmin(newAdmin.getUserGroup()); } private void checkGroupAddingToSelf(final Group group, final Group inGroup) throws DefaultException { - if (group.equals(inGroup)) { - throwGroupMemberException(group); - } + if (group.equals(inGroup)) { + throwGroupMemberException(group); + } } private void checkGroupIsNotAlreadyAMember(final Group group, final SocialNetwork sn) throws DefaultException { - if (sn.isAdmin(group) || sn.isCollab(group) || sn.isViewer(group) && notEveryOneCanView(sn)) { - throwGroupMemberException(group); - } + if (sn.isAdmin(group) || sn.isCollab(group) || sn.isViewer(group) && notEveryOneCanView(sn)) { + throwGroupMemberException(group); + } } private void checkUserLoggedIsAdmin(final User userLogged, final SocialNetwork sn) throws AccessViolationException { - if (!accessRightsService.get(userLogged, sn.getAccessLists()).isAdministrable()) { - throw new AccessViolationException(); - } + if (!accessRightsService.get(userLogged, sn.getAccessLists()).isAdministrable()) { + throw new AccessViolationException(); + } } private boolean isClosed(final AdmissionType admissionType) { - return admissionType.equals(AdmissionType.Closed); + return admissionType.equals(AdmissionType.Closed); } private boolean isModerated(final AdmissionType admissionType) { - return admissionType.equals(AdmissionType.Moderated); + return admissionType.equals(AdmissionType.Moderated); } private boolean isOpen(final AdmissionType admissionType) { - return admissionType.equals(AdmissionType.Open); + return admissionType.equals(AdmissionType.Open); } private boolean notEveryOneCanView(final SocialNetwork sn) { - return !sn.getAccessLists().getViewers().getMode().equals(GroupListMode.EVERYONE); + return !sn.getAccessLists().getViewers().getMode().equals(GroupListMode.EVERYONE); } private void throwGroupMemberException(final Group group) throws DefaultException { - if (group.getType().equals(GroupType.PERSONAL)) { - throw new AlreadyUserMemberException(); - } else { - throw new AlreadyGroupMemberException(); - } + if (group.getGroupType().equals(GroupType.PERSONAL)) { + throw new AlreadyUserMemberException(); + } else { + throw new AlreadyGroupMemberException(); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ToolConfigurationManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ToolConfigurationManagerDefault.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ToolConfigurationManagerDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -31,11 +31,11 @@ @Singleton public class ToolConfigurationManagerDefault extends DefaultManager<ToolConfiguration, Long> implements - ToolConfigurationManager { + ToolConfigurationManager { @Inject public ToolConfigurationManagerDefault(final Provider<EntityManager> provider) { - super(provider, ToolConfiguration.class); + super(provider, ToolConfiguration.class); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java 2008-10-21 19:26:47 UTC (rev 917) @@ -36,34 +36,34 @@ private final MapperIF mapper; public DozerMapper() { - mapper = DozerBeanMapperSingletonWrapper.getInstance(); + mapper = DozerBeanMapperSingletonWrapper.getInstance(); } @SuppressWarnings("unchecked") public <T> T map(final Object source, final Class<T> type) { - return (T) mapper.map(source, type); + return (T) mapper.map(source, type); } @SuppressWarnings("unchecked") public <T> List<T> mapList(final List<?> list, final Class<T> type) { - final ArrayList<T> dest = new ArrayList<T>(list.size()); - for (final Object o : list) { - dest.add((T) mapper.map(o, type)); - } - return dest; + final ArrayList<T> dest = new ArrayList<T>(list.size()); + for (final Object o : list) { + dest.add((T) mapper.map(o, type)); + } + return dest; } @SuppressWarnings("unchecked") public <K, T> SearchResultDTO<T> mapSearchResult(final SearchResult<K> result, final Class<T> type) { - final SearchResultDTO<T> resultDTO = new SearchResultDTO<T>(); - final List<K> list = result.getList(); - final ArrayList<T> dest = new ArrayList<T>(list.size()); - for (final Object o : list) { - dest.add((T) mapper.map(o, type)); - } - resultDTO.setList(dest); - resultDTO.setSize(result.getSize()); - return resultDTO; + final SearchResultDTO<T> resultDTO = new SearchResultDTO<T>(); + final List<K> list = result.getList(); + final ArrayList<T> dest = new ArrayList<T>(list.size()); + for (final Object o : list) { + dest.add((T) mapper.map(o, type)); + } + resultDTO.setList(dest); + resultDTO.setSize(result.getSize()); + return resultDTO; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -32,33 +32,33 @@ private final HashMap<GroupListMode, String> enumToString; public GroupListModeConverter() { - this.stringToEnum = new HashMap<String, GroupListMode>(); - this.enumToString = new HashMap<GroupListMode, String>(); - add(GroupListMode.NORMAL); - add(GroupListMode.EVERYONE); - add(GroupListMode.NOBODY); + this.stringToEnum = new HashMap<String, GroupListMode>(); + this.enumToString = new HashMap<GroupListMode, String>(); + add(GroupListMode.NORMAL); + add(GroupListMode.EVERYONE); + add(GroupListMode.NOBODY); } @SuppressWarnings("unchecked") public Object convert(final Object destination, final Object source, final Class destinationClass, - final Class sourceClass) { - if (source == null) { - return null; - } else if (sourceClass.equals(String.class) && destinationClass.equals(GroupListMode.class)) { - return stringToEnum.get(source); - } else if (sourceClass.equals(GroupListMode.class) && destinationClass.equals(String.class)) { - return enumToString.get(source); - } else { - final String msg = MessageFormat.format("couldn't map {0} ({1}) to {2} ({3})", source, sourceClass, - destination, destinationClass); - throw new MappingException(msg); - } + final Class sourceClass) { + if (source == null) { + return null; + } else if (sourceClass.equals(String.class) && destinationClass.equals(GroupListMode.class)) { + return stringToEnum.get(source); + } else if (sourceClass.equals(GroupListMode.class) && destinationClass.equals(String.class)) { + return enumToString.get(source); + } else { + final String msg = MessageFormat.format("couldn't map {0} ({1}) to {2} ({3})", source, sourceClass, + destination, destinationClass); + throw new MappingException(msg); + } } private void add(final GroupListMode mode) { - enumToString.put(mode, mode.toString()); - stringToEnum.put(mode.toString(), mode); + enumToString.put(mode, mode.toString()); + stringToEnum.put(mode.toString(), mode); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/properties/ChatProperties.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/properties/ChatProperties.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/properties/ChatProperties.java 2008-10-21 19:26:47 UTC (rev 917) @@ -31,19 +31,19 @@ @Inject public ChatProperties(final KuneProperties properties) { - this.properties = properties; + this.properties = properties; } public String getHttpBase() { - return properties.get(KuneProperties.CHAT_HTTP_BASE); + return properties.get(KuneProperties.CHAT_HTTP_BASE); } public String getDomain() { - return properties.get(KuneProperties.CHAT_DOMAIN); + return properties.get(KuneProperties.CHAT_DOMAIN); } public String getRoomHost() { - return properties.get(KuneProperties.CHAT_ROOM_HOST); + return properties.get(KuneProperties.CHAT_ROOM_HOST); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java 2008-10-21 19:26:47 UTC (rev 917) @@ -21,23 +21,23 @@ package org.ourproject.kune.platf.server.properties; public interface KuneProperties { - public String DEFAULT_SITE_SHORT_NAME = "kune.default.site.shortName"; - public String SITE_DOMAIN = "kune.site.domain"; - public String CHAT_HTTP_BASE = "kune.chat.httpbase"; - public String CHAT_DOMAIN = "kune.chat.domain"; - public String CHAT_ROOM_HOST = "kune.chat.roomHost"; - public String WS_THEMES_DEF = "kune.wsthemes.default"; - public String WS_THEMES = "kune.wsthemes"; - public String SITE_LOGO_URL = "kune.sitelogourl"; - public String UPLOAD_GALLERY_PERMITTED_EXTS = "kune.upload.gallerypermittedextensions"; - public String UPLOAD_MAX_FILE_SIZE = "kune.upload.maxfilesizeinmegas"; - public String UPLOAD_LOCATION = "kune.upload.location"; - public String IMAGES_RESIZEWIDTH = "kune.images.resizewidth"; - public String IMAGES_THUMBSIZE = "kune.images.thumbsize"; - public String IMAGES_CROPSIZE = "kune.images.cropsize"; - public String IMAGES_ICONSIZE = "kune.images.iconsize"; + String DEFAULT_SITE_SHORT_NAME = "kune.default.site.shortName"; + String SITE_DOMAIN = "kune.site.domain"; + String CHAT_HTTP_BASE = "kune.chat.httpbase"; + String CHAT_DOMAIN = "kune.chat.domain"; + String CHAT_ROOM_HOST = "kune.chat.roomHost"; + String WS_THEMES_DEF = "kune.wsthemes.default"; + String WS_THEMES = "kune.wsthemes"; + String SITE_LOGO_URL = "kune.sitelogourl"; + String UPLOAD_GALLERY_PERMITTED_EXTS = "kune.upload.gallerypermittedextensions"; + String UPLOAD_MAX_FILE_SIZE = "kune.upload.maxfilesizeinmegas"; + String UPLOAD_LOCATION = "kune.upload.location"; + String IMAGES_RESIZEWIDTH = "kune.images.resizewidth"; + String IMAGES_THUMBSIZE = "kune.images.thumbsize"; + String IMAGES_CROPSIZE = "kune.images.cropsize"; + String IMAGES_ICONSIZE = "kune.images.iconsize"; - public String get(String key); + String get(String key); - public String get(String key, String defaultValue); + String get(String key, String defaultValue); } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/properties/KunePropertiesDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/properties/KunePropertiesDefault.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/properties/KunePropertiesDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -34,40 +34,39 @@ private final String fileName; @Inject - public KunePropertiesDefault(@PropertiesFileName - final String fileName) { - this.fileName = fileName; - try { - properties = new Properties(); - InputStream input = getInputStream(fileName); - properties.load(input); - } catch (IOException e) { - String msg = MessageFormat.format("Couldn't open property file {0}", fileName); - throw new RuntimeException(msg, e); - } + public KunePropertiesDefault(@PropertiesFileName final String fileName) { + this.fileName = fileName; + try { + properties = new Properties(); + InputStream input = getInputStream(fileName); + properties.load(input); + } catch (IOException e) { + String msg = MessageFormat.format("Couldn't open property file {0}", fileName); + throw new RuntimeException(msg, e); + } } public String get(final String key) { - String value = properties.getProperty(key); - if (value == null) { - throw new RuntimeException("PROPERTY: " + key + " not defined in " + fileName); - } - return value; + String value = properties.getProperty(key); + if (value == null) { + throw new RuntimeException("PROPERTY: " + key + " not defined in " + fileName); + } + return value; } public String get(final String key, final String defaultValue) { - String value = properties.getProperty(key); - return value != null ? value : defaultValue; + String value = properties.getProperty(key); + return value != null ? value : defaultValue; } private InputStream getInputStream(final String fileName) { - InputStream input = Thread.currentThread().getContextClassLoader().getResourceAsStream(fileName); - if (input == null) { - String msg = MessageFormat.format("Properties file: ''{0}'' not found", fileName); - throw new RuntimeException(msg); - } - return input; + InputStream input = Thread.currentThread().getContextClassLoader().getResourceAsStream(fileName); + if (input == null) { + String msg = MessageFormat.format("Properties file: ''{0}'' not found", fileName); + throw new RuntimeException(msg); + } + return input; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/TestJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/TestJSONService.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/TestJSONService.java 2008-10-21 19:26:47 UTC (rev 917) @@ -19,7 +19,6 @@ */ package org.ourproject.kune.platf.server.rest; - import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -30,59 +29,59 @@ public class TestJSONService { - @Inject - public TestJSONService() { - } + @Inject + public TestJSONService() { + } - @REST(params = { "value" }, format="json") - public String test(String value) { - return "The value is " + value; - } + @REST(params = { "value" }, format = "json") + public String test(String value) { + return "The value is " + value; + } - @REST(params = { "name", "value" }, format="json") - public List<SimpleObject> test2(String theName, String theValue) { - int total = 5; - ArrayList<SimpleObject> result = new ArrayList<SimpleObject>(total); - for (int index = 0; index < total; index++) { - result.add(new SimpleObject(theName + total, theValue + total, new Date())); - } - return result; - } + @REST(params = { "name", "value" }, format = "json") + public List<SimpleObject> test2(String theName, String theValue) { + int total = 5; + ArrayList<SimpleObject> result = new ArrayList<SimpleObject>(total); + for (int index = 0; index < total; index++) { + result.add(new SimpleObject(theName + total, theValue + total, new Date())); + } + return result; + } - public static class SimpleObject { - private String name; - private String value; - private Date date; + public static class SimpleObject { + private String name; + private String value; + private Date date; - public SimpleObject(String name, String value, Date date) { - this.name = name; - this.value = value; - this.date = date; - } + public SimpleObject(String name, String value, Date date) { + this.name = name; + this.value = value; + this.date = date; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public String getValue() { - return value; - } + public String getValue() { + return value; + } - public void setValue(String value) { - this.value = value; - } + public void setValue(String value) { + this.value = value; + } - public Date getDate() { - return date; - } + public Date getDate() { + return date; + } - public void setDate(Date date) { - this.date = date; - } + public void setDate(Date date) { + this.date = date; + } - } + } } \ No newline at end of file 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2008-10-21 19:26:47 UTC (rev 917) @@ -162,7 +162,7 @@ final User user = userSession.getUser(); final boolean userIsLoggedIn = userSession.isUserLoggedIn(); final Container container = accessService.accessToContainer(ContentUtils.parseId(parentToken.getFolder()), - user, AccessRol.Editor); + user, AccessRol.Editor); final Content addedContent = creationService.createContent(title, "", user, container); final Access access = accessService.getAccess(user, addedContent.getStateToken(), group, AccessRol.Editor); final State state = stateService.create(access); @@ -180,7 +180,7 @@ final User user = userSession.getUser(); final boolean userIsLoggedIn = userSession.isUserLoggedIn(); final State state = createFolder(parentToken.getGroup(), ContentUtils.parseId(parentToken.getFolder()), title, - contentTypeId); + contentTypeId); completeState(user, userIsLoggedIn, group, state); return mapState(state, user, group); } @@ -197,12 +197,12 @@ final boolean userIsLoggedIn = userSession.isUserLoggedIn(); final String userShortName = user.getShortName(); final ChatConnection connection = xmppManager.login(userShortName, userSession.getUser().getPassword(), - userHash); + userHash); xmppManager.createRoom(connection, roomName, userShortName + userHash); xmppManager.disconnect(connection); try { final State state = createFolder(groupShortName, ContentUtils.parseId(parentToken.getFolder()), roomName, - ChatServerTool.TYPE_ROOM); + ChatServerTool.TYPE_ROOM); completeState(user, userIsLoggedIn, group, state); return mapState(state, user, group); } catch (final ContentNotFoundException e) { @@ -239,6 +239,9 @@ final boolean userIsLoggedIn = userSession.isUserLoggedIn(); if (userIsLoggedIn) { defaultGroup = groupManager.getGroupOfUserWithId(user.getId()); + if (groupManager.findEnabledTools(defaultGroup.getId()).size() == 0) { + defaultGroup = groupManager.getDefaultGroup(); + } } else { defaultGroup = groupManager.getDefaultGroup(); } @@ -426,7 +429,7 @@ state.setGroupTags(tagManager.getSummaryByGroup(group)); state.setGroupMembers(socialNetworkManager.get(user, group)); state.setParticipation(socialNetworkManager.findParticipation(user, group)); - if (group.getType().equals(GroupType.PERSONAL)) { + if (group.getGroupType().equals(GroupType.PERSONAL)) { state.setUserBuddies(userManager.getUserBuddies(group.getShortName())); } } @@ -440,7 +443,7 @@ accessService.accessToContainer(parentFolderId, user, AccessRol.Editor); final Container container = creationService.createFolder(group, parentFolderId, title, user.getLanguage(), - typeId); + typeId); final Access access = accessService.getAccess(user, container.getStateToken(), group, AccessRol.Editor); final State state = stateService.create(access); return state; 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java 2008-10-21 19:26:47 UTC (rev 917) @@ -85,9 +85,16 @@ } @Authenticated + @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Viewer) + public GroupDTO getGroup(String userHash, StateToken groupToken) { + final Group group = groupManager.findByShortName(groupToken.getGroup()); + return mapper.map(group, GroupDTO.class); + } + + @Authenticated @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) - public GroupDTO setGroupLogo(final String userHash, final StateToken token) { + public GroupDTO setGroupFullLogo(final String userHash, final StateToken token) { final Group group = groupManager.findByShortName(token.getGroup()); final Content content = contentManager.find(ContentUtils.parseId(token.getDocument())); groupManager.setGroupLogo(group, content); 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java 2008-10-21 19:26:47 UTC (rev 917) @@ -52,69 +52,69 @@ @Inject public I18nRPC(final Provider<HttpServletRequest> requestProvider, final Provider<UserSession> userSessionProvider, - final I18nTranslationManager i18nTranslationManager, final I18nLanguageManager languageManager, - final Mapper mapper) { - this.requestProvider = requestProvider; - this.userSessionProvider = userSessionProvider; - this.i18nTranslationManager = i18nTranslationManager; - this.languageManager = languageManager; - this.mapper = mapper; + final I18nTranslationManager i18nTranslationManager, final I18nLanguageManager languageManager, + final Mapper mapper) { + this.requestProvider = requestProvider; + this.userSessionProvider = userSessionProvider; + this.i18nTranslationManager = i18nTranslationManager; + this.languageManager = languageManager; + this.mapper = mapper; } @Transactional(type = TransactionType.READ_ONLY) public I18nLanguageDTO getInitialLanguage(final String localeParam) { - String initLanguage; - I18nLanguage lang; - final UserSession userSession = getUserSession(); - if (localeParam != null) { - initLanguage = localeParam; - } else { - if (userSession.isUserLoggedIn()) { - initLanguage = userSession.getUser().getLanguage().getCode(); - } else { - final String browserLang = requestProvider.get().getLocale().getLanguage(); - if (browserLang != null) { - // Not logged, use browser language if possible - final String country = requestProvider.get().getLocale().getCountry(); - if (browserLang.equals("pt") && country != null && country.equals("BR")) { - // FIXME: the only supported rfc 3066 lang supported - initLanguage = "pt-br"; - } else { - initLanguage = browserLang; - } - } else { - initLanguage = I18nTranslation.DEFAULT_LANG; - } - } - } - try { - lang = languageManager.findByCode(initLanguage); - } catch (final NoResultException e) { - lang = languageManager.findByCode(I18nTranslation.DEFAULT_LANG); - } - return mapper.map(lang, I18nLanguageDTO.class); + String initLanguage; + I18nLanguage lang; + final UserSession userSession = getUserSession(); + if (localeParam != null) { + initLanguage = localeParam; + } else { + if (userSession.isUserLoggedIn()) { + initLanguage = userSession.getUser().getLanguage().getCode(); + } else { + final String browserLang = requestProvider.get().getLocale().getLanguage(); + if (browserLang != null) { + // Not logged, use browser language if possible + final String country = requestProvider.get().getLocale().getCountry(); + if (browserLang.equals("pt") && country != null && country.equals("BR")) { + // FIXME: the only supported rfc 3066 lang supported + initLanguage = "pt-br"; + } else { + initLanguage = browserLang; + } + } else { + initLanguage = I18nTranslation.DEFAULT_LANG; + } + } + } + try { + lang = languageManager.findByCode(initLanguage); + } catch (final NoResultException e) { + lang = languageManager.findByCode(I18nTranslation.DEFAULT_LANG); + } + return mapper.map(lang, I18nLanguageDTO.class); } @Transactional(type = TransactionType.READ_ONLY) public HashMap<String, String> getLexicon(final String language) { - return i18nTranslationManager.getLexicon(language); + return i18nTranslationManager.getLexicon(language); } @Authenticated(mandatory = false) @Transactional(type = TransactionType.READ_WRITE) public String getTranslation(final String userHash, final String language, final String text) { - return i18nTranslationManager.getTranslation(language, text); + return i18nTranslationManager.getTranslation(language, text); } @Authenticated @Transactional(type = TransactionType.READ_WRITE) public String setTranslation(final String userHash, final String id, final String translation) - throws DefaultException { - return i18nTranslationManager.setTranslation(id, translation); + throws DefaultException { + return i18nTranslationManager.setTranslation(id, translation); } private UserSession getUserSession() { - return userSessionProvider.get(); + return userSessionProvider.get(); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java 2008-10-21 19:26:47 UTC (rev 917) @@ -84,8 +84,8 @@ data.setLanguages(languageManager.getAll()); data.setCountries(countryManager.getAll()); data.setTimezones(TimeZone.getAvailableIDs()); - data.setUserInfo(userInfoService.buildInfo(userManager.find(userSession.getUser().getId()), userSession - .getHash())); + data.setUserInfo(userInfoService.buildInfo(userManager.find(userSession.getUser().getId()), + userSession.getHash())); data.setChatHttpBase(chatProperties.getHttpBase()); data.setChatDomain(chatProperties.getDomain()); data.setSiteDomain(kuneProperties.get(KuneProperties.SITE_DOMAIN)); 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java 2008-10-21 19:26:47 UTC (rev 917) @@ -53,89 +53,89 @@ @Inject public SocialNetworkRPC(final Provider<UserSession> userSessionProvider, final GroupManager groupManager, - final SocialNetworkManager socialNetworkManager, final Mapper mapper) { - this.userSessionProvider = userSessionProvider; - this.groupManager = groupManager; - this.socialNetworkManager = socialNetworkManager; - this.mapper = mapper; + final SocialNetworkManager socialNetworkManager, final Mapper mapper) { + this.userSessionProvider = userSessionProvider; + this.groupManager = groupManager; + this.socialNetworkManager = socialNetworkManager; + this.mapper = mapper; } @Authenticated @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) - public SocialNetworkResultDTO AcceptJoinGroup(final String hash, final StateToken groupToken, - final String groupToAcceptShortName) throws DefaultException { - final UserSession userSession = getUserSession(); - final User userLogged = userSession.getUser(); - final Group group = groupManager.findByShortName(groupToken.getGroup()); - final Group groupToAccept = groupManager.findByShortName(groupToAcceptShortName); - socialNetworkManager.acceptJoinGroup(userLogged, groupToAccept, group); - return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); + public SocialNetworkResultDTO acceptJoinGroup(final String hash, final StateToken groupToken, + final String groupToAcceptShortName) throws DefaultException { + final UserSession userSession = getUserSession(); + final User userLogged = userSession.getUser(); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + final Group groupToAccept = groupManager.findByShortName(groupToAcceptShortName); + socialNetworkManager.acceptJoinGroup(userLogged, groupToAccept, group); + return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); } @Authenticated @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) public SocialNetworkResultDTO addAdminMember(final String hash, final StateToken groupToken, - final String groupToAddShortName) throws DefaultException { - final UserSession userSession = getUserSession(); - final User userLogged = userSession.getUser(); - final Group group = groupManager.findByShortName(groupToken.getGroup()); - final Group groupToAdd = groupManager.findByShortName(groupToAddShortName); - socialNetworkManager.addGroupToAdmins(userLogged, groupToAdd, group); - return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); + final String groupToAddShortName) throws DefaultException { + final UserSession userSession = getUserSession(); + final User userLogged = userSession.getUser(); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + final Group groupToAdd = groupManager.findByShortName(groupToAddShortName); + socialNetworkManager.addGroupToAdmins(userLogged, groupToAdd, group); + return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); } @Authenticated @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) public SocialNetworkResultDTO addCollabMember(final String hash, final StateToken groupToken, - final String groupToAddShortName) throws DefaultException { - final UserSession userSession = getUserSession(); - final User userLogged = userSession.getUser(); - final Group group = groupManager.findByShortName(groupToken.getGroup()); - final Group groupToAdd = groupManager.findByShortName(groupToAddShortName); - socialNetworkManager.addGroupToCollabs(userLogged, groupToAdd, group); - return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); + final String groupToAddShortName) throws DefaultException { + final UserSession userSession = getUserSession(); + final User userLogged = userSession.getUser(); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + final Group groupToAdd = groupManager.findByShortName(groupToAddShortName); + socialNetworkManager.addGroupToCollabs(userLogged, groupToAdd, group); + return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); } @Authenticated @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) public SocialNetworkResultDTO addViewerMember(final String hash, final StateToken groupToken, - final String groupToAddShortName) throws DefaultException { - final UserSession userSession = getUserSession(); - final User userLogged = userSession.getUser(); - final Group group = groupManager.findByShortName(groupToken.getGroup()); - final Group groupToAdd = groupManager.findByShortName(groupToAddShortName); - socialNetworkManager.addGroupToViewers(userLogged, groupToAdd, group); - return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); + final String groupToAddShortName) throws DefaultException { + final UserSession userSession = getUserSession(); + final User userLogged = userSession.getUser(); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + final Group groupToAdd = groupManager.findByShortName(groupToAddShortName); + socialNetworkManager.addGroupToViewers(userLogged, groupToAdd, group); + return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); } @Authenticated @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) public SocialNetworkResultDTO deleteMember(final String hash, final StateToken groupToken, - final String groupToDeleleShortName) throws DefaultException { - final UserSession userSession = getUserSession(); - final User userLogged = userSession.getUser(); - final Group group = groupManager.findByShortName(groupToken.getGroup()); - final Group groupToDelete = groupManager.findByShortName(groupToDeleleShortName); - socialNetworkManager.deleteMember(userLogged, groupToDelete, group); - return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); + final String groupToDeleleShortName) throws DefaultException { + final UserSession userSession = getUserSession(); + final User userLogged = userSession.getUser(); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + final Group groupToDelete = groupManager.findByShortName(groupToDeleleShortName); + socialNetworkManager.deleteMember(userLogged, groupToDelete, group); + return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); } @Authenticated @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) public SocialNetworkResultDTO denyJoinGroup(final String hash, final StateToken groupToken, - final String groupToDenyShortName) throws DefaultException { - final UserSession userSession = getUserSession(); - final User userLogged = userSession.getUser(); - final Group group = groupManager.findByShortName(groupToken.getGroup()); - final Group groupToDenyJoin = groupManager.findByShortName(groupToDenyShortName); - socialNetworkManager.denyJoinGroup(userLogged, groupToDenyJoin, group); - return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); + final String groupToDenyShortName) throws DefaultException { + final UserSession userSession = getUserSession(); + final User userLogged = userSession.getUser(); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + final Group groupToDenyJoin = groupManager.findByShortName(groupToDenyShortName); + socialNetworkManager.denyJoinGroup(userLogged, groupToDenyJoin, group); + return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); } @Authenticated(mandatory = false) @@ -143,10 +143,10 @@ @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_ONLY) public SocialNetworkDTO getGroupMembers(final String hash, final StateToken groupToken) throws DefaultException { - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final Group group = groupManager.findByShortName(groupToken.getGroup()); - return getGroupMembers(user, group); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + return getGroupMembers(user, group); } @Authenticated(mandatory = false) @@ -154,69 +154,69 @@ @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_ONLY) public ParticipationDataDTO getParticipation(final String hash, final StateToken groupToken) - throws DefaultException { - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final Group group = groupManager.findByShortName(groupToken.getGroup()); - return getParticipation(user, group); + throws DefaultException { + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + return getParticipation(user, group); } @Authenticated @Transactional(type = TransactionType.READ_WRITE) public SocialNetworkRequestResult requestJoinGroup(final String hash, final StateToken groupToken) - throws DefaultException { - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final Group group = groupManager.findByShortName(groupToken.getGroup()); - return socialNetworkManager.requestToJoin(user, group); + throws DefaultException { + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + return socialNetworkManager.requestToJoin(user, group); } @Authenticated @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) public SocialNetworkResultDTO setAdminAsCollab(final String hash, final StateToken groupToken, - final String groupToSetCollabShortName) throws DefaultException { - final UserSession userSession = getUserSession(); - final User userLogged = userSession.getUser(); - final Group group = groupManager.findByShortName(groupToken.getGroup()); - final Group groupToSetCollab = groupManager.findByShortName(groupToSetCollabShortName); - socialNetworkManager.setAdminAsCollab(userLogged, groupToSetCollab, group); - return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); + final String groupToSetCollabShortName) throws DefaultException { + final UserSession userSession = getUserSession(); + final User userLogged = userSession.getUser(); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + final Group groupToSetCollab = groupManager.findByShortName(groupToSetCollabShortName); + socialNetworkManager.setAdminAsCollab(userLogged, groupToSetCollab, group); + return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); } @Authenticated @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) public SocialNetworkResultDTO setCollabAsAdmin(final String hash, final StateToken groupToken, - final String groupToSetAdminShortName) throws DefaultException { - final UserSession userSession = getUserSession(); - final User userLogged = userSession.getUser(); - final Group group = groupManager.findByShortName(groupToken.getGroup()); - final Group groupToSetAdmin = groupManager.findByShortName(groupToSetAdminShortName); - socialNetworkManager.setCollabAsAdmin(userLogged, groupToSetAdmin, group); - return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); + final String groupToSetAdminShortName) throws DefaultException { + final UserSession userSession = getUserSession(); + final User userLogged = userSession.getUser(); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + final Group groupToSetAdmin = groupManager.findByShortName(groupToSetAdminShortName); + socialNetworkManager.setCollabAsAdmin(userLogged, groupToSetAdmin, group); + return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); } @Authenticated @Transactional(type = TransactionType.READ_WRITE) public SocialNetworkResultDTO unJoinGroup(final String hash, final StateToken groupToken) throws DefaultException { - final UserSession userSession = getUserSession(); - final User userLogged = userSession.getUser(); - final Group group = groupManager.findByShortName(groupToken.getGroup()); - socialNetworkManager.unJoinGroup(userLogged.getUserGroup(), group); - return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); + final UserSession userSession = getUserSession(); + final User userLogged = userSession.getUser(); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + socialNetworkManager.unJoinGroup(userLogged.getUserGroup(), group); + return new SocialNetworkResultDTO(getGroupMembers(userLogged, group), getParticipation(userLogged, group)); } private SocialNetworkDTO getGroupMembers(final User user, final Group group) throws DefaultException { - return mapper.map(socialNetworkManager.get(user, group), SocialNetworkDTO.class); + return mapper.map(socialNetworkManager.get(user, group), SocialNetworkDTO.class); } private ParticipationDataDTO getParticipation(final User user, final Group group) throws DefaultException { - return mapper.map(socialNetworkManager.findParticipation(user, group), ParticipationDataDTO.class); + return mapper.map(socialNetworkManager.findParticipation(user, group), ParticipationDataDTO.class); } private UserSession getUserSession() { - return userSessionProvider.get(); + return userSessionProvider.get(); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2008-10-21 19:26:47 UTC (rev 917) @@ -68,9 +68,9 @@ @Transactional(type = TransactionType.READ_WRITE, rollbackOn = DefaultException.class) public UserInfoDTO createUser(final UserDTO userDTO, boolean wantPersonalHomepage) throws DefaultException { - final User user = userManager.createUser(userDTO.getShortName(), userDTO.getName(), userDTO.getEmail(), userDTO - .getPassword(), userDTO.getLanguage().getCode(), userDTO.getCountry().getCode(), userDTO.getTimezone() - .getId()); + final User user = userManager.createUser(userDTO.getShortName(), userDTO.getName(), userDTO.getEmail(), + userDTO.getPassword(), userDTO.getLanguage().getCode(), + userDTO.getCountry().getCode(), userDTO.getTimezone().getId()); groupManager.createUserGroup(user, wantPersonalHomepage); return loginUser(user); } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java 2008-10-21 19:26:47 UTC (rev 917) @@ -28,28 +28,28 @@ private List<Group> groupsIsCollab; public ParticipationData() { - this(null, null); + this(null, null); } public ParticipationData(final List<Group> groupsIsAdmin, final List<Group> groupsIsCollab) { - this.groupsIsAdmin = groupsIsAdmin; - this.groupsIsCollab = groupsIsCollab; + this.groupsIsAdmin = groupsIsAdmin; + this.groupsIsCollab = groupsIsCollab; } public List<Group> getGroupsIsAdmin() { - return groupsIsAdmin; + return groupsIsAdmin; } public List<Group> getGroupsIsCollab() { - return groupsIsCollab; + return groupsIsCollab; } public void setGroupsIsAdmin(final List<Group> groupsIsAdmin) { - this.groupsIsAdmin = groupsIsAdmin; + this.groupsIsAdmin = groupsIsAdmin; } public void setGroupsIsCollab(final List<Group> groupsIsCollab) { - this.groupsIsCollab = groupsIsCollab; + this.groupsIsCollab = groupsIsCollab; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java 2008-10-21 19:26:47 UTC (rev 917) @@ -38,83 +38,83 @@ private I18nCountry country; public String getChatName() { - return chatName; + return chatName; } public String getChatPassword() { - return chatPassword; + return chatPassword; } public I18nCountry getCountry() { - return country; + return country; } public List<Group> getGroupsIsAdmin() { - return groupsIsAdmin; + return groupsIsAdmin; } public List<Group> getGroupsIsCollab() { - return groupsIsCollab; + return groupsIsCollab; } public String getHomePage() { - return homePage; + return homePage; } public I18nLanguage getLanguage() { - return language; + return language; } public String getName() { - return name; + return name; } public String getShortName() { - return shortName; + return shortName; } public String getUserHash() { - return userHash; + return userHash; } public void setChatName(final String chatName) { - this.chatName = chatName; + this.chatName = chatName; } public void setChatPassword(final String chatPassword) { - this.chatPassword = chatPassword; + this.chatPassword = chatPassword; } public void setCountry(final I18nCountry country) { - this.country = country; + this.country = country; } public void setGroupsIsAdmin(final List<Group> groupsIsAdmin) { - this.groupsIsAdmin = groupsIsAdmin; + this.groupsIsAdmin = groupsIsAdmin; } public void setGroupsIsCollab(final List<Group> groupsIsCollab) { - this.groupsIsCollab = groupsIsCollab; + this.groupsIsCollab = groupsIsCollab; } public void setHomePage(final String homePage) { - this.homePage = homePage; + this.homePage = homePage; } public void setLanguage(final I18nLanguage language) { - this.language = language; + this.language = language; } public void setName(final String name) { - this.name = name; + this.name = name; } public void setShortName(final String shortName) { - this.shortName = shortName; + this.shortName = shortName; } public void setUserHash(final String userHash) { - this.userHash = userHash; + this.userHash = userHash; } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2008-10-21 19:26:47 UTC (rev 917) @@ -37,34 +37,34 @@ @Inject public UserInfoServiceDefault(final SocialNetworkManager socialNetwork) { - this.socialNetworkManager = socialNetwork; + this.socialNetworkManager = socialNetwork; } public UserInfo buildInfo(final User user, final String userHash) throws DefaultException { - UserInfo info = null; - if (User.isKnownUser(user)) { - info = new UserInfo(); + UserInfo info = null; + if (User.isKnownUser(user)) { + info = new UserInfo(); - info.setShortName(user.getShortName()); - info.setName(user.getName()); - info.setChatName(user.getShortName()); - info.setChatPassword(user.getPassword()); - final I18nLanguage language = user.getLanguage(); - info.setLanguage(language); - info.setCountry(user.getCountry()); - info.setUserHash(userHash); + info.setShortName(user.getShortName()); + info.setName(user.getName()); + info.setChatName(user.getShortName()); + info.setChatPassword(user.getPassword()); + final I18nLanguage language = user.getLanguage(); + info.setLanguage(language); + info.setCountry(user.getCountry()); + info.setUserHash(userHash); - final Group userGroup = user.getUserGroup(); + final Group userGroup = user.getUserGroup(); - final ParticipationData participation = socialNetworkManager.findParticipation(user, userGroup); - info.setGroupsIsAdmin(participation.getGroupsIsAdmin()); - info.setGroupsIsCollab(participation.getGroupsIsCollab()); + final ParticipationData participation = socialNetworkManager.findParticipation(user, userGroup); + info.setGroupsIsAdmin(participation.getGroupsIsAdmin()); + info.setGroupsIsCollab(participation.getGroupsIsCollab()); - final Content defaultContent = userGroup.getDefaultContent(); - if (defaultContent != null) { - info.setHomePage(defaultContent.getStateToken().toString()); - } - } - return info; + final Content defaultContent = userGroup.getDefaultContent(); + if (defaultContent != null) { + info.setHomePage(defaultContent.getStateToken().toString()); + } + } + return info; } } Modified: trunk/src/main/java/org/ourproject/kune/rack/ContainerListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/ContainerListener.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/ContainerListener.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,6 +20,7 @@ package org.ourproject.kune.rack; public interface ContainerListener { - public void start(); - public void stop(); + void start(); + + void stop(); } Modified: trunk/src/main/java/org/ourproject/kune/rack/Rack.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/Rack.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/Rack.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,5 +1,4 @@ /* - * * Copyright (C) 2007-2008 The kune development team (see CREDITS for details) * This file is part of kune. * @@ -43,6 +42,11 @@ this.listeners = new ArrayList<Class<? extends ContainerListener>>(); } + public void add(final Class<? extends ContainerListener> listenerType) { + listeners.add(listenerType); + + } + public void add(final Dock dock) { log.debug("INSTALLING: " + dock.toString()); docks.add(dock); @@ -52,28 +56,24 @@ modules.add(module); } + public void addExclusion(RequestMatcher matcher) { + excludes.add(matcher); + } + public List<Dock> getDocks() { return docks; } + public List<RequestMatcher> getExcludes() { + return excludes; + } + public List<Module> getGuiceModules() { return modules; } - public void add(final Class<? extends ContainerListener> listenerType) { - listeners.add(listenerType); - } - public List<Class<? extends ContainerListener>> getListeners() { return listeners; } - public void addExclusion(RequestMatcher matcher) { - excludes.add(matcher); - } - - public List<RequestMatcher> getExcludes() { - return excludes; - } - } Modified: trunk/src/main/java/org/ourproject/kune/rack/RackBuilder.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/RackBuilder.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/RackBuilder.java 2008-10-21 19:26:47 UTC (rev 917) @@ -34,87 +34,87 @@ public class RackBuilder { public static class RackDockBuilder { - private final String regex; - private final Rack rack; + private final String regex; + private final Rack rack; - public RackDockBuilder(final Rack rack, final String regex) { - this.rack = rack; - this.regex = regex; - } + public RackDockBuilder(final Rack rack, final String regex) { + this.rack = rack; + this.regex = regex; + } - public RackDockBuilder install(final Filter... filters) { - for (final Filter filter : filters) { - final RegexDock dock = new RegexDock(regex); - dock.setFilter(filter); - rack.add(dock); - } - return this; - } + public RackDockBuilder install(final Filter... filters) { + for (final Filter filter : filters) { + final RegexDock dock = new RegexDock(regex); + dock.setFilter(filter); + rack.add(dock); + } + return this; + } } private final Rack rack; public RackBuilder() { - this.rack = new Rack(); + this.rack = new Rack(); } public RackBuilder add(final Class<? extends ContainerListener> listener) { - rack.add(listener); - return this; + rack.add(listener); + return this; } public RackDockBuilder at(final String regex) { - return new RackDockBuilder(rack, regex); + return new RackDockBuilder(rack, regex); } public RackBuilder exclude(final String... excludes) { - for (final String exclude : excludes) { - rack.addExclusion(new RegexMatcher(exclude)); - } - return this; + for (final String exclude : excludes) { + rack.addExclusion(new RegexMatcher(exclude)); + } + return this; } public Rack getRack() { - return rack; + return rack; } public RackBuilder installGWTServices(final String root, final Class<? extends RemoteService>... serviceClasses) { - for (final Class<? extends RemoteService> serviceClass : serviceClasses) { - final String simpleName = serviceClass.getSimpleName(); - final RegexDock dock = new RegexDock(root + simpleName + "$"); - dock.setFilter(new GWTServiceFilter(serviceClass)); - rack.add(dock); - } + for (final Class<? extends RemoteService> serviceClass : serviceClasses) { + final String simpleName = serviceClass.getSimpleName(); + final RegexDock dock = new RegexDock(root + simpleName + "$"); + dock.setFilter(new GWTServiceFilter(serviceClass)); + rack.add(dock); + } - return this; + return this; } public void installRESTServices(final String root, final Class<?>... serviceClasses) { - for (final Class<?> serviceClass : serviceClasses) { - final String simpleName = serviceClass.getSimpleName(); - final String pattern = root + simpleName + "/(.*)$"; - final RegexDock dock = new RegexDock(pattern); - dock.setFilter(new RESTServiceFilter(pattern, serviceClass)); - rack.add(dock); - } + for (final Class<?> serviceClass : serviceClasses) { + final String simpleName = serviceClass.getSimpleName(); + final String pattern = root + simpleName + "/(.*)$"; + final RegexDock dock = new RegexDock(pattern); + dock.setFilter(new RESTServiceFilter(pattern, serviceClass)); + rack.add(dock); + } } public void installServlet(final String root, final Class<? extends HttpServlet>... servletClasses) { - for (final Class<? extends HttpServlet> servletClass : servletClasses) { - final String simpleName = servletClass.getSimpleName(); - final RegexDock dock = new RegexDock(root + simpleName + "$"); - dock.setFilter(new ServletServiceFilter(servletClass)); - rack.add(dock); - } + for (final Class<? extends HttpServlet> servletClass : servletClasses) { + final String simpleName = servletClass.getSimpleName(); + final RegexDock dock = new RegexDock(root + simpleName + "$"); + dock.setFilter(new ServletServiceFilter(servletClass)); + rack.add(dock); + } } public RackBuilder use(final Module... list) { - for (final Module m : list) { - rack.add(m); - } - return this; + for (final Module m : list) { + rack.add(m); + } + return this; } } Modified: trunk/src/main/java/org/ourproject/kune/rack/RackModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/RackModule.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/RackModule.java 2008-10-21 19:26:47 UTC (rev 917) @@ -19,9 +19,7 @@ */ package org.ourproject.kune.rack; - public interface RackModule { - void configure(RackBuilder builder); + void configure(RackBuilder builder); - } Modified: trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -40,32 +40,32 @@ public class RackServletFilter implements Filter { public static class DockChain implements FilterChain { - private final Iterator<Dock> iterator; + private final Iterator<Dock> iterator; - public DockChain(final Iterator<Dock> iterator) { - this.iterator = iterator; - } + public DockChain(final Iterator<Dock> iterator) { + this.iterator = iterator; + } - public void doFilter(final ServletRequest request, final ServletResponse response) throws IOException, - ServletException { - Dock dock = null; - boolean matched = false; + public void doFilter(final ServletRequest request, final ServletResponse response) throws IOException, + ServletException { + Dock dock = null; + boolean matched = false; - final String relative = RackHelper.getRelativeURL(request); - while (!matched && iterator.hasNext()) { - dock = iterator.next(); - matched = dock.matches(relative); - } - if (matched) { - execute(dock.getFilter(), request, response); - } - } + final String relative = RackHelper.getRelativeURL(request); + while (!matched && iterator.hasNext()) { + dock = iterator.next(); + matched = dock.matches(relative); + } + if (matched) { + execute(dock.getFilter(), request, response); + } + } - private void execute(final Filter filter, final ServletRequest request, final ServletResponse response) - throws IOException, ServletException { - // log.debug("RACK FILTER: " + filter.getClass().getSimpleName()); - filter.doFilter(request, response, this); - } + private void execute(final Filter filter, final ServletRequest request, final ServletResponse response) + throws IOException, ServletException { + // log.debug("RACK FILTER: " + filter.getClass().getSimpleName()); + filter.doFilter(request, response, this); + } } public static final String INJECTOR_ATTRIBUTE = Injector.class.getName(); private static final String MODULE_PARAMETER = RackModule.class.getName(); @@ -75,93 +75,93 @@ private List<RequestMatcher> excludes; public void destroy() { - for (final Dock dock : docks) { - dock.getFilter().destroy(); - } + for (final Dock dock : docks) { + dock.getFilter().destroy(); + } } public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) - throws IOException, ServletException { + throws IOException, ServletException { - final String relative = RackHelper.getRelativeURL(request); - // log.debug("REQUEST: " + relative); - for (final RequestMatcher matcher : excludes) { - if (matcher.matches(relative)) { - // log.debug("SKIPING!"); - chain.doFilter(request, response); - return; - } - } + final String relative = RackHelper.getRelativeURL(request); + // log.debug("REQUEST: " + relative); + for (final RequestMatcher matcher : excludes) { + if (matcher.matches(relative)) { + // log.debug("SKIPING!"); + chain.doFilter(request, response); + return; + } + } - final FilterChain newChain = new DockChain(docks.iterator()); - newChain.doFilter(request, response); + final FilterChain newChain = new DockChain(docks.iterator()); + newChain.doFilter(request, response); } public void init(final FilterConfig filterConfig) throws ServletException { - log.debug("INITIALIZING RackServletFilter..."); - final RackModule module = getModule(filterConfig); - final RackBuilder builder = new RackBuilder(); - module.configure(builder); + log.debug("INITIALIZING RackServletFilter..."); + final RackModule module = getModule(filterConfig); + final RackBuilder builder = new RackBuilder(); + module.configure(builder); - final Rack rack = builder.getRack(); - final Injector injector = installInjector(filterConfig, rack); - startContainerListeners(rack.getListeners(), injector); + final Rack rack = builder.getRack(); + final Injector injector = installInjector(filterConfig, rack); + startContainerListeners(rack.getListeners(), injector); - docks = rack.getDocks(); - excludes = rack.getExcludes(); - initFilters(filterConfig); - log.debug("INITIALIZATION DONE!"); + docks = rack.getDocks(); + excludes = rack.getExcludes(); + initFilters(filterConfig); + log.debug("INITIALIZATION DONE!"); } private RackModule getModule(final FilterConfig filterConfig) { - final String moduleName = getModuleName(filterConfig); - try { - final Class<?> clazz = Class.forName(moduleName); - final RackModule module = (RackModule) clazz.newInstance(); - return module; - } catch (final Exception e) { - throw new RuntimeException("couldn't instantiate the rack module", e); - } + final String moduleName = getModuleName(filterConfig); + try { + final Class<?> clazz = Class.forName(moduleName); + final RackModule module = (RackModule) clazz.newInstance(); + return module; + } catch (final Exception e) { + throw new RuntimeException("couldn't instantiate the rack module", e); + } } private String getModuleName(final FilterConfig filterConfig) { - final String moduleName = filterConfig.getInitParameter(MODULE_PARAMETER); - if (moduleName == null) { - throw new RuntimeException("Rack module name can't be null!"); - } - return moduleName; + final String moduleName = filterConfig.getInitParameter(MODULE_PARAMETER); + if (moduleName == null) { + throw new RuntimeException("Rack module name can't be null!"); + } + return moduleName; } private void initFilters(final FilterConfig filterConfig) throws ServletException { - for (final Dock dock : docks) { - dock.getFilter().init(filterConfig); - } + for (final Dock dock : docks) { + dock.getFilter().init(filterConfig); + } } private Injector installInjector(final FilterConfig filterConfig, final Rack rack) { - final Injector injector = Guice.createInjector(rack.getGuiceModules()); - filterConfig.getServletContext().setAttribute(INJECTOR_ATTRIBUTE, injector); - return injector; + final Injector injector = Guice.createInjector(rack.getGuiceModules()); + filterConfig.getServletContext().setAttribute(INJECTOR_ATTRIBUTE, injector); + return injector; } private void startContainerListeners(final List<Class<? extends ContainerListener>> listenerClasses, - final Injector injector) { - log.debug("STARTING CONTAINER LISTENERS..."); - for (final Class<? extends ContainerListener> listenerClass : listenerClasses) { - final ContainerListener listener = injector.getInstance(listenerClass); - listener.start(); - } + final Injector injector) { + log.debug("STARTING CONTAINER LISTENERS..."); + for (final Class<? extends ContainerListener> listenerClass : listenerClasses) { + final ContainerListener listener = injector.getInstance(listenerClass); + listener.start(); + } } // FIXME: Dani, never used this: @SuppressWarnings("unused") private void stopContainerListeners(final List<Class<? extends ContainerListener>> listenerClasses, - final Injector injector) { - log.debug("STOPING CONTAINER LISTENERS..."); - for (final Class<? extends ContainerListener> listenerClass : listenerClasses) { - final ContainerListener listener = injector.getInstance(listenerClass); - listener.stop(); - } + final Injector injector) { + log.debug("STOPING CONTAINER LISTENERS..."); + for (final Class<? extends ContainerListener> listenerClass : listenerClasses) { + final ContainerListener listener = injector.getInstance(listenerClass); + listener.stop(); + } } } Modified: trunk/src/main/java/org/ourproject/kune/rack/dock/AbstractDock.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/dock/AbstractDock.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/dock/AbstractDock.java 2008-10-21 19:26:47 UTC (rev 917) @@ -21,16 +21,15 @@ import javax.servlet.Filter; - public abstract class AbstractDock implements Dock { - private Filter filter; + private Filter filter; - public Filter getFilter() { - return filter; - } + public Filter getFilter() { + return filter; + } - public void setFilter(Filter filter) { - this.filter = filter; - } + public void setFilter(Filter filter) { + this.filter = filter; + } } Modified: trunk/src/main/java/org/ourproject/kune/rack/dock/Dock.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/dock/Dock.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/dock/Dock.java 2008-10-21 19:26:47 UTC (rev 917) @@ -25,7 +25,7 @@ * A filter with a matcher ... se RegexDock for a uri regex implementation */ public interface Dock extends RequestMatcher { - public void setFilter(Filter filter); + Filter getFilter(); - Filter getFilter(); + void setFilter(Filter filter); } Modified: trunk/src/main/java/org/ourproject/kune/rack/dock/RegexMatcher.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/dock/RegexMatcher.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/dock/RegexMatcher.java 2008-10-21 19:26:47 UTC (rev 917) @@ -22,18 +22,18 @@ import java.util.regex.Pattern; public class RegexMatcher implements RequestMatcher { - private final Pattern pattern; + private final Pattern pattern; - public RegexMatcher(String stringPattern) { - this(Pattern.compile(stringPattern)); - } - - public RegexMatcher(Pattern pattern) { - this.pattern = pattern; - } + public RegexMatcher(String stringPattern) { + this(Pattern.compile(stringPattern)); + } - public boolean matches(String url) { + public RegexMatcher(Pattern pattern) { + this.pattern = pattern; + } + + public boolean matches(String url) { return pattern.matcher(url).matches(); - } + } } Modified: trunk/src/main/java/org/ourproject/kune/rack/dock/RequestMatcher.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/dock/RequestMatcher.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/dock/RequestMatcher.java 2008-10-21 19:26:47 UTC (rev 917) @@ -19,7 +19,6 @@ */ package org.ourproject.kune.rack.dock; - public interface RequestMatcher { - boolean matches(String url); + boolean matches(String url); } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/ApplicationListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/ApplicationListener.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/ApplicationListener.java 2008-10-21 19:26:47 UTC (rev 917) @@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse; public interface ApplicationListener { - void doBefore(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); - void doAfter(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); + void doBefore(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); + + void doAfter(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/InjectedFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/InjectedFilter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/InjectedFilter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -35,16 +35,16 @@ } public <T> T getInstance(final Class<T> type) { - return getInjector().getInstance(type); + return getInjector().getInstance(type); } public void init(final FilterConfig filterConfig) throws ServletException { - this.ctx = filterConfig.getServletContext(); - getInjector().injectMembers(this); + this.ctx = filterConfig.getServletContext(); + getInjector().injectMembers(this); } private Injector getInjector() { - return (Injector) ctx.getAttribute(RackServletFilter.INJECTOR_ATTRIBUTE); + return (Injector) ctx.getAttribute(RackServletFilter.INJECTOR_ATTRIBUTE); } } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/ListenerFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/ListenerFilter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/ListenerFilter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -29,18 +29,18 @@ import javax.servlet.http.HttpServletResponse; public class ListenerFilter extends InjectedFilter { - private Class<? extends ApplicationListener> listenerClass; + private Class<? extends ApplicationListener> listenerClass; - public ListenerFilter(Class<? extends ApplicationListener> listenerClass) { - this.listenerClass = listenerClass; - } - - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, - ServletException { - ApplicationListener listener = super.getInstance(listenerClass); - listener.doBefore((HttpServletRequest) request, (HttpServletResponse) response); - chain.doFilter(request, response); - listener.doAfter((HttpServletRequest) request, (HttpServletResponse) response); - } + public ListenerFilter(Class<? extends ApplicationListener> listenerClass) { + this.listenerClass = listenerClass; + } + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, + ServletException { + ApplicationListener listener = super.getInstance(listenerClass); + listener.doBefore((HttpServletRequest) request, (HttpServletResponse) response); + chain.doFilter(request, response); + listener.doAfter((HttpServletRequest) request, (HttpServletResponse) response); + } + } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/LogFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/LogFilter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/LogFilter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -39,12 +39,12 @@ } public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) - throws IOException, ServletException { - // final long start = System.currentTimeMillis(); - log.debug("REQUEST: " + RackHelper.getURI(request)); - chain.doFilter(request, response); - // final long finish = System.currentTimeMillis(); - // log.debug("TOTAL TIME: " + (finish - start) + " miliseconds"); + throws IOException, ServletException { + // final long start = System.currentTimeMillis(); + log.debug("REQUEST: " + RackHelper.getURI(request)); + chain.doFilter(request, response); + // final long finish = System.currentTimeMillis(); + // log.debug("TOTAL TIME: " + (finish - start) + " miliseconds"); } public void init(final FilterConfig filterConfig) throws ServletException { Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/RedirectFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/RedirectFilter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/RedirectFilter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -30,23 +30,23 @@ import javax.servlet.http.HttpServletResponse; public class RedirectFilter implements Filter { - private final String redirect; + private final String redirect; - public RedirectFilter(String redirect) { - this.redirect = redirect; - } + public RedirectFilter(String redirect) { + this.redirect = redirect; + } - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, - ServletException { + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, + ServletException { - HttpServletResponse httpResponse = (HttpServletResponse) response; - httpResponse.sendRedirect(redirect); - } + HttpServletResponse httpResponse = (HttpServletResponse) response; + httpResponse.sendRedirect(redirect); + } - public void init(FilterConfig filterConfig) throws ServletException { - } + public void init(FilterConfig filterConfig) throws ServletException { + } - public void destroy() { - } + public void destroy() { + } } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/gwts/DelegatedRemoteServlet.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/gwts/DelegatedRemoteServlet.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/gwts/DelegatedRemoteServlet.java 2008-10-21 19:26:47 UTC (rev 917) @@ -35,30 +35,30 @@ private ServletContext servletContext; public void setService(final RemoteService service) { - this.service = service; + this.service = service; } @Override public String processCall(final String payload) throws SerializationException { - try { - RPCRequest rpcRequest = RPC.decodeRequest(payload, service.getClass()); - return RPC.invokeAndEncodeResponse(service, rpcRequest.getMethod(), rpcRequest.getParameters()); - } catch (IncompatibleRemoteServiceException ex) { - return RPC.encodeResponseForFailure(null, ex); - } + try { + RPCRequest rpcRequest = RPC.decodeRequest(payload, service.getClass()); + return RPC.invokeAndEncodeResponse(service, rpcRequest.getMethod(), rpcRequest.getParameters()); + } catch (IncompatibleRemoteServiceException ex) { + return RPC.encodeResponseForFailure(null, ex); + } } @Override protected void doUnexpectedFailure(final Throwable e) { - e.printStackTrace(); - super.doUnexpectedFailure(e); + e.printStackTrace(); + super.doUnexpectedFailure(e); } public void setServletContext(final ServletContext servletContext) { - this.servletContext = servletContext; + this.servletContext = servletContext; } public ServletContext getServletContext() { - return servletContext; + return servletContext; } } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/gwts/GWTServiceFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/gwts/GWTServiceFilter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/gwts/GWTServiceFilter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -43,23 +43,23 @@ private final DelegatedRemoteServlet servlet; public GWTServiceFilter(final Class<? extends RemoteService> serviceClass) { - this.serviceClass = serviceClass; - this.servlet = new DelegatedRemoteServlet(); + this.serviceClass = serviceClass; + this.servlet = new DelegatedRemoteServlet(); } public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) - throws IOException, ServletException { - log.info("--------------------------------------------------------------------------------"); - log.debug("SERVICE: " + RackHelper.getURI(request) + " - " + serviceClass.getSimpleName()); - final RemoteService service = getInstance(serviceClass); - servlet.setService(service); - servlet.doPost((HttpServletRequest) request, (HttpServletResponse) response); + throws IOException, ServletException { + log.info("--------------------------------------------------------------------------------"); + log.debug("SERVICE: " + RackHelper.getURI(request) + " - " + serviceClass.getSimpleName()); + final RemoteService service = getInstance(serviceClass); + servlet.setService(service); + servlet.doPost((HttpServletRequest) request, (HttpServletResponse) response); } @Override public void init(final FilterConfig filterConfig) throws ServletException { - super.init(filterConfig); - servlet.setServletContext(filterConfig.getServletContext()); + super.init(filterConfig); + servlet.setServletContext(filterConfig.getServletContext()); } } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/rest/DefaultRESTMethodFinder.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/DefaultRESTMethodFinder.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/rest/DefaultRESTMethodFinder.java 2008-10-21 19:26:47 UTC (rev 917) @@ -27,45 +27,45 @@ import org.apache.commons.logging.LogFactory; public class DefaultRESTMethodFinder implements RESTMethodFinder { - private static final Log log = LogFactory.getLog(DefaultRESTMethodFinder.class); - - private HashMap<Class<?>, RESTServiceDefinition> definitionCache; + private static final Log log = LogFactory.getLog(DefaultRESTMethodFinder.class); - public DefaultRESTMethodFinder() { - this.definitionCache = new HashMap<Class<?>, RESTServiceDefinition>(); - } - - public RESTMethod findMethod(String methodName, Parameters parameters, Class<?> serviceType) { - RESTServiceDefinition serviceDefinition = getServiceDefinition(serviceType); - Method[] serviceMethods = serviceDefinition.getMethods(); - log.debug("SERVICE METHODS: " + Arrays.toString(serviceMethods)); - for (Method method : serviceMethods) { - log.debug("CHEKING: " + method.toString()); - if (method.getName().equals(methodName)) { - REST methodAnnotation = method.getAnnotation(REST.class); - if (checkParams(methodAnnotation, parameters)) { - return new RESTMethod(method, methodAnnotation.params(), parameters, methodAnnotation.format()); - } - } - } - return null; - } + private HashMap<Class<?>, RESTServiceDefinition> definitionCache; - private RESTServiceDefinition getServiceDefinition(Class<?> serviceType) { - RESTServiceDefinition serviceDefinition = definitionCache.get(serviceType); - if (serviceDefinition == null) { - serviceDefinition = new RESTServiceDefinition(serviceType); - definitionCache.put(serviceType, serviceDefinition); - } - return serviceDefinition; - } + public DefaultRESTMethodFinder() { + this.definitionCache = new HashMap<Class<?>, RESTServiceDefinition>(); + } - private boolean checkParams(REST methodAnnotation, Parameters parameters) { - for (String name : methodAnnotation.params()) { - if (parameters.get(name) == null) { - return false; - } - } - return true; - } + public RESTMethod findMethod(String methodName, Parameters parameters, Class<?> serviceType) { + RESTServiceDefinition serviceDefinition = getServiceDefinition(serviceType); + Method[] serviceMethods = serviceDefinition.getMethods(); + log.debug("SERVICE METHODS: " + Arrays.toString(serviceMethods)); + for (Method method : serviceMethods) { + log.debug("CHEKING: " + method.toString()); + if (method.getName().equals(methodName)) { + REST methodAnnotation = method.getAnnotation(REST.class); + if (checkParams(methodAnnotation, parameters)) { + return new RESTMethod(method, methodAnnotation.params(), parameters, methodAnnotation.format()); + } + } + } + return null; + } + + private RESTServiceDefinition getServiceDefinition(Class<?> serviceType) { + RESTServiceDefinition serviceDefinition = definitionCache.get(serviceType); + if (serviceDefinition == null) { + serviceDefinition = new RESTServiceDefinition(serviceType); + definitionCache.put(serviceType, serviceDefinition); + } + return serviceDefinition; + } + + private boolean checkParams(REST methodAnnotation, Parameters parameters) { + for (String name : methodAnnotation.params()) { + if (parameters.get(name) == null) { + return false; + } + } + return true; + } } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/rest/JSONLibRESTSerializer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/JSONLibRESTSerializer.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/rest/JSONLibRESTSerializer.java 2008-10-21 19:26:47 UTC (rev 917) @@ -24,18 +24,19 @@ import net.sf.json.util.CycleDetectionStrategy; public class JSONLibRESTSerializer implements RESTSerializer { - private final JsonConfig config; + private final JsonConfig config; - public JSONLibRESTSerializer() { - config = new JsonConfig(); - config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT); - } + public JSONLibRESTSerializer() { + config = new JsonConfig(); + config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT); + } - public String serialize(Object target, String format) { - if (format.equals(RESTMethod.FORMAT_JSON)) - return JSONSerializer.toJSON(target, config).toString(); - else - throw new RuntimeException("format not implemented!"); - } + public String serialize(Object target, String format) { + if (format.equals(RESTMethod.FORMAT_JSON)) { + return JSONSerializer.toJSON(target, config).toString(); + } else { + throw new RuntimeException("format not implemented!"); + } + } } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/rest/Parameters.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/Parameters.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/rest/Parameters.java 2008-10-21 19:26:47 UTC (rev 917) @@ -19,7 +19,6 @@ */ package org.ourproject.kune.rack.filters.rest; - public interface Parameters { - public String get(String name); + String get(String name); } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/rest/ParametersAdapter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/ParametersAdapter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/rest/ParametersAdapter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -25,14 +25,14 @@ import javax.servlet.ServletRequest; public class ParametersAdapter implements Parameters { - private final ServletRequest request; + private final ServletRequest request; - public ParametersAdapter(ServletRequest request) { - this.request = request; - } + public ParametersAdapter(ServletRequest request) { + this.request = request; + } - public String get(String name) { - return request.getParameter(name); - } - + public String get(String name) { + return request.getParameter(name); + } + } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/rest/REST.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/REST.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/rest/REST.java 2008-10-21 19:26:47 UTC (rev 917) @@ -24,10 +24,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface REST { - String format() default RESTMethod.FORMAT_JSON; - String[] params(); + String format() default RESTMethod.FORMAT_JSON; + + String[] params(); } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTMethod.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTMethod.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTMethod.java 2008-10-21 19:26:47 UTC (rev 917) @@ -22,64 +22,62 @@ import java.lang.reflect.Method; public class RESTMethod { - public static final String FORMAT_JSON = "json"; - public static final String FORMAT_XML = "xml"; - - private final Method method; - private final Parameters parameters; - private final String[] names; - private Object response; - private final String format; + public static final String FORMAT_JSON = "json"; + public static final String FORMAT_XML = "xml"; - public RESTMethod(Method method, String[] names, Parameters parameters, String format) { - this.method = method; - this.names = names; - this.parameters = parameters; - this.format = format; - } + private final Method method; + private final Parameters parameters; + private final String[] names; + private Object response; + private final String format; - public boolean invoke(Object service) { - Object[] values = convertParameters(); - try { - response = method.invoke(service, values); - return true; - } catch (Exception e) { - return false; - } - } + public RESTMethod(Method method, String[] names, Parameters parameters, String format) { + this.method = method; + this.names = names; + this.parameters = parameters; + this.format = format; + } - private Object[] convertParameters() { - int total = names.length; - Object[] values = new Object[total]; - Class<?>[] types = method.getParameterTypes(); - - for (int index = 0; index < total; index++) { - values[index] = convert(types[index], parameters.get(names[index])); - } - - return values; - } + public boolean invoke(Object service) { + Object[] values = convertParameters(); + try { + response = method.invoke(service, values); + return true; + } catch (Exception e) { + return false; + } + } - private Object convert(Class<?> type, String stringValue) { - if (type.equals(String.class)) { - return stringValue; - } else if (type.equals(Integer.TYPE) || type.equals(Integer.class)) { - return Integer.parseInt(stringValue); - } else if (type.equals(Long.TYPE) || type.equals(Long.class)) { - return Long.parseLong(stringValue); - } else { - throw new RuntimeException("unable to convert parameter in JSON method to type: " + type); - } - } - - + private Object[] convertParameters() { + int total = names.length; + Object[] values = new Object[total]; + Class<?>[] types = method.getParameterTypes(); - public String getFormat() { - return format; - } + for (int index = 0; index < total; index++) { + values[index] = convert(types[index], parameters.get(names[index])); + } - public Object getResponse() { - return response; - } + return values; + } + private Object convert(Class<?> type, String stringValue) { + if (type.equals(String.class)) { + return stringValue; + } else if (type.equals(Integer.TYPE) || type.equals(Integer.class)) { + return Integer.parseInt(stringValue); + } else if (type.equals(Long.TYPE) || type.equals(Long.class)) { + return Long.parseLong(stringValue); + } else { + throw new RuntimeException("unable to convert parameter in JSON method to type: " + type); + } + } + + public String getFormat() { + return format; + } + + public Object getResponse() { + return response; + } + } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTMethodFinder.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTMethodFinder.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTMethodFinder.java 2008-10-21 19:26:47 UTC (rev 917) @@ -19,8 +19,6 @@ */ package org.ourproject.kune.rack.filters.rest; - - public interface RESTMethodFinder { - RESTMethod findMethod(String methodName, Parameters parameters, Class<?> serviceType); + RESTMethod findMethod(String methodName, Parameters parameters, Class<?> serviceType); } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTSerializer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTSerializer.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTSerializer.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,5 +20,5 @@ package org.ourproject.kune.rack.filters.rest; public interface RESTSerializer { - String serialize(Object target, String format); + String serialize(Object target, String format); } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTServiceDefinition.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTServiceDefinition.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTServiceDefinition.java 2008-10-21 19:26:47 UTC (rev 917) @@ -26,41 +26,41 @@ import java.util.List; public class RESTServiceDefinition { - private final Class<?> serviceType; - private final Method[] methods; + private final Class<?> serviceType; + private final Method[] methods; - public RESTServiceDefinition(Class<?> serviceType) { - this.serviceType = serviceType; - List<Method> sorted = sortByParamsLength(getAnnotatedMethods()); - this.methods = sorted.toArray(new Method[sorted.size()]); - } + public RESTServiceDefinition(Class<?> serviceType) { + this.serviceType = serviceType; + List<Method> sorted = sortByParamsLength(getAnnotatedMethods()); + this.methods = sorted.toArray(new Method[sorted.size()]); + } - private List<Method> sortByParamsLength(List<Method> annotatedMethods) { - Collections.sort(annotatedMethods, new Comparator<Method>() { - public int compare(Method o1, Method o2) { - REST a1 = o1.getAnnotation(REST.class); - REST a2 = o2.getAnnotation(REST.class); - Integer length1 = a1.params().length; - Integer length2 = a2.params().length; - return -1 * length1.compareTo(length2); - } - }); - return annotatedMethods; - } + private List<Method> sortByParamsLength(List<Method> annotatedMethods) { + Collections.sort(annotatedMethods, new Comparator<Method>() { + public int compare(Method o1, Method o2) { + REST a1 = o1.getAnnotation(REST.class); + REST a2 = o2.getAnnotation(REST.class); + Integer length1 = a1.params().length; + Integer length2 = a2.params().length; + return -1 * length1.compareTo(length2); + } + }); + return annotatedMethods; + } - private List<Method> getAnnotatedMethods() { - Method[] allMethods = serviceType.getMethods(); - List<Method> annotatedMethods = new ArrayList<Method>(); - for (Method m : allMethods) { - if (m.getAnnotation(REST.class) != null) { - annotatedMethods.add(m); - } - } - return annotatedMethods; - } + private List<Method> getAnnotatedMethods() { + Method[] allMethods = serviceType.getMethods(); + List<Method> annotatedMethods = new ArrayList<Method>(); + for (Method m : allMethods) { + if (m.getAnnotation(REST.class) != null) { + annotatedMethods.add(m); + } + } + return annotatedMethods; + } - public Method[] getMethods() { - return methods; - } + public Method[] getMethods() { + return methods; + } } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTServicesModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTServicesModule.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/rest/RESTServicesModule.java 2008-10-21 19:26:47 UTC (rev 917) @@ -19,14 +19,13 @@ */ package org.ourproject.kune.rack.filters.rest; - import com.google.inject.AbstractModule; public class RESTServicesModule extends AbstractModule { - @Override - protected void configure() { - bind(RESTMethodFinder.class).to(DefaultRESTMethodFinder.class); - bind(RESTSerializer.class).to(JSONLibRESTSerializer.class); - } + @Override + protected void configure() { + bind(RESTMethodFinder.class).to(DefaultRESTMethodFinder.class); + bind(RESTSerializer.class).to(JSONLibRESTSerializer.class); + } } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/rest/TransactionalServiceExecutor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/TransactionalServiceExecutor.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/rest/TransactionalServiceExecutor.java 2008-10-21 19:26:47 UTC (rev 917) @@ -23,22 +23,23 @@ import com.wideplay.warp.persist.Transactional; public class TransactionalServiceExecutor { - private final RESTMethodFinder methodFinder; - private final RESTSerializer serializer; + private final RESTMethodFinder methodFinder; + private final RESTSerializer serializer; - @Inject - public TransactionalServiceExecutor(RESTMethodFinder methodFinder, RESTSerializer serializer) { - this.methodFinder = methodFinder; - this.serializer = serializer; - } + @Inject + public TransactionalServiceExecutor(RESTMethodFinder methodFinder, RESTSerializer serializer) { + this.methodFinder = methodFinder; + this.serializer = serializer; + } - @Transactional - public String doService(Class<?> serviceClass, String methodName, ParametersAdapter parameters, Object serviceInstance) { - String output = null; - RESTMethod rest = methodFinder.findMethod(methodName, parameters, serviceClass); - if (rest != null && rest.invoke(serviceInstance)) { - output = serializer.serialize(rest.getResponse(), rest.getFormat()); - } - return output; - } + @Transactional + public String doService(Class<?> serviceClass, String methodName, ParametersAdapter parameters, + Object serviceInstance) { + String output = null; + RESTMethod rest = methodFinder.findMethod(methodName, parameters, serviceClass); + if (rest != null && rest.invoke(serviceInstance)) { + output = serializer.serialize(rest.getResponse(), rest.getFormat()); + } + return output; + } } Modified: trunk/src/main/java/org/ourproject/kune/rack/filters/rest/XStreamRESTSerializer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/filters/rest/XStreamRESTSerializer.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/rack/filters/rest/XStreamRESTSerializer.java 2008-10-21 19:26:47 UTC (rev 917) @@ -25,17 +25,17 @@ import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver; public class XStreamRESTSerializer implements RESTSerializer { - private final HashMap<String, XStream> serializers; + private final HashMap<String, XStream> serializers; - public XStreamRESTSerializer() { - serializers = new HashMap<String, XStream>(2); - XStream stream = new XStream(new JettisonMappedXmlDriver()); - serializers.put(RESTMethod.FORMAT_JSON, stream); - serializers.put(RESTMethod.FORMAT_XML, new XStream()); - - } - - public String serialize(Object target, String format) { - return serializers.get(format).toXML(target); - } + public XStreamRESTSerializer() { + serializers = new HashMap<String, XStream>(2); + XStream stream = new XStream(new JettisonMappedXmlDriver()); + serializers.put(RESTMethod.FORMAT_JSON, stream); + serializers.put(RESTMethod.FORMAT_XML, new XStream()); + + } + + public String serialize(Object target, String format) { + return serializers.get(format).toXML(target); + } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/Kune-Workspace.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/Kune-Workspace.gwt.xml 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/Kune-Workspace.gwt.xml 2008-10-21 19:26:47 UTC (rev 917) @@ -1,4 +1,4 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/releases/1.5/distro-source/cor…"> +<!DOCTYPE document SYSTEM "src/main/java/gwt-module.dtd"> <module> <inherits name='org.ourproject.kune.platf.Kune-Platform' /> <inherits name="com.google.gwt.core.Core" /> Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/component/WorkspaceDeckPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/component/WorkspaceDeckPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/component/WorkspaceDeckPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -31,16 +31,16 @@ @Deprecated public WorkspaceDeckPanel() { - current = new Label("Nothing"); - add(current); + current = new Label("Nothing"); + add(current); } public void show(final View view) { - if (current != null) { - remove(current); - } - current = (Widget) view; - add(current); + if (current != null) { + remove(current); + } + current = (Widget) view; + add(current); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -88,11 +88,11 @@ child.setTooltip(tooltip); } menuItemsContainer.createItemMenu(nodeId, item.getActionCollection(), - new Listener<ActionItem<StateToken>>() { - public void onEvent(ActionItem<StateToken> actionItem) { - doAction(actionItem); - } - }); + new Listener<ActionItem<StateToken>>() { + public void onEvent(ActionItem<StateToken> actionItem) { + doAction(actionItem); + } + }); final TreeNode parent = treePanel.getNodeById(item.getParentId()); if (parent != null) { child.addListener(new TreeNodeListenerAdapter() { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -210,18 +210,30 @@ final ActionItemCollection<StateToken> actionItems = new ActionItemCollection<StateToken>(); if (state.hasDocument()) { rights = state.getContentRights(); - final ActionItemCollection<StateToken> contentActions = addItem(state.getTitle(), state.getTypeId(), state - .getMimeType(), state.getStatus(), stateToken, container.getStateToken(), rights, false); - final ActionItemCollection<StateToken> containerActions = actionRegistry.getCurrentActions(container - .getStateToken(), container.getTypeId(), session.isLogged(), containerRights, true); + final ActionItemCollection<StateToken> contentActions = addItem(state.getTitle(), state.getTypeId(), + state.getMimeType(), state.getStatus(), + stateToken, container.getStateToken(), + rights, false); + final ActionItemCollection<StateToken> containerActions = actionRegistry.getCurrentActions( + container.getStateToken(), + container.getTypeId(), + session.isLogged(), + containerRights, + true); actionItems.addAll(containerActions); actionItems.addAll(contentActions); } else { rights = containerRights; - final ActionItemCollection<StateToken> containerActions = addItem(container.getName(), container - .getTypeId(), null, ContentStatusDTO.publishedOnline, container.getStateToken(), container - .getStateToken().clone().setFolder(container.getParentFolderId()), containerRights, false); + final ActionItemCollection<StateToken> containerActions = addItem( + container.getName(), + container.getTypeId(), + null, + ContentStatusDTO.publishedOnline, + container.getStateToken(), + container.getStateToken().clone().setFolder( + container.getParentFolderId()), + containerRights, false); actionItems.addAll(containerActions); } @@ -254,29 +266,33 @@ final StateToken parentStateToken, final AccessRightsDTO rights, final boolean isNodeSelected) { final ActionItemCollection<StateToken> toolbarActions = actionRegistry.getCurrentActions(stateToken, - contentTypeId, session.isLogged(), rights, true); + contentTypeId, + session.isLogged(), + rights, true); final String contentTypeIcon = getIcon(stateToken, contentTypeId, mimeType); final String tooltip = getTooltip(stateToken, mimeType); final ContextNavigatorItem item = new ContextNavigatorItem(genId(stateToken), genId(parentStateToken), - contentTypeIcon, title, tooltip, status, stateToken, dragDropContentRegistry.isDraggable(contentTypeId, - rights.isAdministrable()), dragDropContentRegistry.isDroppable(contentTypeId, rights - .isAdministrable()), actionRegistry.getCurrentActions(stateToken, contentTypeId, session - .isLogged(), rights, false)); + contentTypeIcon, title, tooltip, status, stateToken, + dragDropContentRegistry.isDraggable(contentTypeId, rights.isAdministrable()), + dragDropContentRegistry.isDroppable(contentTypeId, rights.isAdministrable()), + actionRegistry.getCurrentActions(stateToken, contentTypeId, session.isLogged(), rights, false)); view.addItem(item); return toolbarActions; } private void createChildItems(final ContainerDTO container, final AccessRightsDTO containerRights) { for (final ContentSimpleDTO content : container.getContents()) { - addItem(content.getTitle(), content.getTypeId(), content.getMimeType(), content.getStatus(), content - .getStateToken(), content.getStateToken().clone().clearDocument(), content.getRights(), false); + addItem(content.getTitle(), content.getTypeId(), content.getMimeType(), content.getStatus(), + content.getStateToken(), content.getStateToken().clone().clearDocument(), content.getRights(), + false); } for (final ContainerSimpleDTO siblingFolder : container.getChilds()) { addItem(siblingFolder.getName(), siblingFolder.getTypeId(), null, ContentStatusDTO.publishedOnline, - siblingFolder.getStateToken(), siblingFolder.getStateToken().clone().setFolder( - siblingFolder.getParentFolderId()), containerRights, false); + siblingFolder.getStateToken(), + siblingFolder.getStateToken().clone().setFolder(siblingFolder.getParentFolderId()), + containerRights, false); } } @@ -312,7 +328,7 @@ private String getTooltip(StateToken token, BasicMimeTypeDTO mimeType) { if (mimeType != null && mimeType.getType().equals("image")) { return KuneUiUtils.genQuickTipWithImage(downloadUtilsProvider.get().getImageResizedUrl(token, - ImageSize.thumb)); + ImageSize.thumb)); } else { return null; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -141,7 +141,6 @@ } private void adjustSize(final int height) { - gwtRTarea - .setHeight("" + (height - WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT - WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT)); + gwtRTarea.setHeight("" + (height - WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT - WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT)); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -47,137 +47,137 @@ private final I18nUITranslationService i18n; public TextEditorPresenter(final boolean isAutoSave, final ActionToolbar<StateToken> toolbar, - final I18nUITranslationService i18n) { - this.toolbar = toolbar; - autoSave = isAutoSave; - this.i18n = i18n; - savePending = false; - editingHtml = false; - saveAndCloseConfirmed = false; - createActions(); + final I18nUITranslationService i18n) { + this.toolbar = toolbar; + autoSave = isAutoSave; + this.i18n = i18n; + savePending = false; + editingHtml = false; + saveAndCloseConfirmed = false; + createActions(); } public void editContent(final String content, final Listener<String> onSave, final Listener0 onEditCancelled) { - this.onSave = onSave; - this.onEditCancelled = onEditCancelled; - toolbar.attach(); - view.attach(); - setContent(content); + this.onSave = onSave; + this.onEditCancelled = onEditCancelled; + toolbar.attach(); + view.attach(); + setContent(content); } public String getContent() { - return view.getHTML(); + return view.getHTML(); } public View getView() { - return view; + return view; } public void init(final TextEditorView view) { - this.view = view; - toolbar.setEnableAction(save, false); - this.view.setEnabled(true); + this.view = view; + toolbar.setEnableAction(save, false); + this.view.setEnabled(true); } public void onEdit() { - if (!savePending) { - savePending = true; - toolbar.setEnableAction(save, true); - if (autoSave) { - view.scheduleSave(10000); - } - } + if (!savePending) { + savePending = true; + toolbar.setEnableAction(save, true); + if (autoSave) { + view.scheduleSave(10000); + } + } } public void onSaveAndClose() { - saveAndCloseConfirmed = true; - onSave(); + saveAndCloseConfirmed = true; + onSave(); } public void onSaved() { - if (saveAndCloseConfirmed) { - onCancelConfirmed(); - } else { - reset(); - } + if (saveAndCloseConfirmed) { + onCancelConfirmed(); + } else { + reset(); + } } public void onSaveFailed() { - view.scheduleSave(20000); - if (saveAndCloseConfirmed) { - saveAndCloseConfirmed = false; - } + view.scheduleSave(20000); + if (saveAndCloseConfirmed) { + saveAndCloseConfirmed = false; + } } public void reset() { - view.saveTimerCancel(); - savePending = false; - saveAndCloseConfirmed = false; - toolbar.setEnableAction(save, false); + view.saveTimerCancel(); + savePending = false; + saveAndCloseConfirmed = false; + toolbar.setEnableAction(save, false); } protected void onCancel() { - if (savePending) { - view.saveTimerCancel(); - view.showSaveBeforeDialog(); - } else { - onCancelConfirmed(); - } + if (savePending) { + view.saveTimerCancel(); + view.showSaveBeforeDialog(); + } else { + onCancelConfirmed(); + } } protected void onCancelConfirmed() { - reset(); - view.detach(); - toolbar.detach(); - onEditCancelled.onEvent(); + reset(); + view.detach(); + toolbar.detach(); + onEditCancelled.onEvent(); } protected void onEditHTML() { - if (editingHtml) { - // normal editor - final String html = view.getText(); - view.setHTML(html); - view.editHTML(false); - editingHtml = false; - } else { - // html editor - final String html = view.getHTML(); - view.setText(html); - view.editHTML(true); - editingHtml = true; - } + if (editingHtml) { + // normal editor + final String html = view.getText(); + view.setHTML(html); + view.editHTML(false); + editingHtml = false; + } else { + // html editor + final String html = view.getHTML(); + view.setText(html); + view.editHTML(true); + editingHtml = true; + } } protected void onSave() { - onSave.onEvent(view.getHTML()); + onSave.onEvent(view.getHTML()); } private void createActions() { - save = new ActionToolbarButtonDescriptor<StateToken>(AccessRolDTO.Viewer, ActionToolbarPosition.topbar, - new Listener<StateToken>() { - public void onEvent(final StateToken token) { - onSave(); - } - }); - save.setTextDescription(i18n.tWithNT("Save", "used in button")); - // save.setIconUrl("images/"); + save = new ActionToolbarButtonDescriptor<StateToken>(AccessRolDTO.Viewer, ActionToolbarPosition.topbar, + new Listener<StateToken>() { + public void onEvent(final StateToken token) { + onSave(); + } + }); + save.setTextDescription(i18n.tWithNT("Save", "used in button")); + // save.setIconUrl("images/"); - close = new ActionToolbarButtonDescriptor<StateToken>(AccessRolDTO.Viewer, ActionToolbarPosition.topbar, - new Listener<StateToken>() { - public void onEvent(final StateToken token) { - onCancel(); - } - }); - close.setTextDescription(i18n.tWithNT("Close", "used in button")); - // close.setIconUrl("images/"); + close = new ActionToolbarButtonDescriptor<StateToken>(AccessRolDTO.Viewer, ActionToolbarPosition.topbar, + new Listener<StateToken>() { + public void onEvent(final StateToken token) { + onCancel(); + } + }); + close.setTextDescription(i18n.tWithNT("Close", "used in button")); + // close.setIconUrl("images/"); - final ActionItemCollection<StateToken> collection = new ActionItemCollection<StateToken>(); - collection.add(new ActionItem<StateToken>(save, null)); - collection.add(new ActionItem<StateToken>(close, null)); - toolbar.setActions(collection); + final ActionItemCollection<StateToken> collection = new ActionItemCollection<StateToken>(); + collection.add(new ActionItem<StateToken>(save, null)); + collection.add(new ActionItem<StateToken>(close, null)); + toolbar.setActions(collection); } private void setContent(final String html) { - this.view.setHTML(html); + this.view.setHTML(html); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2008-10-21 19:26:47 UTC (rev 917) @@ -69,188 +69,188 @@ */ private class EventListener implements ClickListener, ChangeListener, KeyboardListener { - private ImageChooser ic; + private ImageChooser ic; - public void onChange(final Widget sender) { - fireEdit(); - } + public void onChange(final Widget sender) { + fireEdit(); + } - public void onClick(final Widget sender) { - if (sender == bold) { - basic.toggleBold(); - } else if (sender == italic) { - basic.toggleItalic(); - } else if (sender == underline) { - basic.toggleUnderline(); - } else if (sender == subscript) { - basic.toggleSubscript(); - } else if (sender == superscript) { - basic.toggleSuperscript(); - } else if (sender == strikethrough) { - extended.toggleStrikethrough(); - } else if (sender == indent) { - extended.rightIndent(); - } else if (sender == outdent) { - extended.leftIndent(); - } else if (sender == justifyLeft) { - basic.setJustification(RichTextArea.Justification.LEFT); - } else if (sender == justifyCenter) { - basic.setJustification(RichTextArea.Justification.CENTER); - } else if (sender == justifyRight) { - basic.setJustification(RichTextArea.Justification.RIGHT); - } else if (sender == insertImage) { - showImagePanel(); - } else if (sender == createLink) { - MessageBox.prompt("Insert a link", "Enter a link URL:", new PromptCallback() { - public void execute(final String btnID, final String text) { - if (btnID.equals("ok") && text != null) { - extended.createLink(text); - } - } - }); - showLinkPanel(); - } else if (sender == backColor) { - colorPalette.show(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 20, new Listener<String>() { - public void onEvent(final String color) { - basic.setBackColor(color); - colorPalette.hide(); - } - }); - } else if (sender == fontColor) { - colorPalette.show(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 20, new Listener<String>() { - public void onEvent(final String color) { - basic.setForeColor(color); - colorPalette.hide(); - } - }); - } else if (sender == removeLink) { - extended.removeLink(); - } else if (sender == hr) { - extended.insertHorizontalRule(); - } else if (sender == ol) { - extended.insertOrderedList(); - } else if (sender == ul) { - extended.insertUnorderedList(); - } else if (sender == removeFormat) { - extended.removeFormat(); - } else if (sender == richText) { - // We use the RichTextArea's onKeyUp event to update the - // toolbar status. - // This will catch any cases where the user moves the cursur - // using the - // keyboard, or uses one of the browser's built-in keyboard - // shortcuts. - updateStatus(); - } - if (sender != richText) { - // some button pressed is equiv to edit - fireEdit(); - } - } + public void onClick(final Widget sender) { + if (sender == bold) { + basic.toggleBold(); + } else if (sender == italic) { + basic.toggleItalic(); + } else if (sender == underline) { + basic.toggleUnderline(); + } else if (sender == subscript) { + basic.toggleSubscript(); + } else if (sender == superscript) { + basic.toggleSuperscript(); + } else if (sender == strikethrough) { + extended.toggleStrikethrough(); + } else if (sender == indent) { + extended.rightIndent(); + } else if (sender == outdent) { + extended.leftIndent(); + } else if (sender == justifyLeft) { + basic.setJustification(RichTextArea.Justification.LEFT); + } else if (sender == justifyCenter) { + basic.setJustification(RichTextArea.Justification.CENTER); + } else if (sender == justifyRight) { + basic.setJustification(RichTextArea.Justification.RIGHT); + } else if (sender == insertImage) { + showImagePanel(); + } else if (sender == createLink) { + MessageBox.prompt("Insert a link", "Enter a link URL:", new PromptCallback() { + public void execute(final String btnID, final String text) { + if (btnID.equals("ok") && text != null) { + extended.createLink(text); + } + } + }); + showLinkPanel(); + } else if (sender == backColor) { + colorPalette.show(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 20, new Listener<String>() { + public void onEvent(final String color) { + basic.setBackColor(color); + colorPalette.hide(); + } + }); + } else if (sender == fontColor) { + colorPalette.show(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 20, new Listener<String>() { + public void onEvent(final String color) { + basic.setForeColor(color); + colorPalette.hide(); + } + }); + } else if (sender == removeLink) { + extended.removeLink(); + } else if (sender == hr) { + extended.insertHorizontalRule(); + } else if (sender == ol) { + extended.insertOrderedList(); + } else if (sender == ul) { + extended.insertUnorderedList(); + } else if (sender == removeFormat) { + extended.removeFormat(); + } else if (sender == richText) { + // We use the RichTextArea's onKeyUp event to update the + // toolbar status. + // This will catch any cases where the user moves the cursur + // using the + // keyboard, or uses one of the browser's built-in keyboard + // shortcuts. + updateStatus(); + } + if (sender != richText) { + // some button pressed is equiv to edit + fireEdit(); + } + } - public void onKeyDown(final Widget sender, final char keyCode, final int modifiers) { - if (sender == removeLink && keyCode == KeyboardListener.KEY_ENTER) { - fireEditHTML(); - } - } + public void onKeyDown(final Widget sender, final char keyCode, final int modifiers) { + if (sender == removeLink && keyCode == KeyboardListener.KEY_ENTER) { + fireEditHTML(); + } + } - public void onKeyPress(final Widget sender, final char keyCode, final int modifiers) { - } + public void onKeyPress(final Widget sender, final char keyCode, final int modifiers) { + } - public void onKeyUp(final Widget sender, final char keyCode, final int modifiers) { - if (sender == richText) { - // We use the RichTextArea's onKeyUp event to update the - // toolbar status. - // This will catch any cases where the user moves the cursur - // using the - // keyboard, or uses one of the browser's built-in keyboard - // shortcuts. - updateStatus(); - fireEdit(); - } - } + public void onKeyUp(final Widget sender, final char keyCode, final int modifiers) { + if (sender == richText) { + // We use the RichTextArea's onKeyUp event to update the + // toolbar status. + // This will catch any cases where the user moves the cursur + // using the + // keyboard, or uses one of the browser's built-in keyboard + // shortcuts. + updateStatus(); + fireEdit(); + } + } - private Object[][] getData() { - return new Object[][] { - // new Object[]{"Pirates of the Caribbean", new Integer(2120), new - // Long(1180231870000l), "images/view/carribean.jpg"}, - // new Object[]{"Resident Evil", new Integer(2120), new - // Long(1180231870000l), "images/view/resident_evil.jpg"}, - // new Object[]{"Blood Diamond", new Integer(2120), new - // Long(1180231870000l), "images/view/blood_diamond.jpg"}, - // new Object[]{"No Reservations", new Integer(2120), new - // Long(1180231870000l), "images/view/no_reservations.jpg"}, - // new Object[]{"Casino Royale", new Integer(2120), new - // Long(1180231870000l), "images/view/casino_royale.jpg"}, - // new Object[]{"Good Shepherd", new Integer(2120), new - // Long(1180231870000l), "images/view/good_shepherd.jpg"}, - // new Object[]{"Ghost Rider", new Integer(2120), new - // Long(1180231870000l), "images/view/ghost_rider.jpg"}, - // new Object[]{"Batman Begins", new Integer(2120), new - // Long(1180231870000l), "images/view/batman_begins.jpg"}, - // new Object[]{"Last Samurai", new Integer(2120), new - // Long(1180231870000l), "images/view/last_samurai.jpg"}, - // new Object[]{"Italian Job", new Integer(2120), new - // Long(1180231870000l), "images/view/italian_job.jpg"}, - // new Object[]{"Mission Impossible III", new Integer(2120), new - // Long(1180231870000l), "images/view/mi3.jpg"}, - // new Object[]{"Mr & Mrs Smith", new Integer(2120), new - // Long(1180231870000l), "images/view/smith.jpg"}, - // new Object[]{"Inside Man", new Integer(2120), new - // Long(1180231870000l), "images/view/inside_man.jpg"}, - // new Object[]{"The Island", new Integer(2120), new - // Long(1180231870000l), "images/view/island.jpg"} - }; - } + private Object[][] getData() { + return new Object[][] { + // new Object[]{"Pirates of the Caribbean", new Integer(2120), new + // Long(1180231870000l), "images/view/carribean.jpg"}, + // new Object[]{"Resident Evil", new Integer(2120), new + // Long(1180231870000l), "images/view/resident_evil.jpg"}, + // new Object[]{"Blood Diamond", new Integer(2120), new + // Long(1180231870000l), "images/view/blood_diamond.jpg"}, + // new Object[]{"No Reservations", new Integer(2120), new + // Long(1180231870000l), "images/view/no_reservations.jpg"}, + // new Object[]{"Casino Royale", new Integer(2120), new + // Long(1180231870000l), "images/view/casino_royale.jpg"}, + // new Object[]{"Good Shepherd", new Integer(2120), new + // Long(1180231870000l), "images/view/good_shepherd.jpg"}, + // new Object[]{"Ghost Rider", new Integer(2120), new + // Long(1180231870000l), "images/view/ghost_rider.jpg"}, + // new Object[]{"Batman Begins", new Integer(2120), new + // Long(1180231870000l), "images/view/batman_begins.jpg"}, + // new Object[]{"Last Samurai", new Integer(2120), new + // Long(1180231870000l), "images/view/last_samurai.jpg"}, + // new Object[]{"Italian Job", new Integer(2120), new + // Long(1180231870000l), "images/view/italian_job.jpg"}, + // new Object[]{"Mission Impossible III", new Integer(2120), new + // Long(1180231870000l), "images/view/mi3.jpg"}, + // new Object[]{"Mr & Mrs Smith", new Integer(2120), new + // Long(1180231870000l), "images/view/smith.jpg"}, + // new Object[]{"Inside Man", new Integer(2120), new + // Long(1180231870000l), "images/view/inside_man.jpg"}, + // new Object[]{"The Island", new Integer(2120), new + // Long(1180231870000l), "images/view/island.jpg"} + }; + } - private void showImagePanel() { - // i18n: - final FileUploadFormSample fileUploadFormSample = new FileUploadFormSample(); - final BasicDialog dialog = new BasicDialog("Insert image", false, true, 400, 400); - dialog.add(fileUploadFormSample); - dialog.show(); + private void showImagePanel() { + // i18n: + final FileUploadFormSample fileUploadFormSample = new FileUploadFormSample(); + final BasicDialog dialog = new BasicDialog("Insert image", false, true, 400, 400); + dialog.add(fileUploadFormSample); + dialog.show(); - if (ic == null) { - final MemoryProxy dataProxy = new MemoryProxy(getData()); - final RecordDef recordDef = new RecordDef(new FieldDef[] { new StringFieldDef("name"), - new IntegerFieldDef("size"), new DateFieldDef("lastmod", "timestamp"), - new StringFieldDef("url") }); - final ArrayReader reader = new ArrayReader(recordDef); - final Store store = new Store(dataProxy, reader, true); - store.load(); + if (ic == null) { + final MemoryProxy dataProxy = new MemoryProxy(getData()); + final RecordDef recordDef = new RecordDef(new FieldDef[] { new StringFieldDef("name"), + new IntegerFieldDef("size"), new DateFieldDef("lastmod", "timestamp"), + new StringFieldDef("url") }); + final ArrayReader reader = new ArrayReader(recordDef); + final Store store = new Store(dataProxy, reader, true); + store.load(); - ic = new ImageChooser("Image Chooser", 515, 400, store); - } - Site.important("This is in development and very experimental..."); - ic.show(new ImageChooserCallback() { - public void onImageSelection(final ImageData data) { - // Element el = DomHelper.append("images", - // Format.format("<img src='{0}' - // style='margin:20px;visibility:hidden;'/>", - // data.getUrl())); - // ExtElement extEl = new ExtElement(el); - // extEl.show(true).frame(); - } - }); - // MessageBox.prompt("Insert image", "Enter an image URL:", new - // PromptCallback() { - // public void execute(final String btnID, final String text) { - // if (btnID.equals("ok") && text != null) { - // extended.insertImage(text); - // } - // } - // }); + ic = new ImageChooser("Image Chooser", 515, 400, store); + } + Site.important("This is in development and very experimental..."); + ic.show(new ImageChooserCallback() { + public void onImageSelection(final ImageData data) { + // Element el = DomHelper.append("images", + // Format.format("<img src='{0}' + // style='margin:20px;visibility:hidden;'/>", + // data.getUrl())); + // ExtElement extEl = new ExtElement(el); + // extEl.show(true).frame(); + } + }); + // MessageBox.prompt("Insert image", "Enter an image URL:", new + // PromptCallback() { + // public void execute(final String btnID, final String text) { + // if (btnID.equals("ok") && text != null) { + // extended.insertImage(text); + // } + // } + // }); - } + } - private void showLinkPanel() { - } + private void showLinkPanel() { + } } private static final RichTextArea.FontSize[] fontSizesConstants = new RichTextArea.FontSize[] { - RichTextArea.FontSize.XX_SMALL, RichTextArea.FontSize.X_SMALL, RichTextArea.FontSize.SMALL, - RichTextArea.FontSize.MEDIUM, RichTextArea.FontSize.LARGE, RichTextArea.FontSize.X_LARGE, - RichTextArea.FontSize.XX_LARGE }; + RichTextArea.FontSize.XX_SMALL, RichTextArea.FontSize.X_SMALL, RichTextArea.FontSize.SMALL, + RichTextArea.FontSize.MEDIUM, RichTextArea.FontSize.LARGE, RichTextArea.FontSize.X_LARGE, + RichTextArea.FontSize.XX_LARGE }; private final TextEditorImages images = (TextEditorImages) GWT.create(TextEditorImages.class); private final EventListener listener = new EventListener(); @@ -289,185 +289,185 @@ * Creates a new toolbar that drives the given rich text area. * * @param richText - * the rich text area to be controlled + * the rich text area to be controlled */ public TextEditorToolbar(final RichTextArea richText, final TextEditorPresenter presenter, - final ColorWebSafePalette colorPalette, final I18nTranslationService i18n) { - this.richText = richText; - this.colorPalette = colorPalette; - this.i18n = i18n; - this.basic = richText.getBasicFormatter(); - this.extended = richText.getExtendedFormatter(); - this.presenter = presenter; + final ColorWebSafePalette colorPalette, final I18nTranslationService i18n) { + this.richText = richText; + this.colorPalette = colorPalette; + this.i18n = i18n; + this.basic = richText.getBasicFormatter(); + this.extended = richText.getExtendedFormatter(); + this.presenter = presenter; - initWidget(outer); + initWidget(outer); - outer.add(topPanel); - outer.setVerticalAlignment(VerticalPanel.ALIGN_MIDDLE); - setStyleName("gwt-RichTextToolbar"); + outer.add(topPanel); + outer.setVerticalAlignment(VerticalPanel.ALIGN_MIDDLE); + setStyleName("gwt-RichTextToolbar"); - if (basic != null) { - topPanel.add(bold = createToggleButton(images.bold(), i18n.t("Toggle Bold"))); - topPanel.add(italic = createToggleButton(images.italic(), i18n.t("Toggle Italic"))); - topPanel.add(underline = createToggleButton(images.underline(), i18n.t("Toggle Underline"))); - } + if (basic != null) { + topPanel.add(bold = createToggleButton(images.bold(), i18n.t("Toggle Bold"))); + topPanel.add(italic = createToggleButton(images.italic(), i18n.t("Toggle Italic"))); + topPanel.add(underline = createToggleButton(images.underline(), i18n.t("Toggle Underline"))); + } - if (extended != null) { - topPanel.add(strikethrough = createToggleButton(images.strikeout(), i18n.t("Toggle Strikethrough"))); - } + if (extended != null) { + topPanel.add(strikethrough = createToggleButton(images.strikeout(), i18n.t("Toggle Strikethrough"))); + } - if (basic != null) { - topPanel.add(subscript = createToggleButton(images.subscript(), i18n.t("Toggle Subscript"))); - topPanel.add(superscript = createToggleButton(images.superscript(), i18n.t("Toggle Superscript"))); - topPanel.add(justifyLeft = createPushButton(images.alignleft(), i18n.t("Left Justify"))); - topPanel.add(justifyCenter = createPushButton(images.centerpara(), i18n.t("Center"))); - topPanel.add(justifyRight = createPushButton(images.alignright(), i18n.t("Right Justify"))); - } + if (basic != null) { + topPanel.add(subscript = createToggleButton(images.subscript(), i18n.t("Toggle Subscript"))); + topPanel.add(superscript = createToggleButton(images.superscript(), i18n.t("Toggle Superscript"))); + topPanel.add(justifyLeft = createPushButton(images.alignleft(), i18n.t("Left Justify"))); + topPanel.add(justifyCenter = createPushButton(images.centerpara(), i18n.t("Center"))); + topPanel.add(justifyRight = createPushButton(images.alignright(), i18n.t("Right Justify"))); + } - if (extended != null) { - topPanel.add(indent = createPushButton(images.incrementindent(), i18n.t("Indent Right"))); - topPanel.add(outdent = createPushButton(images.decrementindent(), i18n.t("Indent Left"))); - topPanel.add(hr = createPushButton(images.hfixedline(), i18n.t("Insert Horizontal Rule"))); - topPanel.add(ol = createPushButton(images.defaultnumbering(), i18n.t("Insert Ordered List"))); - topPanel.add(ul = createPushButton(images.defaultbullet(), i18n.t("Insert Unordered List"))); - topPanel.add(insertImage = createPushButton(images.images(), i18n.t("Insert Image"))); - topPanel.add(createLink = createPushButton(images.link(), i18n.t("Create Link"))); - topPanel.add(removeLink = createPushButton(images.linkBreak(), i18n.t("Remove Link"))); - topPanel.add(removeFormat = createPushButton(images.removeFormat(), i18n.t("Remove Formatting"))); - } + if (extended != null) { + topPanel.add(indent = createPushButton(images.incrementindent(), i18n.t("Indent Right"))); + topPanel.add(outdent = createPushButton(images.decrementindent(), i18n.t("Indent Left"))); + topPanel.add(hr = createPushButton(images.hfixedline(), i18n.t("Insert Horizontal Rule"))); + topPanel.add(ol = createPushButton(images.defaultnumbering(), i18n.t("Insert Ordered List"))); + topPanel.add(ul = createPushButton(images.defaultbullet(), i18n.t("Insert Unordered List"))); + topPanel.add(insertImage = createPushButton(images.images(), i18n.t("Insert Image"))); + topPanel.add(createLink = createPushButton(images.link(), i18n.t("Create Link"))); + topPanel.add(removeLink = createPushButton(images.linkBreak(), i18n.t("Remove Link"))); + topPanel.add(removeFormat = createPushButton(images.removeFormat(), i18n.t("Remove Formatting"))); + } - if (basic != null) { - topPanel.add(backColor = createPushButton(images.backcolor(), i18n.t("Background Color"))); - topPanel.add(fontColor = createPushButton(images.fontcolor(), i18n.t("Font Color"))); - topPanel.add(fonts = createFontsMenu()); - topPanel.add(fontSizes = createFontSizesMenu()); + if (basic != null) { + topPanel.add(backColor = createPushButton(images.backcolor(), i18n.t("Background Color"))); + topPanel.add(fontColor = createPushButton(images.fontcolor(), i18n.t("Font Color"))); + topPanel.add(fonts = createFontsMenu()); + topPanel.add(fontSizes = createFontSizesMenu()); - // We only use these listeners for updating status, so don't - // hook them up - // unless at least basic editing is supported. - richText.addKeyboardListener(listener); - richText.addClickListener(listener); - } + // We only use these listeners for updating status, so don't + // hook them up + // unless at least basic editing is supported. + richText.addKeyboardListener(listener); + richText.addClickListener(listener); + } - // if (basic != null) { - // topPanel.add(editHtml = createToggleButton(images.editHtml(), - // i18n.t("Edit HTML"))); - // } + // if (basic != null) { + // topPanel.add(editHtml = createToggleButton(images.editHtml(), + // i18n.t("Edit HTML"))); + // } - // super.setVisible(false); + // super.setVisible(false); } public void editHTML(final boolean edit) { - final boolean enable = !edit; - if (basic != null) { - bold.setEnabled(enable); - italic.setEnabled(enable); - underline.setEnabled(enable); - subscript.setEnabled(enable); - superscript.setEnabled(enable); - justifyLeft.setEnabled(enable); - justifyCenter.setEnabled(enable); - justifyRight.setEnabled(enable); - backColor.setEnabled(enable); - fontColor.setEnabled(enable); - } - if (extended != null) { - strikethrough.setEnabled(enable); - indent.setEnabled(enable); - outdent.setEnabled(enable); - insertImage.setEnabled(enable); - createLink.setEnabled(enable); - removeLink.setEnabled(enable); - ol.setEnabled(enable); - ul.setEnabled(enable); - hr.setEnabled(enable); - removeFormat.setEnabled(enable); - fonts.setVisible(enable); - fontSizes.setVisible(enable); - } + final boolean enable = !edit; + if (basic != null) { + bold.setEnabled(enable); + italic.setEnabled(enable); + underline.setEnabled(enable); + subscript.setEnabled(enable); + superscript.setEnabled(enable); + justifyLeft.setEnabled(enable); + justifyCenter.setEnabled(enable); + justifyRight.setEnabled(enable); + backColor.setEnabled(enable); + fontColor.setEnabled(enable); + } + if (extended != null) { + strikethrough.setEnabled(enable); + indent.setEnabled(enable); + outdent.setEnabled(enable); + insertImage.setEnabled(enable); + createLink.setEnabled(enable); + removeLink.setEnabled(enable); + ol.setEnabled(enable); + ul.setEnabled(enable); + hr.setEnabled(enable); + removeFormat.setEnabled(enable); + fonts.setVisible(enable); + fontSizes.setVisible(enable); + } } private MenuBar createFontSizesMenu() { - final MenuBar menu = new MenuBar(); - final MenuBar submenu = new MenuBar(true); - final String fontSizes[] = { i18n.t("Extra small"), i18n.t("Very small"), i18n.t("small"), i18n.t("Medium"), - i18n.t("Large"), i18n.t("Very large"), i18n.t("Extra large") }; + final MenuBar menu = new MenuBar(); + final MenuBar submenu = new MenuBar(true); + final String fontSizes[] = { i18n.t("Extra small"), i18n.t("Very small"), i18n.t("small"), i18n.t("Medium"), + i18n.t("Large"), i18n.t("Very large"), i18n.t("Extra large") }; - KuneUiUtils.setQuickTip(menu, i18n.t("Font Size")); - menu.addItem(images.fontheight().getHTML(), true, submenu); - for (int i = 0; i < fontSizes.length; i++) { - final String f = fontSizes[i]; - final int fontSize = i; - submenu.addItem("<font size=\"" + (i + 1) + "\">" + f + "</font>", true, new Command() { - public void execute() { - basic.setFontSize(fontSizesConstants[fontSize]); - fireEdit(); - } - }); - } - menu.setStyleName("RichTextToolbar-menu"); - submenu.setStyleName("RichTextToolbar-submenu"); - return menu; + KuneUiUtils.setQuickTip(menu, i18n.t("Font Size")); + menu.addItem(images.fontheight().getHTML(), true, submenu); + for (int i = 0; i < fontSizes.length; i++) { + final String f = fontSizes[i]; + final int fontSize = i; + submenu.addItem("<font size=\"" + (i + 1) + "\">" + f + "</font>", true, new Command() { + public void execute() { + basic.setFontSize(fontSizesConstants[fontSize]); + fireEdit(); + } + }); + } + menu.setStyleName("RichTextToolbar-menu"); + submenu.setStyleName("RichTextToolbar-submenu"); + return menu; } private MenuBar createFontsMenu() { - final MenuBar menu = new MenuBar(); - final MenuBar submenu = new MenuBar(true); - final String fontName[] = { "Times New Roman", "Arial", "Courier New", "Georgia", "Trebuchet", "Verdana" }; + final MenuBar menu = new MenuBar(); + final MenuBar submenu = new MenuBar(true); + final String fontName[] = { "Times New Roman", "Arial", "Courier New", "Georgia", "Trebuchet", "Verdana" }; - KuneUiUtils.setQuickTip(menu, i18n.t("Font Type")); - menu.addItem(images.charfontname().getHTML(), true, submenu); - for (int i = 0; i < fontName.length; i++) { - final String f = fontName[i]; - submenu.addItem("<span style=\"font-family: " + f + "\">" + f + "</span>", true, new Command() { - public void execute() { - basic.setFontName(f); - fireEdit(); - } - }); - } - menu.setStyleName("RichTextToolbar-menu"); - submenu.setStyleName("RichTextToolbar-submenu"); - return menu; + KuneUiUtils.setQuickTip(menu, i18n.t("Font Type")); + menu.addItem(images.charfontname().getHTML(), true, submenu); + for (int i = 0; i < fontName.length; i++) { + final String f = fontName[i]; + submenu.addItem("<span style=\"font-family: " + f + "\">" + f + "</span>", true, new Command() { + public void execute() { + basic.setFontName(f); + fireEdit(); + } + }); + } + menu.setStyleName("RichTextToolbar-menu"); + submenu.setStyleName("RichTextToolbar-submenu"); + return menu; } private PushButton createPushButton(final AbstractImagePrototype img, final String tip) { - final PushButton pb = new PushButton(img.createImage()); - pb.addClickListener(listener); - KuneUiUtils.setQuickTip(pb, tip); - return pb; + final PushButton pb = new PushButton(img.createImage()); + pb.addClickListener(listener); + KuneUiUtils.setQuickTip(pb, tip); + return pb; } private ToggleButton createToggleButton(final AbstractImagePrototype img, final String tip) { - final ToggleButton tb = new ToggleButton(img.createImage()); - tb.addClickListener(listener); - KuneUiUtils.setQuickTip(tb, tip); - return tb; + final ToggleButton tb = new ToggleButton(img.createImage()); + tb.addClickListener(listener); + KuneUiUtils.setQuickTip(tb, tip); + return tb; } private void fireEdit() { - presenter.onEdit(); + presenter.onEdit(); } private void fireEditHTML() { - presenter.onEditHTML(); + presenter.onEditHTML(); } /** * Updates the status of all the stateful buttons. */ private void updateStatus() { - if (basic != null) { - bold.setDown(basic.isBold()); - italic.setDown(basic.isItalic()); - underline.setDown(basic.isUnderlined()); - subscript.setDown(basic.isSubscript()); - superscript.setDown(basic.isSuperscript()); - } + if (basic != null) { + bold.setDown(basic.isBold()); + italic.setDown(basic.isItalic()); + underline.setDown(basic.isUnderlined()); + subscript.setDown(basic.isSubscript()); + superscript.setDown(basic.isSuperscript()); + } - if (extended != null) { - strikethrough.setDown(extended.isStrikethrough()); - } + if (extended != null) { + strikethrough.setDown(extended.isStrikethrough()); + } } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplIE6.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplIE6.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplIE6.java 2008-10-21 19:26:47 UTC (rev 917) @@ -24,42 +24,44 @@ /** * A wrapper used to inject css into RTA. As published in: * - * http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/f64c… + * http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/ + * f64c0024d8676a66 + * /d5f26a54145fc5d4?lnk=st&q=richtextarea+style#d5f26a54145fc5d4 * * FIXME: Only for IE and Mozilla * */ public class WrappedRichTextAreaImplIE6 extends RichTextAreaImplIE6 { - @Override - public native void initElement() /*-{ - var _this = this; - _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; + @Override + public native void initElement() /*-{ + var _this = this; + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; - setTimeout(function() { - if (_this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing == false) { - return; - } + setTimeout(function() { + if (_this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing == false) { + return; + } - // Attempt to set the iframe document's body to 'contentEditable' mode. - // There's no way to know when the body will actually be available, so - // keep trying every so often until it is. - // Note: The body seems to be missing only rarely, so please don't remove - // this retry loop just because it's hard to reproduce. - var elem = [email protected]::elem; - var doc = elem.contentWindow.document; - if (!doc.body) { - // Retry in 50 ms. Faster would run the risk of pegging the CPU. Slower - // would increase the probability of a user-visible delay. - setTimeout(arguments.callee, 50); - return; - } - var ct = "<html><head><style>@import url('" + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; - doc.write( ct ); - doc.body.contentEditable = true; + // Attempt to set the iframe document's body to 'contentEditable' mode. + // There's no way to know when the body will actually be available, so + // keep trying every so often until it is. + // Note: The body seems to be missing only rarely, so please don't remove + // this retry loop just because it's hard to reproduce. + var elem = [email protected]::elem; + var doc = elem.contentWindow.document; + if (!doc.body) { + // Retry in 50 ms. Faster would run the risk of pegging the CPU. Slower + // would increase the probability of a user-visible delay. + setTimeout(arguments.callee, 50); + return; + } + var ct = "<html><head><style>@import url('" + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; + doc.write( ct ); + doc.body.contentEditable = true; - // Send notification that the iframe has reached design mode. - _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); - }, 1); - }-*/; + // Send notification that the iframe has reached design mode. + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); + }, 1); + }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplMozilla.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplMozilla.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplMozilla.java 2008-10-21 19:26:47 UTC (rev 917) @@ -24,58 +24,59 @@ /** * A wrapper used to inject css into RTA. As published in: * - * http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/f64c… + * http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/ + * f64c0024d8676a66 + * /d5f26a54145fc5d4?lnk=st&q=richtextarea+style#d5f26a54145fc5d4 * * FIXME: Only for IE and Mozilla * */ public class WrappedRichTextAreaImplMozilla extends RichTextAreaImplMozilla { - @Override - public native void initElement() /*-{ - // Mozilla doesn't allow designMode to be set reliably until the iframe is - // fully loaded. - var _this = this; - var iframe = [email protected]::elem; - _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; + @Override + public native void initElement() /*-{ + // Mozilla doesn't allow designMode to be set reliably until the iframe is + // fully loaded. + var _this = this; + var iframe = [email protected]::elem; + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; - iframe.onload = function() { - // Some Mozillae have the nasty habit of calling onload again when you set - // designMode, so let's avoid doing it more than once. - iframe.onload = null; + iframe.onload = function() { + // Some Mozillae have the nasty habit of calling onload again when you set + // designMode, so let's avoid doing it more than once. + iframe.onload = null; - // patch ccs inject: + // patch ccs inject: - var doc = [email protected]::elem.contentWindow.document; - head=doc.getElementsByTagName('head')[0]; - link=document.createElement('link'); - link.setAttribute('rel',"stylesheet"); - link.setAttribute('type',"text/css"); - link.setAttribute('href',"css/richtext.css" ); - head.appendChild(link); + var doc = [email protected]::elem.contentWindow.document; + head=doc.getElementsByTagName('head')[0]; + link=document.createElement('link'); + link.setAttribute('rel',"stylesheet"); + link.setAttribute('type',"text/css"); + link.setAttribute('href',"css/richtext.css" ); + head.appendChild(link); - var styles = document.createElement('style'); - styles.setAttribute('type', 'text/css'); - var newStyle = document.createTextNode('\n\n'); - styles.appendChild(newStyle); - head.appendChild(styles); + var styles = document.createElement('style'); + styles.setAttribute('type', 'text/css'); + var newStyle = document.createTextNode('\n\n'); + styles.appendChild(newStyle); + head.appendChild(styles); - // -- patch + // -- patch - // Send notification that the iframe has finished loading. - _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); + // Send notification that the iframe has finished loading. + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); - // Don't set designMode until the RTA actually gets focused. This is - // necessary because editing won't work on Mozilla if the iframe is - // *hidden, but attached*. Waiting for focus gets around this issue. - // - // Note: This onfocus will not conflict with the addEventListener('focus', - // ...) // in RichTextAreaImplStandard. - iframe.contentWindow.onfocus = function() { - iframe.contentWindow.onfocus = null; - iframe.contentWindow.document.designMode = 'On'; - }; - }; - }-*/; + // Don't set designMode until the RTA actually gets focused. This is + // necessary because editing won't work on Mozilla if the iframe is + // *hidden, but attached*. Waiting for focus gets around this issue. + // + // Note: This onfocus will not conflict with the addEventListener('focus', + // ...) // in RichTextAreaImplStandard. + iframe.contentWindow.onfocus = function() { + iframe.contentWindow.onfocus = null; + iframe.contentWindow.document.designMode = 'On'; + }; + }; + }-*/; } - Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplOpera.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplOpera.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplOpera.java 2008-10-21 19:26:47 UTC (rev 917) @@ -6,24 +6,24 @@ @Override public native void initElement() /*-{ - // Most browsers don't like setting designMode until slightly _after_ - // the iframe becomes attached to the DOM. Any non-zero timeout will do - // just fine. - var _this = this; - _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; - setTimeout(function() { - // Turn on design mode. - [email protected]::elem.contentWindow.document.designMode = 'On'; - // patch css inject: - var elem = [email protected]::elem; - var doc = elem.contentWindow.document; - var ct = "<html><head><style>@import url('" + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; - doc.write( ct ); - // -- patch + // Most browsers don't like setting designMode until slightly _after_ + // the iframe becomes attached to the DOM. Any non-zero timeout will do + // just fine. + var _this = this; + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; + setTimeout(function() { + // Turn on design mode. + [email protected]::elem.contentWindow.document.designMode = 'On'; + // patch css inject: + var elem = [email protected]::elem; + var doc = elem.contentWindow.document; + var ct = "<html><head><style>@import url('" + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; + doc.write( ct ); + // -- patch - // Send notification that the iframe has reached design mode. - _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); - }, 1); - }-*/; + // Send notification that the iframe has reached design mode. + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); + }, 1); + }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplSafari.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplSafari.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplSafari.java 2008-10-21 19:26:47 UTC (rev 917) @@ -6,25 +6,25 @@ @Override public native void initElement() /*-{ - // Most browsers don't like setting designMode until slightly _after_ - // the iframe becomes attached to the DOM. Any non-zero timeout will do - // just fine. - var _this = this; - _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; - setTimeout(function() { - // Turn on design mode. - [email protected]::elem.contentWindow.document.designMode = 'On'; - - // patch css inject: - var elem = [email protected]::elem; - var doc = elem.contentWindow.document; - var ct = "<html><head><style>@import url('" + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; - doc.write( ct ); - // -- patch + // Most browsers don't like setting designMode until slightly _after_ + // the iframe becomes attached to the DOM. Any non-zero timeout will do + // just fine. + var _this = this; + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; + setTimeout(function() { + // Turn on design mode. + [email protected]::elem.contentWindow.document.designMode = 'On'; + + // patch css inject: + var elem = [email protected]::elem; + var doc = elem.contentWindow.document; + var ct = "<html><head><style>@import url('" + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; + doc.write( ct ); + // -- patch - // Send notification that the iframe has reached design mode. - _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); - }, 1); - }-*/; + // Send notification that the iframe has reached design mode. + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); + }, 1); + }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogo.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogo.java 2008-10-21 19:26:47 UTC (rev 917) @@ -2,6 +2,14 @@ public interface EntityLogo { + /** + * Refresh the logo from the group info in the client session + */ void refreshGroupLogo(); + /** + * Reload the logo from the group reloaded from the server + */ + void reloadGroupLogo(); + } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -22,7 +22,6 @@ import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.services.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.dialogs.InfoDialog; 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; @@ -43,83 +42,90 @@ class EntityTextLogo extends VerticalPanel { private static final int GROUP_NAME_LIMIT_SIZE = 90; + private static final String LOGO_DEFAULT_FONT_SIZE = "167%"; private static final String LOGO_SMALL_FONT_SIZE = "108%"; - private static final String LOGO_DEFAULT_FONT_SIZE = "167%"; - private final Label defTextLogoLabel; + private final Label logoLabel; private final Hyperlink defTextPutYourLogoHL; private final HorizontalPanel putYourLogoHP; + private final Image logoImage; - public EntityTextLogo() { + public EntityTextLogo(final Provider<EntityLogoSelector> entityLogoSelectorProvider) { // Initialize super(); - defTextLogoLabel = new Label(); + HorizontalPanel logoHP = new HorizontalPanel(); + logoImage = new Image(); + logoLabel = new Label(); + logoHP.add(logoImage); + logoHP.add(logoLabel); final HTML expandCell = new HTML("<b></b>"); putYourLogoHP = new HorizontalPanel(); defTextPutYourLogoHL = new Hyperlink(); // Layout - add(defTextLogoLabel); + add(logoHP); add(putYourLogoHP); putYourLogoHP.add(expandCell); putYourLogoHP.add(defTextPutYourLogoHL); // Set properties defTextPutYourLogoHL.setText(i18n.t("Put Your Logo Here")); + defTextPutYourLogoHL.addStyleName("kune-pointer"); defTextPutYourLogoHL.addClickListener(new ClickListener() { public void onClick(final Widget sender) { - final InfoDialog infoDialog = new InfoDialog( - "Configure your group logo", - "Howto configure your group logo", - "For configure your group's logo just add an image to your group contents and select it as your group's logo (see menu 'File'). Whe are working into a more direct way to do that.", - i18n.t("Ok"), false, false, 300, 200); - infoDialog.show(); + entityLogoSelectorProvider.get().show(); } }); expandCell.setWidth("100%"); putYourLogoHP.setCellWidth(expandCell, "100%"); // TODO: link to configure the logo setStylePrimaryName("k-entitytextlogo"); - setDefaultText(""); + logoImage.setVisible(false); + setLogoText(""); } - public void setDefaultText(final String text) { + public void setLogoImage(final String url) { + logoImage.setUrl(url); + } + + public void setLogoText(final String text) { if (text.length() > GROUP_NAME_LIMIT_SIZE) { - DOM.setStyleAttribute(defTextLogoLabel.getElement(), "fontSize", LOGO_SMALL_FONT_SIZE); + DOM.setStyleAttribute(logoLabel.getElement(), "fontSize", LOGO_SMALL_FONT_SIZE); } else { - DOM.setStyleAttribute(defTextLogoLabel.getElement(), "fontSize", LOGO_DEFAULT_FONT_SIZE); + DOM.setStyleAttribute(logoLabel.getElement(), "fontSize", LOGO_DEFAULT_FONT_SIZE); } - defTextLogoLabel.setText(text); + logoLabel.setText(text); + } + public void setLogoVisible(final boolean visible) { + logoImage.setVisible(visible); } public void setPutYourLogoVisible(final boolean visible) { putYourLogoHP.setVisible(visible); } - } - private static final int LOGO_ICON_DEFAULT_WIDTH = 468; - private static final int LOGO_ICON_DEFAULT_HEIGHT = 60; - + private final Provider<FileDownloadUtils> downloadProvider; + private final Provider<EntityLogoSelector> entityLogoSelectorProvider; private EntityTextLogo entityTextLogo; private final I18nTranslationService i18n; - private final Provider<FileDownloadUtils> downloadProvider; public EntityLogoPanel(final I18nTranslationService i18n, final WorkspaceSkeleton ws, - final Provider<FileDownloadUtils> dowloadProvider) { + final Provider<FileDownloadUtils> dowloadProvider, + final Provider<EntityLogoSelector> entityLogoSelectorProvider) { this.i18n = i18n; this.downloadProvider = dowloadProvider; + this.entityLogoSelectorProvider = entityLogoSelectorProvider; ws.addToEntityMainHeader(this); } - public void setLogo(final StateToken stateToken, final boolean clipped) { + public void setFullLogo(final StateToken stateToken, final boolean clipped) { clear(); final String imageUrl = downloadProvider.get().getImageUrl(stateToken); Image logo; if (clipped) { logo = new Image(imageUrl, 0, 0, LOGO_ICON_DEFAULT_WIDTH, LOGO_ICON_DEFAULT_HEIGHT); } else { - logo = new Image(imageUrl); logo.setWidth("" + LOGO_ICON_DEFAULT_WIDTH); logo.setHeight("" + LOGO_ICON_DEFAULT_HEIGHT); @@ -127,10 +133,18 @@ add(logo); } - public void setLogo(final String groupName) { + public void setLogoImage(StateToken stateToken) { + entityTextLogo.setLogoImage(downloadProvider.get().getLogoImageUrl(stateToken)); + } + + public void setLogoImageVisible(boolean visible) { + entityTextLogo.setLogoVisible(visible); + } + + public void setLogoText(final String groupName) { clear(); add(getEntityTextLogo()); - entityTextLogo.setDefaultText(groupName); + entityTextLogo.setLogoText(groupName); } public void setPutYourLogoVisible(final boolean visible) { @@ -146,9 +160,8 @@ private EntityTextLogo getEntityTextLogo() { if (entityTextLogo == null) { - this.entityTextLogo = new EntityTextLogo(); + this.entityTextLogo = new EntityTextLogo(entityLogoSelectorProvider); } return entityTextLogo; } - } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -3,53 +3,81 @@ import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; import org.ourproject.kune.platf.client.dto.GroupDTO; import org.ourproject.kune.platf.client.dto.StateDTO; +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.themes.WsTheme; import org.ourproject.kune.workspace.client.themes.WsThemePresenter; +import com.calclab.suco.client.ioc.Provider; import com.calclab.suco.client.listener.Listener; import com.calclab.suco.client.listener.Listener2; public class EntityLogoPresenter implements EntityLogo { private EntityLogoView view; private final Session session; + private final Provider<GroupServiceAsync> groupServiceProvider; - public EntityLogoPresenter(final StateManager stateManager, final WsThemePresenter theme, final Session session) { - this.session = session; - stateManager.onGroupChanged(new Listener2<GroupDTO, GroupDTO>() { - public void onEvent(final GroupDTO oldGroup, final GroupDTO newGroup) { - setGroupLogo(newGroup); - } - }); - stateManager.onStateChanged(new Listener<StateDTO>() { - public void onEvent(final StateDTO state) { - final boolean isAdmin = state.getGroupRights().isAdministrable(); - view.setPutYourLogoVisible(isAdmin); - } - }); - theme.onThemeChanged(new Listener2<WsTheme, WsTheme>() { - public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { - view.setTheme(oldTheme, newTheme); - } - }); + public EntityLogoPresenter(final StateManager stateManager, final WsThemePresenter theme, final Session session, + Provider<GroupServiceAsync> groupServiceProvider) { + this.session = session; + this.groupServiceProvider = groupServiceProvider; + + stateManager.onGroupChanged(new Listener2<GroupDTO, GroupDTO>() { + public void onEvent(final GroupDTO oldGroup, final GroupDTO newGroup) { + setGroupLogo(newGroup); + } + }); + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(final StateDTO state) { + final boolean isAdmin = state.getGroupRights().isAdministrable(); + view.setPutYourLogoVisible(isAdmin); + } + }); + theme.onThemeChanged(new Listener2<WsTheme, WsTheme>() { + public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { + view.setTheme(oldTheme, newTheme); + } + }); } public void init(final EntityLogoView view) { - this.view = view; + this.view = view; } public void refreshGroupLogo() { - setGroupLogo(session.getCurrentState().getGroup()); + setGroupLogo(session.getCurrentState().getGroup()); } + public void reloadGroupLogo() { + groupServiceProvider.get().getGroup(session.getUserHash(), session.getCurrentStateToken(), + new AsyncCallbackSimple<GroupDTO>() { + public void onSuccess(GroupDTO group) { + StateDTO currentState = session.getCurrentState(); + if (currentState.getGroup().getShortName().equals( + group.getShortName())) { + // only if we are in the + // same group + currentState.setGroup(group); + setGroupLogo(group); + } + } + }); + } + private void setGroupLogo(final GroupDTO group) { - final ContentSimpleDTO groupLogo = group.getGroupLogo(); - if (groupLogo != null) { - view.setLogo(groupLogo.getStateToken(), true); - } else { - view.setLogo(group.getLongName()); - } + final ContentSimpleDTO groupFullLogo = group.getGroupFullLogo(); + if (groupFullLogo != null) { + view.setFullLogo(groupFullLogo.getStateToken(), true); + } else if (group.hasLogo()) { + view.setLogoImage(new StateToken(group.getShortName())); + view.setLogoText(group.getLongName()); + view.setLogoImageVisible(true); + } else { + view.setLogoText(group.getLongName()); + view.setLogoImageVisible(false); + } } - } Added: trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelector.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelector.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelector.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,5 @@ +package org.ourproject.kune.workspace.client.entitylogo; + +public interface EntityLogoSelector { + void show(); +} Added: trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelectorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelectorPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelectorPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,97 @@ +package org.ourproject.kune.workspace.client.entitylogo; + +import org.ourproject.kune.platf.client.services.I18nTranslationService; +import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; +import org.ourproject.kune.platf.client.ui.download.FileParams; +import org.ourproject.kune.workspace.client.site.Site; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; + +import com.gwtext.client.core.Connection; +import com.gwtext.client.core.EventObject; +import com.gwtext.client.widgets.Button; +import com.gwtext.client.widgets.event.ButtonListenerAdapter; +import com.gwtext.client.widgets.form.Form; +import com.gwtext.client.widgets.form.FormPanel; +import com.gwtext.client.widgets.form.Hidden; +import com.gwtext.client.widgets.form.TextField; +import com.gwtext.client.widgets.form.event.FormListener; + +public class EntityLogoSelectorPanel implements EntityLogoSelectorView { + + private static final String ICON_UPLOAD_SERVLET = "/kune/servlets/EntityLogoUploadManager"; + private final BasicDialog dialog; + private final FormPanel form; + private final Hidden userhashField; + private final Hidden tokenField; + + public EntityLogoSelectorPanel(final EntityLogoSelectorPresenter presenter, final WorkspaceSkeleton ws, + I18nTranslationService i18n) { + dialog = new BasicDialog(i18n.t("Select an logo for your group"), true, true, 300, 120); + + form = new FormPanel(); + form.setBorder(false); + form.setFrame(false); + form.setFileUpload(true); + form.setMethod(Connection.POST); + form.setUrl(ICON_UPLOAD_SERVLET); + form.setWaitMsgTarget(true); + form.setHideLabels(true); + dialog.setMargins(10); + form.addFormListener(new FormListener() { + public boolean doBeforeAction(Form form) { + return true; + } + + public void onActionComplete(Form form, int httpStatus, String responseText) { + Site.important(responseText); + presenter.onSubmitComplete(httpStatus, responseText); + } + + public void onActionFailed(Form form, int httpStatus, String responseText) { + Site.important(responseText); + presenter.onSubmitFailed(httpStatus, responseText); + } + }); + + final TextField file = new TextField("File", EntityLogoView.LOGO_FORM_FIELD); + file.setInputType("file"); + userhashField = new Hidden(FileParams.HASH, FileParams.HASH); + tokenField = new Hidden(FileParams.TOKEN, FileParams.TOKEN); + form.add(userhashField); + form.add(tokenField); + form.add(file); + + Button submit = new Button(i18n.t("Select")); + submit.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(Button button, EventObject e) { + form.getForm().submit(); + } + }); + Button cancel = new Button(i18n.t("Cancel")); + cancel.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(Button button, EventObject e) { + presenter.onCancel(); + } + }); + dialog.addButton(submit); + dialog.addButton(cancel); + dialog.add(form); + dialog.show(); + } + + public void hide() { + dialog.hide(); + form.getForm().reset(); + } + + public void setUploadParams(String userHash, String token) { + userhashField.setValue(userHash); + tokenField.setValue(token); + } + + public void show() { + dialog.show(); + } +} Added: trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelectorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelectorPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelectorPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,43 @@ +package org.ourproject.kune.workspace.client.entitylogo; + +import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.state.Session; +import org.ourproject.kune.workspace.client.site.Site; + +public class EntityLogoSelectorPresenter implements EntityLogoSelector { + + private EntityLogoSelectorView view; + private final Session session; + private final EntityLogo entityLogo; + + public EntityLogoSelectorPresenter(Session session, EntityLogo entityLogo) { + this.session = session; + this.entityLogo = entityLogo; + } + + public View getView() { + return view; + } + + public void init(EntityLogoSelectorView view) { + this.view = view; + } + + public void onCancel() { + view.hide(); + } + + public void onSubmitComplete(int httpStatus, String responseText) { + view.hide(); + entityLogo.reloadGroupLogo(); + } + + public void onSubmitFailed(int httpStatus, String responseText) { + Site.error("Error setting the group logo"); + } + + public void show() { + view.setUploadParams(session.getUserHash(), session.getCurrentStateToken().toString()); + view.show(); + } +} Added: trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelectorView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelectorView.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoSelectorView.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,11 @@ +package org.ourproject.kune.workspace.client.entitylogo; + +import org.ourproject.kune.platf.client.View; + +public interface EntityLogoSelectorView extends View { + void hide(); + + void setUploadParams(String userHash, String token); + + void show(); +} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoView.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoView.java 2008-10-21 19:26:47 UTC (rev 917) @@ -5,10 +5,22 @@ public interface EntityLogoView { - void setLogo(StateToken stateToken, boolean clipped); + int LOGO_ICON_DEFAULT_HEIGHT = 60; + int LOGO_ICON_DEFAULT_WIDTH = 468; - void setLogo(final String groupName); + int LOGO_ICON_MIN_HEIGHT = 28; + int LOGO_ICON_MIN_WIDTH = 468; + String LOGO_FORM_FIELD = "k-elv-ff"; + + void setFullLogo(StateToken stateToken, boolean clipped); + + void setLogoImage(StateToken stateToken); + + void setLogoImageVisible(boolean visible); + + void setLogoText(final String groupName); + void setPutYourLogoVisible(final boolean visible); void setTheme(final WsTheme oldTheme, WsTheme newTheme); 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -35,64 +35,64 @@ private final I18nUITranslationService i18n; public I18nTranslatorPresenter(final Session session, final I18nServiceAsync i18nService, - final I18nUITranslationService i18n) { - this.session = session; - this.i18nService = i18nService; - this.i18n = i18n; - session.onUserSignOut(new Listener0() { - public void onEvent() { - view.hideTranslatorAndIcon(); - } - }); + final I18nUITranslationService i18n) { + this.session = session; + this.i18nService = i18nService; + this.i18n = i18n; + session.onUserSignOut(new Listener0() { + public void onEvent() { + view.hideTranslatorAndIcon(); + } + }); } public void doClose() { - view.hide(); + view.hide(); } public void doShowTranslator() { - Site.showProgressLoading(); - if (session.isLogged()) { - view.show(); - } else { - Site.info(i18n.t("Sign in or register to help with translation")); - } - Site.hideProgress(); + Site.showProgressLoading(); + if (session.isLogged()) { + view.show(); + } else { + Site.info(i18n.t("Sign in or register to help with translation")); + } + Site.hideProgress(); } public void doTranslation(final String id, final String trKey, final String translation) { - Site.showProgressSaving(); - i18nService.setTranslation(session.getUserHash(), id, translation, new AsyncCallback<String>() { - public void onFailure(final Throwable caught) { - Site.hideProgress(); - Site.error(i18n.t("Server error saving translation")); - } + Site.showProgressSaving(); + i18nService.setTranslation(session.getUserHash(), id, translation, new AsyncCallback<String>() { + public void onFailure(final Throwable caught) { + Site.hideProgress(); + Site.error(i18n.t("Server error saving translation")); + } - public void onSuccess(final String result) { - Site.hideProgress(); - i18n.setTranslationAfterSave(trKey, result); - } - }); + public void onSuccess(final String result) { + Site.hideProgress(); + i18n.setTranslationAfterSave(trKey, result); + } + }); } public I18nLanguageDTO getLanguage() { - return session.getCurrentLanguage(); + return session.getCurrentLanguage(); } public Object[][] getLanguages() { - return session.getLanguagesArray(); + return session.getLanguagesArray(); } public View getView() { - return view; + return view; } public void hide() { - view.hide(); + view.hide(); } public void init(final I18nTranslatorView view) { - this.view = view; + this.view = view; } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nUITranslationService.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nUITranslationService.java 2008-10-21 19:26:47 UTC (rev 917) @@ -47,77 +47,77 @@ * direction, for instance. */ public void addI18nChangeListener(final I18nChangeListener listener) { - if (i18nChangeListeners == null) { - i18nChangeListeners = new I18nChangeListenerCollection(); - } - i18nChangeListeners.add(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); - } + if (!newLanguage.equals(this.currentLanguageCode)) { + setCurrentLanguage(newLanguage); + changeLocale(newLanguage); + } } public String getCurrentLanguage() { - return currentLanguageCode; + return currentLanguageCode; } public I18nLanguageDTO getInitialLang() { - return initialLang; + return initialLang; } public HashMap<String, String> getLexicon() { - return lexicon; + 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"); - } + this.i18nService = i18nService; + this.session = session; + final Location loc = WindowUtils.getLocation(); + final String locale = loc.getParameter("locale"); + i18nService.getInitialLanguage(locale, new AsyncCallback<I18nLanguageDTO>() { + public void onFailure(final Throwable caught) { + Log.error("Workspace adaptation to your language failed"); + } - public void onSuccess(final I18nLanguageDTO result) { - initialLang = result; - currentLanguageCode = initialLang.getCode(); - session.setCurrentLanguage(initialLang); - i18nService.getLexicon(initialLang.getCode(), new AsyncCallback<HashMap<String, String>>() { - public void onFailure(final Throwable caught) { - Log.error("Workspace adaptation to your language failed"); - } + public void onSuccess(final I18nLanguageDTO result) { + initialLang = result; + currentLanguageCode = initialLang.getCode(); + session.setCurrentLanguage(initialLang); + i18nService.getLexicon(initialLang.getCode(), new AsyncCallback<HashMap<String, String>>() { + public void onFailure(final Throwable caught) { + Log.error("Workspace adaptation to your language failed"); + } - public void onSuccess(final HashMap<String, String> result) { - lexicon = result; - onReady.onEvent(); - } - }); - } - }); + public void onSuccess(final HashMap<String, String> result) { + lexicon = result; + onReady.onEvent(); + } + }); + } + }); } public void removeI18nChangeListener(final I18nChangeListener listener) { - if (i18nChangeListeners != null) { - i18nChangeListeners.remove(listener); - } + if (i18nChangeListeners != null) { + i18nChangeListeners.remove(listener); + } } public void setCurrentLanguage(final String newLanguage) { - this.currentLanguageCode = newLanguage; + this.currentLanguageCode = newLanguage; } public void setLexicon(final HashMap<String, String> lexicon) { - this.lexicon = lexicon; - fireI18nLanguageChange(); + this.lexicon = lexicon; + fireI18nLanguageChange(); } public void setTranslationAfterSave(final String text, final String translation) { - lexicon.put(text, translation); - fireI18nLanguageChange(); + lexicon.put(text, translation); + fireI18nLanguageChange(); } /** @@ -131,37 +131,39 @@ * @param text * @return text translated in the current language */ + @Override public String t(final String text) { - final String encodeText = KuneStringUtils.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) { - } + final String encodeText = KuneStringUtils.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); + 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/5e4e… + * 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. @@ -171,14 +173,14 @@ * the "debugger" line. * * @param newLocale - * String value of the new locale to go to. + * 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; + // debugger; // Get the current location var currLocation = $wnd.location.toString(); @@ -195,18 +197,18 @@ // 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); + // 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(); - } + if (i18nChangeListeners != null) { + i18nChangeListeners.fireI18nLanguageChange(); + } } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -29,26 +29,26 @@ private final Session session; public LanguageSelectorPresenter(final Session session) { - this.session = session; + this.session = session; } public Object[][] getLanguages() { - return session.getLanguagesArray(); + return session.getLanguagesArray(); } public String getSelectedLanguage() { - return view.getLanguage(); + return view.getLanguage(); } public View getView() { - return view; + return view; } public void init(final LanguageSelectorView view) { - this.view = view; + this.view = view; } public void setLanguage(final I18nLanguageDTO language) { - view.setLanguage(language.getCode()); + view.setLanguage(language.getCode()); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/ui/I18nTranslatorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/ui/I18nTranslatorPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/ui/I18nTranslatorPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -77,252 +77,252 @@ private SiteBottomTrayButton traybarButton; public I18nTranslatorPanel(final I18nTranslatorPresenter initPresenter, final I18nTranslationService i18n, - final LanguageSelector languageSelector, final WorkspaceSkeleton ws) { - super(i18n); - this.presenter = initPresenter; - this.languageSelector = languageSelector; - this.ws = ws; + final LanguageSelector languageSelector, final WorkspaceSkeleton ws) { + super(i18n); + this.presenter = initPresenter; + this.languageSelector = languageSelector; + this.ws = ws; } public void close() { - dialog.hide(); + dialog.hide(); } public void hide() { - dialog.hide(); + dialog.hide(); } public void hideTranslatorAndIcon() { - if (dialog.isRendered()) { - dialog.hide(); - } - if (traybarButton != null) { - traybarButton.destroy(); - traybarButton = null; - } + if (dialog.isRendered()) { + dialog.hide(); + } + if (traybarButton != null) { + traybarButton.destroy(); + traybarButton = null; + } } public void show() { - if (dialog == null) { - dialog = createDialog(); - } - // By default we use the user lang to help in translation - final I18nLanguageDTO lang = presenter.getLanguage(); - setLanguage(lang); - final String languageNativeNameIfAvailable = lang.getNativeName().length() > 0 ? lang.getNativeName() : lang - .getEnglishName(); - dialog.setTitle(i18n.t("Help to translate kune to [%s]", languageNativeNameIfAvailable)); - dialog.show(); - dialog.expand(); - dialog.center(); - if (traybarButton == null) { - traybarButton = new SiteBottomTrayButton("images/language.gif", i18n.t("Show/hide translator"), dialog, ws); - } + if (dialog == null) { + dialog = createDialog(); + } + // By default we use the user lang to help in translation + final I18nLanguageDTO lang = presenter.getLanguage(); + setLanguage(lang); + final String languageNativeNameIfAvailable = lang.getNativeName().length() > 0 ? lang.getNativeName() + : lang.getEnglishName(); + dialog.setTitle(i18n.t("Help to translate kune to [%s]", languageNativeNameIfAvailable)); + dialog.show(); + dialog.expand(); + dialog.center(); + if (traybarButton == null) { + traybarButton = new SiteBottomTrayButton("images/language.gif", i18n.t("Show/hide translator"), dialog, ws); + } } private Window createDialog() { - final Panel north = new Panel(); - north.setBorder(false); + final Panel north = new Panel(); + north.setBorder(false); - final Panel center = new TabPanel(); - center.setAutoScroll(false); - center.setClosable(false); - center.setBorder(false); + final Panel center = new TabPanel(); + center.setAutoScroll(false); + center.setClosable(false); + center.setBorder(false); - final Window dialog = new BasicDialog("", false, false, 720, 330); - // dialog.setResizable(false); - dialog.setIconCls("i18n-icon"); + final Window dialog = new BasicDialog("", false, false, 720, 330); + // dialog.setResizable(false); + dialog.setIconCls("i18n-icon"); - final Button close = new Button(); - close.setText(i18n.tWithNT("Close", "used in button")); - close.addListener(new ButtonListenerAdapter() { - public void onClick(final Button button, final EventObject e) { - presenter.doClose(); - } - }); - dialog.addButton(close); + final Button close = new Button(); + close.setText(i18n.tWithNT("Close", "used in button")); + close.addListener(new ButtonListenerAdapter() { + public void onClick(final Button button, final EventObject e) { + presenter.doClose(); + } + }); + dialog.addButton(close); - final Panel unTransCenterPanel = new Panel(i18n.t("Untranslated")); - unTransCenterPanel.setAutoScroll(false); - unTransCenterPanel.setLayout(new FitLayout()); + final Panel unTransCenterPanel = new Panel(i18n.t("Untranslated")); + unTransCenterPanel.setAutoScroll(false); + unTransCenterPanel.setLayout(new FitLayout()); - final Panel transCenterPanel = new Panel(i18n.t("Translated")); - transCenterPanel.setAutoScroll(false); - transCenterPanel.setLayout(new FitLayout()); + final Panel transCenterPanel = new Panel(i18n.t("Translated")); + transCenterPanel.setAutoScroll(false); + transCenterPanel.setLayout(new FitLayout()); - final Panel recommendationPanel = new Panel(i18n.t("Recommendations")); - recommendationPanel.setAutoScroll(true); - recommendationPanel.setLayout(new FitLayout()); + final Panel recommendationPanel = new Panel(i18n.t("Recommendations")); + recommendationPanel.setAutoScroll(true); + recommendationPanel.setLayout(new FitLayout()); - transGrid = createGridPanel(true); - unTransGrid = createGridPanel(false); - final HorizontalPanel hp = new HorizontalPanel(); - languageSelectorPanel = (LanguageSelectorPanel) languageSelector.getView(); - languageSelectorPanel.addChangeListener(new ComboBoxListenerAdapter() { - public void onSelect(final ComboBox comboBox, final Record record, final int index) { - setLanguage(record.getAsString(LanguageSelectorPanel.LANG_ID)); - dialog.setTitle(i18n.t("Help to translate kune to [%s]", record.getAsString("language"))); - } - }); - hp.add(languageSelectorPanel); - hp.addStyleName("kune-Margin-Large-trbl"); - north.add(hp); + transGrid = createGridPanel(true); + unTransGrid = createGridPanel(false); + final HorizontalPanel hp = new HorizontalPanel(); + languageSelectorPanel = (LanguageSelectorPanel) languageSelector.getView(); + languageSelectorPanel.addChangeListener(new ComboBoxListenerAdapter() { + public void onSelect(final ComboBox comboBox, final Record record, final int index) { + setLanguage(record.getAsString(LanguageSelectorPanel.LANG_ID)); + dialog.setTitle(i18n.t("Help to translate kune to [%s]", record.getAsString("language"))); + } + }); + hp.add(languageSelectorPanel); + hp.addStyleName("kune-Margin-Large-trbl"); + north.add(hp); - unTransCenterPanel.add(unTransGrid); - transCenterPanel.add(transGrid); - final Frame recommFrame = new Frame("html/i18n-recom.html"); - recommFrame.setHeight("auto"); - recommendationPanel.add(recommFrame); + unTransCenterPanel.add(unTransGrid); + transCenterPanel.add(transGrid); + final Frame recommFrame = new Frame("html/i18n-recom.html"); + recommFrame.setHeight("auto"); + recommendationPanel.add(recommFrame); - center.add(unTransCenterPanel); - center.add(transCenterPanel); - center.add(recommendationPanel); - dialog.add(north, new BorderLayoutData(RegionPosition.NORTH)); - dialog.add(center, new BorderLayoutData(RegionPosition.CENTER)); + center.add(unTransCenterPanel); + center.add(transCenterPanel); + center.add(recommendationPanel); + dialog.add(north, new BorderLayoutData(RegionPosition.NORTH)); + dialog.add(center, new BorderLayoutData(RegionPosition.CENTER)); - center.setActiveItemID(unTransCenterPanel.getId()); + center.setActiveItemID(unTransCenterPanel.getId()); - return dialog; + return dialog; } private GridPanel createGridPanel(final boolean translated) { - final Renderer renderNT = new Renderer() { - public String render(Object value, CellMetadata cellMetadata, Record record, int rowIndex, int colNum, - Store store) { - String renderer; - String[] splitted = splitNT((String) value); - if (splitted.length > 1) { - renderer = "{0} " + NOTE_FOR_TRANSLATORS_IMAGE_HTML; - String tip = "<div style='min-width: 75px'>" + splitted[1] + "</div>"; - cellMetadata.setHtmlAttribute("ext:qtip=\"" + tip + "\" ext:qtitle=\"Note for translators\""); - } else { - renderer = "{0}"; - } - return Format.format(renderer, splitted); - } - }; + final Renderer renderNT = new Renderer() { + public String render(Object value, CellMetadata cellMetadata, Record record, int rowIndex, int colNum, + Store store) { + String renderer; + String[] splitted = splitNT((String) value); + if (splitted.length > 1) { + renderer = "{0} " + NOTE_FOR_TRANSLATORS_IMAGE_HTML; + String tip = "<div style='min-width: 75px'>" + splitted[1] + "</div>"; + cellMetadata.setHtmlAttribute("ext:qtip=\"" + tip + "\" ext:qtitle=\"Note for translators\""); + } else { + renderer = "{0}"; + } + return Format.format(renderer, splitted); + } + }; - Store store; - final String id = "id"; - final FieldDef[] fieldDefs = new FieldDef[] { new StringFieldDef("trKey"), new StringFieldDef("text"), - new StringFieldDef(id) }; + Store store; + final String id = "id"; + final FieldDef[] fieldDefs = new FieldDef[] { new StringFieldDef("trKey"), new StringFieldDef("text"), + new StringFieldDef(id) }; - if (translated) { - final String url = "/kune/json/I18nTranslationJSONService/searchtranslated"; - transStore = createStore(fieldDefs, url, id); - store = transStore; - } else { - final String url = "/kune/json/I18nTranslationJSONService/search"; - unTransStore = createStore(fieldDefs, url, id); - store = unTransStore; - } + if (translated) { + final String url = "/kune/json/I18nTranslationJSONService/searchtranslated"; + transStore = createStore(fieldDefs, url, id); + store = transStore; + } else { + final String url = "/kune/json/I18nTranslationJSONService/search"; + unTransStore = createStore(fieldDefs, url, id); + store = unTransStore; + } - final ColumnConfig trKeyColumn = new ColumnConfig() { - { - setHeader(i18n.t("Text to translate")); - setDataIndex("trKey"); - setWidth(335); - setTooltip(i18n.t("Click to sort")); - setRenderer(renderNT); - } - }; + final ColumnConfig trKeyColumn = new ColumnConfig() { + { + setHeader(i18n.t("Text to translate")); + setDataIndex("trKey"); + setWidth(335); + setTooltip(i18n.t("Click to sort")); + setRenderer(renderNT); + } + }; - final GridEditor textColumnEditor = new GridEditor(new TextField()); + final GridEditor textColumnEditor = new GridEditor(new TextField()); - final ColumnConfig textColumn = new ColumnConfig() { - { - setHeader(i18n.t("Translation (click to edit)")); - setDataIndex("text"); - setWidth(335); - setEditor(textColumnEditor); - } - }; + final ColumnConfig textColumn = new ColumnConfig() { + { + setHeader(i18n.t("Translation (click to edit)")); + setDataIndex("text"); + setWidth(335); + setEditor(textColumnEditor); + } + }; - final ColumnModel columnModel = new ColumnModel(new ColumnConfig[] { trKeyColumn, textColumn }); + final ColumnModel columnModel = new ColumnModel(new ColumnConfig[] { trKeyColumn, textColumn }); - columnModel.setDefaultSortable(true); + columnModel.setDefaultSortable(true); - final EditorGridPanel grid = new EditorGridPanel((translated ? "grid-translated" : "grid-untranslated"), 695, - 180, store, columnModel); - createPagingToolbar(store, grid); + final EditorGridPanel grid = new EditorGridPanel((translated ? "grid-translated" : "grid-untranslated"), 695, + 180, store, columnModel); + createPagingToolbar(store, grid); - // final PagingToolbar pag = new PagingToolbar(store); - // pag.setPageSize(PAGINATION_SIZE); - // pag.setDisplayInfo(true); - // pag.setDisplayMsg(i18n.tWithNT("Displaying results {0} - {1} of - // {2}", - // "Respect {} values in translations, " - // + "these will produce: 'Displaying results 1 - 25 of 95465' for - // instance")); - // pag.setEmptyMsg(i18n.t("No results to display")); - // pag.setAfterPageText(i18n.tWithNT("of {0}", "Used to show - // multiple results: '1 of 30'")); - // pag.setBeforePageText(i18n.t("Page")); - // pag.setFirstText(i18n.t("First Page")); - // pag.setLastText(i18n.t("Last Page")); - // pag.setNextText(i18n.t("Next Page")); - // pag.setPrevText(i18n.t("Previous Page")); - // pag.setRefreshText(i18n.t("Refresh")); - // grid.setBottomToolbar(pag); - // grid.setLoadMask(true); - // grid.setLoadMask(i18n.t("Loading")); - grid.setClicksToEdit(1); - // grid.setStripeRows(true); - // grid.setFrame(true); - // grid.setSelectionModel(new RowSelectionModel()); + // final PagingToolbar pag = new PagingToolbar(store); + // pag.setPageSize(PAGINATION_SIZE); + // pag.setDisplayInfo(true); + // pag.setDisplayMsg(i18n.tWithNT("Displaying results {0} - {1} of + // {2}", + // "Respect {} values in translations, " + // + "these will produce: 'Displaying results 1 - 25 of 95465' for + // instance")); + // pag.setEmptyMsg(i18n.t("No results to display")); + // pag.setAfterPageText(i18n.tWithNT("of {0}", "Used to show + // multiple results: '1 of 30'")); + // pag.setBeforePageText(i18n.t("Page")); + // pag.setFirstText(i18n.t("First Page")); + // pag.setLastText(i18n.t("Last Page")); + // pag.setNextText(i18n.t("Next Page")); + // pag.setPrevText(i18n.t("Previous Page")); + // pag.setRefreshText(i18n.t("Refresh")); + // grid.setBottomToolbar(pag); + // grid.setLoadMask(true); + // grid.setLoadMask(i18n.t("Loading")); + grid.setClicksToEdit(1); + // grid.setStripeRows(true); + // grid.setFrame(true); + // grid.setSelectionModel(new RowSelectionModel()); - grid.addEditorGridListener(new EditorGridListenerAdapter() { - public void onAfterEdit(final GridPanel grid, final Record record, final String field, - final Object newValue, final Object oldValue, final int rowIndex, final int colIndex) { - final String idValue = record.getAsString(id); - final String trKey = record.getAsString("trKey"); - presenter.doTranslation(idValue, trKey, (String) newValue); - record.set(field, KuneStringUtils.escapeHtmlLight((String) newValue)); - } - }); + grid.addEditorGridListener(new EditorGridListenerAdapter() { + public void onAfterEdit(final GridPanel grid, final Record record, final String field, + final Object newValue, final Object oldValue, final int rowIndex, final int colIndex) { + final String idValue = record.getAsString(id); + final String trKey = record.getAsString("trKey"); + presenter.doTranslation(idValue, trKey, (String) newValue); + record.set(field, KuneStringUtils.escapeHtmlLight((String) newValue)); + } + }); - grid.addGridCellListener(new GridCellListenerAdapter() { - public void onCellDblClick(final GridPanel grid, final int rowIndex, final int colIndex, final EventObject e) { - final Record record = unTransStore.getRecordAt(rowIndex); - final String idValue = record.getAsString(id); - final String trKey = record.getAsString("trKey"); - final String text = record.getAsString("text"); - if (text == null || text.length() == 0) { - final String trWithoutNT = removeNT(trKey); - record.set("text", trWithoutNT); - presenter.doTranslation(idValue, trKey, trWithoutNT); - } - } - }); + grid.addGridCellListener(new GridCellListenerAdapter() { + public void onCellDblClick(final GridPanel grid, final int rowIndex, final int colIndex, final EventObject e) { + final Record record = unTransStore.getRecordAt(rowIndex); + final String idValue = record.getAsString(id); + final String trKey = record.getAsString("trKey"); + final String text = record.getAsString("text"); + if (text == null || text.length() == 0) { + final String trWithoutNT = removeNT(trKey); + record.set("text", trWithoutNT); + presenter.doTranslation(idValue, trKey, trWithoutNT); + } + } + }); - return grid; + return grid; } private String removeNT(final String string) { - return i18n.removeNT(string); + return i18n.removeNT(string); } private void setLanguage(final I18nLanguageDTO language) { - languageSelectorPanel.setLanguage(language.getCode()); - setLanguage(language.getCode()); + languageSelectorPanel.setLanguage(language.getCode()); + setLanguage(language.getCode()); } private void setLanguage(final String language) { - Site.showProgressLoading(); - query(unTransStore, unTransGrid, language); - query(transStore, transGrid, language); - Site.hideProgress(); + Site.showProgressLoading(); + query(unTransStore, unTransGrid, language); + query(transStore, transGrid, language); + Site.hideProgress(); } private String[] splitNT(final String textWithNT) { - String[] nt; - final String[] splitted = textWithNT.split(" \\[%NT "); - if (splitted.length > 1) { - nt = splitted[1].split("\\]$"); - splitted[1] = nt[0]; - } - return splitted; + String[] nt; + final String[] splitted = textWithNT.split(" \\[%NT "); + if (splitted.length > 1) { + nt = splitted[1].split("\\]$"); + splitted[1] = nt[0]; + } + return splitted; } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensechoose/LicenseChoosePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensechoose/LicenseChoosePanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensechoose/LicenseChoosePanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -58,170 +58,169 @@ private final I18nTranslationService i18n; public LicenseChoosePanel(final LicenseChoosePresenter presenter, final I18nTranslationService i18n) { - this.i18n = i18n; - final Images img = Images.App.getInstance(); + this.i18n = i18n; + final Images img = Images.App.getInstance(); - final VerticalPanel generalVP = new VerticalPanel(); - initWidget(generalVP); + final VerticalPanel generalVP = new VerticalPanel(); + initWidget(generalVP); - final VerticalPanel licenseTypesVP = new VerticalPanel(); - ccRB = new RadioButton("ccOrNot", i18n.t("Creative Commons")); - final RadioButton notCcRB = new RadioButton("ccOrNot", i18n.t("Others licenses")); - options = new DeckPanel(); - ccIntro = new Label( - i18n - .t("With a Creative Commons license, you keep your copyright but allow people to copy and distribute your work provided they give you credit — and only on the conditions you specify here. What do you want to do?")); + final VerticalPanel licenseTypesVP = new VerticalPanel(); + ccRB = new RadioButton("ccOrNot", i18n.t("Creative Commons")); + final RadioButton notCcRB = new RadioButton("ccOrNot", i18n.t("Others licenses")); + options = new DeckPanel(); + ccIntro = new Label( + i18n.t("With a Creative Commons license, you keep your copyright but allow people to copy and distribute your work provided they give you credit — and only on the conditions you specify here. What do you want to do?")); - otherLicenses = new ListBox(); - final VerticalPanel ccOptionsVP = new VerticalPanel(); - final VerticalPanel nonCcOptionsVP = new VerticalPanel(); + otherLicenses = new ListBox(); + final VerticalPanel ccOptionsVP = new VerticalPanel(); + final VerticalPanel nonCcOptionsVP = new VerticalPanel(); - final Label comercialLabel = new Label(i18n.t("Allow commercial uses of your work?")); - commercialRB = new RadioButton("comercial", i18n.t("Yes")); - nonCommercialRB = new RadioButton("comercial", i18n.t("No")); - final Label allowModifLabel = new Label(i18n.t("Allow modifications of your work?")); - allowModifRB = new RadioButton("allowModif", i18n.t("Yes")); - allowModifShareAlikeRB = new RadioButton("allowModif", i18n.t("Yes, as long as others share alike")); - noModifRB = new RadioButton("allowModif", i18n.t("No")); - generalVP.add(licenseTypesVP); - licenseTypesVP.add(ccRB); - licenseTypesVP.add(notCcRB); + final Label comercialLabel = new Label(i18n.t("Allow commercial uses of your work?")); + commercialRB = new RadioButton("comercial", i18n.t("Yes")); + nonCommercialRB = new RadioButton("comercial", i18n.t("No")); + final Label allowModifLabel = new Label(i18n.t("Allow modifications of your work?")); + allowModifRB = new RadioButton("allowModif", i18n.t("Yes")); + allowModifShareAlikeRB = new RadioButton("allowModif", i18n.t("Yes, as long as others share alike")); + noModifRB = new RadioButton("allowModif", i18n.t("No")); + generalVP.add(licenseTypesVP); + licenseTypesVP.add(ccRB); + licenseTypesVP.add(notCcRB); - copyleft = new IconLabel(img.copyleft(), i18n.t("This is a copyleft license"), false); - nonCopyleft = new IconLabel(img.noCopyleft(), i18n.t("This is not a copyleft license"), false); - nonCopyleft.setVisible(false); + copyleft = new IconLabel(img.copyleft(), i18n.t("This is a copyleft license"), false); + nonCopyleft = new IconLabel(img.noCopyleft(), i18n.t("This is not a copyleft license"), false); + nonCopyleft.setVisible(false); - generalVP.add(options); + generalVP.add(options); - // Options + // Options - optionsBox = new TitledPanel(i18n.t("Options"), options); - generalVP.add(optionsBox); - generalVP.add(nonCopyleft); - generalVP.add(copyleft); + optionsBox = new TitledPanel(i18n.t("Options"), options); + generalVP.add(optionsBox); + generalVP.add(nonCopyleft); + generalVP.add(copyleft); - ccOptionsVP.add(ccIntro); - ccOptionsVP.add(comercialLabel); - ccOptionsVP.add(commercialRB); - ccOptionsVP.add(nonCommercialRB); - ccOptionsVP.add(new HorizontalLine()); - ccOptionsVP.add(allowModifLabel); - ccOptionsVP.add(allowModifRB); - ccOptionsVP.add(allowModifShareAlikeRB); - ccOptionsVP.add(noModifRB); + ccOptionsVP.add(ccIntro); + ccOptionsVP.add(comercialLabel); + ccOptionsVP.add(commercialRB); + ccOptionsVP.add(nonCommercialRB); + ccOptionsVP.add(new HorizontalLine()); + ccOptionsVP.add(allowModifLabel); + ccOptionsVP.add(allowModifRB); + ccOptionsVP.add(allowModifShareAlikeRB); + ccOptionsVP.add(noModifRB); - nonCcOptionsVP.add(otherLicenses); + nonCcOptionsVP.add(otherLicenses); - options.add(ccOptionsVP); - options.add(nonCcOptionsVP); - options.showWidget(0); + options.add(ccOptionsVP); + options.add(nonCcOptionsVP); + options.showWidget(0); - comercialLabel.addStyleName("kune-License-CC-Header"); - allowModifLabel.addStyleName("kune-License-CC-Header"); - nonCommercialRB.addStyleName("kune-Margin-Large-lr"); - commercialRB.addStyleName("kune-Margin-Large-lr"); - allowModifRB.addStyleName("kune-Margin-Large-lr"); - allowModifShareAlikeRB.addStyleName("kune-Margin-Large-lr"); - noModifRB.addStyleName("kune-Margin-Large-lr"); - optionsBox.addStyleName("kune-Margin-Medium-t"); - otherLicenses.addStyleName("kune-Margin-Large-trbl"); - generalVP.addStyleName("kune-Default-Form"); - copyleft.addStyleName("kune-Margin-Medium-t"); - nonCopyleft.addStyleName("kune-Margin-Medium-t"); + comercialLabel.addStyleName("kune-License-CC-Header"); + allowModifLabel.addStyleName("kune-License-CC-Header"); + nonCommercialRB.addStyleName("kune-Margin-Large-lr"); + commercialRB.addStyleName("kune-Margin-Large-lr"); + allowModifRB.addStyleName("kune-Margin-Large-lr"); + allowModifShareAlikeRB.addStyleName("kune-Margin-Large-lr"); + noModifRB.addStyleName("kune-Margin-Large-lr"); + optionsBox.addStyleName("kune-Margin-Medium-t"); + otherLicenses.addStyleName("kune-Margin-Large-trbl"); + generalVP.addStyleName("kune-Default-Form"); + copyleft.addStyleName("kune-Margin-Medium-t"); + nonCopyleft.addStyleName("kune-Margin-Medium-t"); - ccRB.addClickListener(new ClickListener() { - public void onClick(final Widget arg0) { - showCCoptions(); - presenter.onChange(); - } - }); + ccRB.addClickListener(new ClickListener() { + public void onClick(final Widget arg0) { + showCCoptions(); + presenter.onChange(); + } + }); - notCcRB.addClickListener(new ClickListener() { - public void onClick(final Widget arg0) { - showNotCCoptions(); - presenter.onChange(); - } - }); + notCcRB.addClickListener(new ClickListener() { + public void onClick(final Widget arg0) { + showNotCCoptions(); + presenter.onChange(); + } + }); - final List<LicenseDTO> nonCCLicenses = presenter.getNonCCLicenses(); - for (int i = 0; i < nonCCLicenses.size(); i++) { - final String licenseDescrip = nonCCLicenses.get(i).getLongName(); - otherLicenses.addItem(licenseDescrip); - } - if (nonCCLicenses.size() > 0) { - otherLicenses.setItemSelected(0, true); - otherLicenses.setVisibleItemCount(1); - } + final List<LicenseDTO> nonCCLicenses = presenter.getNonCCLicenses(); + for (int i = 0; i < nonCCLicenses.size(); i++) { + final String licenseDescrip = nonCCLicenses.get(i).getLongName(); + otherLicenses.addItem(licenseDescrip); + } + if (nonCCLicenses.size() > 0) { + otherLicenses.setItemSelected(0, true); + otherLicenses.setVisibleItemCount(1); + } - configureListeners(presenter); + configureListeners(presenter); } public int getSelectedNonCCLicenseIndex() { - return otherLicenses.getSelectedIndex(); + return otherLicenses.getSelectedIndex(); } public boolean isAllowModif() { - return allowModifRB.isChecked(); + return allowModifRB.isChecked(); } public boolean isAllowModifShareAlike() { - return allowModifShareAlikeRB.isChecked(); + return allowModifShareAlikeRB.isChecked(); } public boolean isCCselected() { - return ccRB.isChecked(); + return ccRB.isChecked(); } public boolean permitComercial() { - return commercialRB.isChecked(); + return commercialRB.isChecked(); } public void reset() { - options.showWidget(0); - ccRB.setChecked(true); - commercialRB.setChecked(true); - allowModifShareAlikeRB.setChecked(true); + options.showWidget(0); + ccRB.setChecked(true); + commercialRB.setChecked(true); + allowModifShareAlikeRB.setChecked(true); } public void showCCoptions() { - options.showWidget(0); - optionsBox.setTitle(i18n.t("Options")); + options.showWidget(0); + optionsBox.setTitle(i18n.t("Options")); } public void showIsCopyleft() { - nonCopyleft.setVisible(false); - copyleft.setVisible(true); + nonCopyleft.setVisible(false); + copyleft.setVisible(true); } public void showIsNotCopyleft() { - nonCopyleft.setVisible(true); - copyleft.setVisible(false); + nonCopyleft.setVisible(true); + copyleft.setVisible(false); } public void showNotCCoptions() { - options.showWidget(1); - optionsBox.setTitle(i18n.t("Select one of these licenses:")); + options.showWidget(1); + optionsBox.setTitle(i18n.t("Select one of these licenses:")); } private void configureListeners(final LicenseChoosePresenter presenter) { - final ChangeListener changeListener = new ChangeListener() { - public void onChange(final Widget arg0) { - presenter.onChange(); - } - }; + final ChangeListener changeListener = new ChangeListener() { + public void onChange(final Widget arg0) { + presenter.onChange(); + } + }; - final ClickListener clickListener = new ClickListener() { - public void onClick(final Widget arg0) { - presenter.onChange(); - } - }; - otherLicenses.addChangeListener(changeListener); - ccRB.addClickListener(clickListener); - allowModifRB.addClickListener(clickListener); - commercialRB.addClickListener(clickListener); - nonCommercialRB.addClickListener(clickListener); - allowModifShareAlikeRB.addClickListener(clickListener); - noModifRB.addClickListener(clickListener); + final ClickListener clickListener = new ClickListener() { + public void onClick(final Widget arg0) { + presenter.onChange(); + } + }; + otherLicenses.addChangeListener(changeListener); + ccRB.addClickListener(clickListener); + allowModifRB.addClickListener(clickListener); + commercialRB.addClickListener(clickListener); + nonCommercialRB.addClickListener(clickListener); + allowModifShareAlikeRB.addClickListener(clickListener); + noModifRB.addClickListener(clickListener); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensechoose/LicenseChoosePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensechoose/LicenseChoosePresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensechoose/LicenseChoosePresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -38,63 +38,63 @@ private final List<LicenseDTO> licensesNonCCList; public LicenseChoosePresenter(final Session session) { - licensesNonCCList = new ArrayList<LicenseDTO>(); - licenses = session.getLicenses(); - for (final Iterator<LicenseDTO> iterator = licenses.iterator(); iterator.hasNext();) { - final LicenseDTO license = iterator.next(); - if (!license.isCC()) { - licensesNonCCList.add(license); - } - } + licensesNonCCList = new ArrayList<LicenseDTO>(); + licenses = session.getLicenses(); + for (final Iterator<LicenseDTO> iterator = licenses.iterator(); iterator.hasNext();) { + final LicenseDTO license = iterator.next(); + if (!license.isCC()) { + licensesNonCCList.add(license); + } + } } public LicenseDTO getLicense() { - String licenseShortName; + String licenseShortName; - if (view.isCCselected()) { - if (view.permitComercial()) { - licenseShortName = view.isAllowModif() ? "by" : view.isAllowModifShareAlike() ? "by-sa" : "by-nd"; - } else { - licenseShortName = view.isAllowModif() ? "by-nc" : view.isAllowModifShareAlike() ? "by-nc-sa" - : "by-nc-nd"; - } - } else { - licenseShortName = licensesNonCCList.get(view.getSelectedNonCCLicenseIndex()).getShortName(); - } - return getLicenseFromShortName(licenseShortName); + if (view.isCCselected()) { + if (view.permitComercial()) { + licenseShortName = view.isAllowModif() ? "by" : view.isAllowModifShareAlike() ? "by-sa" : "by-nd"; + } else { + licenseShortName = view.isAllowModif() ? "by-nc" : view.isAllowModifShareAlike() ? "by-nc-sa" + : "by-nc-nd"; + } + } else { + licenseShortName = licensesNonCCList.get(view.getSelectedNonCCLicenseIndex()).getShortName(); + } + return getLicenseFromShortName(licenseShortName); } public List<LicenseDTO> getNonCCLicenses() { - return licensesNonCCList; + return licensesNonCCList; } public View getView() { - return view; + return view; } public void init(final LicenseChooseView view) { - this.view = view; - this.view.reset(); + this.view = view; + this.view.reset(); } public void onChange() { - final LicenseDTO licenseDTO = getLicense(); - if (licenseDTO.isCopyleft()) { - view.showIsCopyleft(); - } else { - view.showIsNotCopyleft(); - } + final LicenseDTO licenseDTO = getLicense(); + if (licenseDTO.isCopyleft()) { + view.showIsCopyleft(); + } else { + view.showIsNotCopyleft(); + } } private LicenseDTO getLicenseFromShortName(final String shortName) { - for (int i = 0; i < licenses.size(); i++) { - final LicenseDTO licenseDTO = licenses.get(i); - if (licenseDTO.getShortName().equals(shortName)) { - return licenseDTO; - } - } - Log.error("Internal error: License not found"); - throw new IndexOutOfBoundsException("License not found"); + for (int i = 0; i < licenses.size(); i++) { + final LicenseDTO licenseDTO = licenses.get(i); + if (licenseDTO.getShortName().equals(shortName)) { + return licenseDTO; + } + } + Log.error("Internal error: License not found"); + throw new IndexOutOfBoundsException("License not found"); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -37,43 +37,43 @@ private final I18nTranslationService i18n; public EntityLicensePanel(final EntityLicensePresenter presenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws) { - this.i18n = i18n; - copyright = new Label(); - image = new Image(); - license = new Label(); - final SimpleToolbar bottomTitle = ws.getEntityWorkspace().getBottomTitle(); - bottomTitle.add(copyright); - bottomTitle.add(license); - bottomTitle.addSpacer(); - bottomTitle.addSpacer(); - bottomTitle.add(image); - final ClickListener clickListener = new ClickListener() { - public void onClick(Widget arg0) { - presenter.onLicenseClick(); - } - }; + final WorkspaceSkeleton ws) { + this.i18n = i18n; + copyright = new Label(); + image = new Image(); + license = new Label(); + final SimpleToolbar bottomTitle = ws.getEntityWorkspace().getBottomTitle(); + bottomTitle.add(copyright); + bottomTitle.add(license); + bottomTitle.addSpacer(); + bottomTitle.addSpacer(); + bottomTitle.add(image); + final ClickListener clickListener = new ClickListener() { + public void onClick(Widget arg0) { + presenter.onLicenseClick(); + } + }; - license.addClickListener(clickListener); - image.addClickListener(clickListener); - copyright.setVisible(false); - license.setVisible(false); - image.setVisible(false); + license.addClickListener(clickListener); + image.addClickListener(clickListener); + copyright.setVisible(false); + license.setVisible(false); + image.setVisible(false); - copyright.addStyleName("kune-Margin-Large-l"); - license.setStyleName("k-entitylicensepanel-licensetext"); + copyright.addStyleName("kune-Margin-Large-l"); + license.setStyleName("k-entitylicensepanel-licensetext"); } public void openWindow(final String url) { - Window.open(url, "_blank", ""); + Window.open(url, "_blank", ""); } public void showLicense(final String groupName, final LicenseDTO licenseDTO) { - copyright.setText(i18n.t("© [%s], under license: ", groupName)); - license.setText(licenseDTO.getLongName()); - copyright.setVisible(true); - license.setVisible(true); - image.setVisible(true); - image.setUrl(licenseDTO.getImageUrl()); + copyright.setText(i18n.t("© [%s], under license: ", groupName)); + license.setText(licenseDTO.getLongName()); + copyright.setVisible(true); + license.setVisible(true); + image.setVisible(true); + image.setUrl(licenseDTO.getImageUrl()); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -32,27 +32,27 @@ private LicenseDTO license; public EntityLicensePresenter(final StateManager stateManager) { - stateManager.onStateChanged(new Listener<StateDTO>() { - public void onEvent(final StateDTO state) { - setLicense(state); - } - }); + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(final StateDTO state) { + setLicense(state); + } + }); } public View getView() { - return view; + return view; } public void init(final EntityLicenseView view) { - this.view = view; + this.view = view; } public void onLicenseClick() { - view.openWindow(license.getUrl()); + view.openWindow(license.getUrl()); } private void setLicense(final StateDTO state) { - this.license = state.getLicense(); - view.showLicense(state.getGroup().getLongName(), license); + this.license = state.getLicense(); + view.showLicense(state.getGroup().getLongName(), license); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -73,272 +73,271 @@ private TextField tags; public NewGroupPanel(final NewGroupPresenter presenter, final I18nUITranslationService i18n, - final Provider<LicenseChoose> licenseChooseProvider) { - super(i18n.t("Register a new Group"), true, false, 460, 480, new WizardListener() { - public void onBack() { - presenter.onBack(); - } + final Provider<LicenseChoose> licenseChooseProvider) { + super(i18n.t("Register a new Group"), true, false, 460, 480, new WizardListener() { + public void onBack() { + presenter.onBack(); + } - public void onCancel() { - presenter.onCancel(); - } + public void onCancel() { + presenter.onCancel(); + } - public void onClose() { - presenter.onClose(); - } + public void onClose() { + presenter.onClose(); + } - public void onFinish() { - presenter.onFinish(); - } + public void onFinish() { + presenter.onFinish(); + } - public void onNext() { - presenter.onNext(); - } - }, i18n); - this.i18n = i18n; - Field.setMsgTarget("side"); - final Panel centerPanel = new Panel(); - centerPanel.setLayout(new FitLayout()); - deck = new DeckPanel(); - newGroupInitialDataForm = createNewGroupInitialDataForm(presenter); - licenseChoosePanel = licenseChooseProvider.get(); - final VerticalPanel newGroupInitialDataVP = new VerticalPanel(); - final HorizontalPanel newGroupInitialDataHP = new HorizontalPanel(); - final VerticalPanel chooseLicenseVP = new VerticalPanel(); - final HorizontalPanel chooseLicenseHP = new HorizontalPanel(); - final Images img = Images.App.getInstance(); - newGroupInitialDataHP.add(img.step1().createImage()); - final Label step1Label = new Label(i18n - .t("Please fill this form and follow the next steps to register a new group:")); - newGroupInitialDataHP.add(step1Label); - newGroupInitialDataVP.add(newGroupInitialDataHP); - newGroupInitialDataVP.add(newGroupInitialDataForm); - chooseLicenseHP.add(img.step2().createImage()); - final HTML step2Label = new HTML(i18n.t("Select a license to share your group contents with other people. " - + "We recomend [%s] licenses for practical works.", KuneStringUtils.generateHtmlLink( - "http://en.wikipedia.org/wiki/Copyleft", "copyleft"))); - chooseLicenseHP.add(step2Label); - final Label licenseTypeLabel = new Label(i18n.t("Choose a license type:")); - chooseLicenseVP.add(chooseLicenseHP); - chooseLicenseVP.add(licenseTypeLabel); + public void onNext() { + presenter.onNext(); + } + }, i18n); + this.i18n = i18n; + Field.setMsgTarget("side"); + final Panel centerPanel = new Panel(); + centerPanel.setLayout(new FitLayout()); + deck = new DeckPanel(); + newGroupInitialDataForm = createNewGroupInitialDataForm(presenter); + licenseChoosePanel = licenseChooseProvider.get(); + final VerticalPanel newGroupInitialDataVP = new VerticalPanel(); + final HorizontalPanel newGroupInitialDataHP = new HorizontalPanel(); + final VerticalPanel chooseLicenseVP = new VerticalPanel(); + final HorizontalPanel chooseLicenseHP = new HorizontalPanel(); + final Images img = Images.App.getInstance(); + newGroupInitialDataHP.add(img.step1().createImage()); + final Label step1Label = new Label( + i18n.t("Please fill this form and follow the next steps to register a new group:")); + newGroupInitialDataHP.add(step1Label); + newGroupInitialDataVP.add(newGroupInitialDataHP); + newGroupInitialDataVP.add(newGroupInitialDataForm); + chooseLicenseHP.add(img.step2().createImage()); + final HTML step2Label = new HTML( + i18n.t("Select a license to share your group contents with other people. " + + "We recomend [%s] licenses for practical works.", + KuneStringUtils.generateHtmlLink("http://en.wikipedia.org/wiki/Copyleft", "copyleft"))); + chooseLicenseHP.add(step2Label); + final Label licenseTypeLabel = new Label(i18n.t("Choose a license type:")); + chooseLicenseVP.add(chooseLicenseHP); + chooseLicenseVP.add(licenseTypeLabel); - newGroupInitialDataHP.addStyleName("kune-Margin-Medium-b"); - step1Label.addStyleName("kune-Margin-Large-l"); - step2Label.addStyleName("kune-Margin-Large-l"); - step1Label.addStyleName("kune-Margin-Medium-b"); - step2Label.addStyleName("kune-Margin-Medium-b"); + newGroupInitialDataHP.addStyleName("kune-Margin-Medium-b"); + step1Label.addStyleName("kune-Margin-Large-l"); + step2Label.addStyleName("kune-Margin-Large-l"); + step1Label.addStyleName("kune-Margin-Medium-b"); + step2Label.addStyleName("kune-Margin-Medium-b"); - messagesPanel = new SiteMessagePanel(null, false, i18n); - messagesPanel.setWidth("425"); - messagesPanel.setMessage("", SiteErrorType.info, SiteErrorType.error); - newGroupInitialDataVP.add(messagesPanel); + messagesPanel = new SiteMessagePanel(null, false, i18n); + messagesPanel.setWidth("425"); + messagesPanel.setMessage("", SiteErrorType.info, SiteErrorType.error); + newGroupInitialDataVP.add(messagesPanel); - chooseLicenseVP.add((Widget) licenseChoosePanel.getView()); - deck.add(newGroupInitialDataVP); - deck.add(chooseLicenseVP); - centerPanel.add(deck); - super.add(centerPanel); - deck.showWidget(0); - initBottomButtons(); - // newGroupInitialDataVP.addStyleName("kune-Default-Form"); - deck.addStyleName("kune-Default-Form"); - licenseTypeLabel.addStyleName("kune-License-CC-Header"); - newGroupInitialDataVP.setHeight("10"); // Ext set this to 100% ... - chooseLicenseVP.setHeight("10"); // (same here) - super.setFinishText(i18n.t("Register")); + chooseLicenseVP.add((Widget) licenseChoosePanel.getView()); + deck.add(newGroupInitialDataVP); + deck.add(chooseLicenseVP); + centerPanel.add(deck); + super.add(centerPanel); + deck.showWidget(0); + initBottomButtons(); + // newGroupInitialDataVP.addStyleName("kune-Default-Form"); + deck.addStyleName("kune-Default-Form"); + licenseTypeLabel.addStyleName("kune-License-CC-Header"); + newGroupInitialDataVP.setHeight("10"); // Ext set this to 100% ... + chooseLicenseVP.setHeight("10"); // (same here) + super.setFinishText(i18n.t("Register")); } public void clearData() { - deck.showWidget(0); - newGroupInitialDataForm.getForm().reset(); - ((LicenseChoosePanel) licenseChoosePanel.getView()).reset(); - showNewGroupInitialDataForm(); - initBottomButtons(); - shortNameField.focus(false); + deck.showWidget(0); + newGroupInitialDataForm.getForm().reset(); + ((LicenseChoosePanel) licenseChoosePanel.getView()).reset(); + showNewGroupInitialDataForm(); + initBottomButtons(); + shortNameField.focus(false); } public LicenseDTO getLicense() { - return licenseChoosePanel.getLicense(); + return licenseChoosePanel.getLicense(); } public String getLongName() { - return longNameField.getValueAsString(); + return longNameField.getValueAsString(); } public String getPublicDesc() { - return publicDescField.getValueAsString(); + return publicDescField.getValueAsString(); } public String getShortName() { - return shortNameField.getValueAsString(); + return shortNameField.getValueAsString(); } public String getTags() { - return tags.getRawValue(); + return tags.getRawValue(); } public void hideMessage() { - messagesPanel.hide(); + messagesPanel.hide(); } public boolean isCommunity() { - return communityRadio.getValue(); + return communityRadio.getValue(); } public boolean isFormValid() { - return newGroupInitialDataForm.getForm().isValid(); + return newGroupInitialDataForm.getForm().isValid(); } public boolean isOrganization() { - return orgRadio.getValue(); + return orgRadio.getValue(); } public boolean isOrphanedProject() { - return orphanedProjectRadio.getValue(); + return orphanedProjectRadio.getValue(); } public boolean isProject() { - return projectRadio.getValue(); + return projectRadio.getValue(); } public void setMessage(final String message, final SiteErrorType type) { - messagesPanel.setMessage(message, type, type); - messagesPanel.show(); + messagesPanel.setMessage(message, type, type); + messagesPanel.show(); } public void showLicenseForm() { - deck.showWidget(1); + deck.showWidget(1); } public void showNewGroupInitialDataForm() { - deck.showWidget(0); + deck.showWidget(0); } private FormPanel createNewGroupInitialDataForm(final NewGroupPresenter presenter) { - final FormPanel form = new FormPanel(); - form.setBorder(false); - form.setWidth(420); - form.setLabelWidth(100); - form.setLabelAlign(Position.RIGHT); - form.setButtonAlign(Position.RIGHT); + final FormPanel form = new FormPanel(); + form.setBorder(false); + form.setWidth(420); + form.setLabelWidth(100); + form.setLabelAlign(Position.RIGHT); + form.setButtonAlign(Position.RIGHT); - shortNameField = new TextField(); - shortNameField.setFieldLabel(i18n.t("Short name")); - shortNameField. + shortNameField = new TextField(); + shortNameField.setFieldLabel(i18n.t("Short name")); + shortNameField.setName(SHORTNAME_FIELD); + shortNameField.setWidth(175); + shortNameField.setMinLength(3); + shortNameField.setMaxLength(15); + shortNameField.setAllowBlank(false); + shortNameField.setRegex("^[a-z0-9_\\-]+$"); + shortNameField.setMinLengthText(i18n.t(MUST_BE_BETWEEN_3_AND_15)); + shortNameField.setMaxLengthText(i18n.t(MUST_BE_BETWEEN_3_AND_15)); + shortNameField.setRegexText(i18n.t(MUST_BE_BETWEEN_3_AND_15)); + shortNameField.setValidationDelay(1000); - setName(SHORTNAME_FIELD); - shortNameField.setWidth(175); - shortNameField.setMinLength(3); - shortNameField.setMaxLength(15); - shortNameField.setAllowBlank(false); - shortNameField.setRegex("^[a-z0-9_\\-]+$"); - shortNameField.setMinLengthText(i18n.t(MUST_BE_BETWEEN_3_AND_15)); - shortNameField.setMaxLengthText(i18n.t(MUST_BE_BETWEEN_3_AND_15)); - shortNameField.setRegexText(i18n.t(MUST_BE_BETWEEN_3_AND_15)); - shortNameField.setValidationDelay(1000); + form.add(shortNameField); - form.add(shortNameField); + longNameField = new TextField(); + longNameField.setFieldLabel(i18n.t("Long name")); + longNameField.setName(LONGNAME_FIELD); + longNameField.setWidth(300); + longNameField.setAllowBlank(false); - longNameField = new TextField(); - longNameField.setFieldLabel(i18n.t("Long name")); - longNameField.setName(LONGNAME_FIELD); - longNameField.setWidth(300); - longNameField.setAllowBlank(false); + longNameField.setMinLength(3); + longNameField.setMaxLength(50); + longNameField.setValidationDelay(1000); + form.add(longNameField); - longNameField.setMinLength(3); - longNameField.setMaxLength(50); - longNameField.setValidationDelay(1000); - form.add(longNameField); + publicDescField = new TextArea(); + publicDescField.setFieldLabel(i18n.t("Public description")); + publicDescField.setName(PUBLICDESC_FIELD); + publicDescField.setWidth(300); + publicDescField.setAllowBlank(false); + publicDescField.setMinLength(10); + publicDescField.setMaxLength(255); + publicDescField.setValidationDelay(1000); + form.add(publicDescField); - publicDescField = new TextArea(); - publicDescField.setFieldLabel(i18n.t("Public description")); - publicDescField.setName(PUBLICDESC_FIELD); - publicDescField.setWidth(300); - publicDescField.setAllowBlank(false); - publicDescField.setMinLength(10); - publicDescField.setMaxLength(255); - publicDescField.setValidationDelay(1000); - form.add(publicDescField); + tags = new TextField(); + tags.setFieldLabel(i18n.t("Group tags")); + tags.setName(TAGS_FIELD); + tags.setWidth(300); + tags.setAllowBlank(false); + final ToolTip fieldToolTip = new ToolTip(i18n.t("Some words related to this group (separated with spaces).")); + fieldToolTip.applyTo(tags); + tags.setValidationDelay(1000); + form.add(tags); - tags = new TextField(); - tags.setFieldLabel(i18n.t("Group tags")); - tags.setName(TAGS_FIELD); - tags.setWidth(300); - tags.setAllowBlank(false); - final ToolTip fieldToolTip = new ToolTip(i18n.t("Some words related to this group (separated with spaces).")); - fieldToolTip.applyTo(tags); - tags.setValidationDelay(1000); - form.add(tags); + final FieldSet groupTypeFieldSet = new FieldSet(i18n.t("Type of group")); + groupTypeFieldSet.setStyle("margin-left: 105px"); - final FieldSet groupTypeFieldSet = new FieldSet(i18n.t("Type of group")); - groupTypeFieldSet.setStyle("margin-left: 105px"); + form.add(groupTypeFieldSet); - form.add(groupTypeFieldSet); + projectRadio = new Radio(); + createRadio(groupTypeFieldSet, projectRadio, "Project", + "A project is a kind of group in which new members inclusion " + + "is moderated by the project administrators. " + + "An administrator is the person who creates the project " + + "and other people she/he choose in the future as administrator too."); + projectRadio.setChecked(true); - projectRadio = new Radio(); - createRadio(groupTypeFieldSet, projectRadio, "Project", - "A project is a kind of group in which new members inclusion " - + "is moderated by the project administrators. " - + "An administrator is the person who creates the project " - + "and other people she/he choose in the future as administrator too."); - projectRadio.setChecked(true); + orgRadio = new Radio(); + createRadio(groupTypeFieldSet, orgRadio, "Organization", "An organization is like a project, " + + "but organizations must be a legal entity."); - orgRadio = new Radio(); - createRadio(groupTypeFieldSet, orgRadio, "Organization", "An organization is like a project, " - + "but organizations must be a legal entity."); + communityRadio = new Radio(); + createRadio(groupTypeFieldSet, communityRadio, "Community", "Communities are social group of persons " + + "with shared interests and they are open to new members " + + "(for instance the environmental community or the LGBT community). " + + "Normally they aren't a legal entity."); - communityRadio = new Radio(); - createRadio(groupTypeFieldSet, communityRadio, "Community", "Communities are social group of persons " - + "with shared interests and they are open to new members " - + "(for instance the environmental community or the LGBT community). " - + "Normally they aren't a legal entity."); + orphanedProjectRadio = new Radio(); + createRadio(groupTypeFieldSet, orphanedProjectRadio, "Orphaned Project", + "If you have an idea but you don't have " + "capacity/possibilities/resources to work on it, " + + "just register a orphaned project, and permit others to work and develop it."); - orphanedProjectRadio = new Radio(); - createRadio(groupTypeFieldSet, orphanedProjectRadio, "Orphaned Project", - "If you have an idea but you don't have " + "capacity/possibilities/resources to work on it, " - + "just register a orphaned project, and permit others to work and develop it."); + groupTypeFieldSet.setCollapsible(false); - groupTypeFieldSet.setCollapsible(false); - - return form; + return form; } private void createRadio(final FieldSet fieldSet, final Radio radio, final String radioLabel, final String radioTip) { - radio.setName(TYPEOFGROUP_FIELD); - radio.setBoxLabel(KuneUiUtils.genQuickTipLabel(i18n.t(radioLabel), null, i18n.t(radioTip), INFO_IMAGE)); - radio.setAutoCreate(true); - radio.setHideLabel(true); - fieldSet.add(radio); - // ToolTip fieldToolTip = new ToolTip("Tooltip on a Field."); - // fieldToolTip.applyTo(captchaField); - // Image info = new Image("images/silk/information.gif"); - // - // ToolTip tooltip = new ToolTip(); - // tooltip.setHtml("A <b>CAPTCHA</b> is a challenge-response test to - // determine whether " + - // "the user is human."); - // tooltip.setWidth(150); - // tooltip.applyTo(info.getElement()); + radio.setName(TYPEOFGROUP_FIELD); + radio.setBoxLabel(KuneUiUtils.genQuickTipLabel(i18n.t(radioLabel), null, i18n.t(radioTip), INFO_IMAGE)); + radio.setAutoCreate(true); + radio.setHideLabel(true); + fieldSet.add(radio); + // ToolTip fieldToolTip = new ToolTip("Tooltip on a Field."); + // fieldToolTip.applyTo(captchaField); + // Image info = new Image("images/silk/information.gif"); + // + // ToolTip tooltip = new ToolTip(); + // tooltip.setHtml("A <b>CAPTCHA</b> is a challenge-response test to + // determine whether " + + // "the user is human."); + // tooltip.setWidth(150); + // tooltip.applyTo(info.getElement()); - // Tested: - // Set tooltip - // Image info = new Image(); - // ChatIcons.App.getInstance().info().applyTo(info); - // ToolTip tooltip = new ToolTip(); - // tooltip.setHtml(i18n.t("Note that the 'Jabber Id' sometimes is the - // same as the email " - // + "(in gmail accounts for instance).")); - // tooltip.setWidth(250); - // tooltip.applyTo(info.getElement()); - // jidPanel.addToRow(info, new ColumnLayoutData(1)); - // - // formPanel.add(jidPanel); + // Tested: + // Set tooltip + // Image info = new Image(); + // ChatIcons.App.getInstance().info().applyTo(info); + // ToolTip tooltip = new ToolTip(); + // tooltip.setHtml(i18n.t("Note that the 'Jabber Id' sometimes is the + // same as the email " + // + "(in gmail accounts for instance).")); + // tooltip.setWidth(250); + // tooltip.applyTo(info.getElement()); + // jidPanel.addToRow(info, new ColumnLayoutData(1)); + // + // formPanel.add(jidPanel); } private void initBottomButtons() { - super.setEnabledBackButton(false); - super.setEnabledFinishButton(false); - super.setEnabledNextButton(true); + super.setEnabledBackButton(false); + super.setEnabledFinishButton(false); + super.setEnabledNextButton(true); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -136,7 +136,7 @@ } }; groupServiceProvider.get().createNewGroup(session.getUserHash(), group, publicDesc, view.getTags(), null, - callback); + callback); } public void onNext() { 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -54,102 +54,103 @@ private final I18nTranslationService i18n; public EntityLiveSearcherPanel(final EntityLiveSearcherPresenter presenter, - final EntityLiveSearcherType searchType, final I18nTranslationService i18n) { - this.presenter = presenter; - this.searchType = searchType; - this.i18n = i18n; + final EntityLiveSearcherType searchType, final I18nTranslationService i18n) { + this.presenter = presenter; + this.searchType = searchType; + this.i18n = i18n; } public void center() { - dialog.center(); + dialog.center(); } public void hide() { - dialog.hide(); - searchForm.getForm().reset(); + dialog.hide(); + searchForm.getForm().reset(); } public void show() { - if (dialog == null) { - createGroupSearchDialog(searchType); - } - dialog.show(); - dialog.center(); + if (dialog == null) { + createGroupSearchDialog(searchType); + } + dialog.show(); + dialog.center(); } private void createGroupSearchDialog(final EntityLiveSearcherType searchType) { - String title; - if (searchType.equals(EntityLiveSearcherType.groups)) { - title = i18n.t("Search existing users and groups"); - } else { - title = i18n.t("Search existing users"); - } - dialog = new BasicDialog(title, true, false, 285, 55); - dialog.setClosable(true); - dialog.setCollapsible(false); + String title; + if (searchType.equals(EntityLiveSearcherType.groups)) { + title = i18n.t("Search existing users and groups"); + } else { + title = i18n.t("Search existing users"); + } + dialog = new BasicDialog(title, true, false, 285, 55); + dialog.setClosable(true); + dialog.setCollapsible(false); - DataProxy dataProxy = null; - switch (searchType) { - case groups: - dataProxy = new HttpProxy("/kune/json/GroupJSONService/search", Connection.POST); - break; - case users: - dataProxy = new HttpProxy("/kune/json/UserJSONService/search", Connection.POST); - break; - default: - break; - } + DataProxy dataProxy = null; + switch (searchType) { + case groups: + dataProxy = new HttpProxy("/kune/json/GroupJSONService/search", Connection.POST); + break; + case users: + dataProxy = new HttpProxy("/kune/json/UserJSONService/search", Connection.POST); + break; + default: + break; + } - final JsonReader reader = new JsonReader(new RecordDef( - new FieldDef[] { new StringFieldDef(SHORT_NAME_FIELD), new StringFieldDef(LONG_NAME_FIELD), - new StringFieldDef(LINK_FIELD), new StringFieldDef(ICON_URL_FIELD) })); - reader.setRoot("list"); - reader.setTotalProperty("size"); - reader.setId(SHORT_NAME_FIELD); + final JsonReader reader = new JsonReader(new RecordDef( + new FieldDef[] { new StringFieldDef(SHORT_NAME_FIELD), new StringFieldDef(LONG_NAME_FIELD), + new StringFieldDef(LINK_FIELD), new StringFieldDef(ICON_URL_FIELD) })); + reader.setRoot("list"); + reader.setTotalProperty("size"); + reader.setId(SHORT_NAME_FIELD); - final Store store = new Store(dataProxy, reader); + final Store store = new Store(dataProxy, reader); - store.load(new UrlParam[] { new UrlParam("query", "."), new UrlParam("first", 1), - new UrlParam("max", PAGINATION_SIZE) }); + store.load(new UrlParam[] { new UrlParam("query", "."), new UrlParam("first", 1), + new UrlParam("max", PAGINATION_SIZE) }); - searchForm = new FormPanel(); - searchForm.setBorder(false); - searchForm.setWidth(275); - searchForm.setHideLabels(true); + searchForm = new FormPanel(); + searchForm.setBorder(false); + searchForm.setWidth(275); + searchForm.setHideLabels(true); - final Template resultTpl = new Template( - "<div class=\"search-item\"><span class=\"kune-IconHyperlink\"><img alt=\"group logo\" src=\"images/group-def-icon.png\" style=\"height: 16px; width: 16px;\" />{shortName}: {longName}</span></div>"); - final ComboBox cb = new ComboBox(); - cb.setStore(store); - cb.setEmptyText(i18n.t("Write here to search")); - cb.setDisplayField(LONG_NAME_FIELD); - cb.setTypeAhead(true); - cb.setLoadingText(i18n.t("Searching...")); - cb.setWidth(268); - cb.setPageSize(PAGINATION_SIZE); - cb.setTpl(resultTpl); - cb.setMode(ComboBox.REMOTE); - cb.setMinChars(2); - cb.setSelectOnFocus(false); - cb.setHideTrigger(true); - cb.setHideLabel(true); - // setTitle(i18n.t("User or group")); - cb.setItemSelector("div.search-item"); + final Template resultTpl = new Template( + "<div class=\"search-item\"><span class=\"kune-IconHyperlink\"><img alt=\"group logo\" src=\"images/group-def-icon.png\" style=\"height: 16px; width: 16px;\" />{shortName}: {longName}</span></div>"); + final ComboBox cb = new ComboBox(); + cb.setStore(store); + cb.setEmptyText(i18n.t("Write here to search")); + cb.setDisplayField(LONG_NAME_FIELD); + cb.setTypeAhead(true); + cb.setLoadingText(i18n.t("Searching...")); + cb.setWidth(268); + cb.setPageSize(PAGINATION_SIZE); + cb.setTpl(resultTpl); + cb.setMode(ComboBox.REMOTE); + cb.setMinChars(2); + cb.setSelectOnFocus(false); + cb.setHideTrigger(true); + cb.setHideLabel(true); + // setTitle(i18n.t("User or group")); + cb.setItemSelector("div.search-item"); - cb.addListener(new ComboBoxListenerAdapter() { - public void onSelect(final ComboBox comboBox, final Record record, final int index) { - DeferredCommand.addCommand(new Command() { - public void execute() { - final LinkDTO link = new LinkDTO(record.getAsString(SHORT_NAME_FIELD), record - .getAsString(LONG_NAME_FIELD), record.getAsString(ICON_URL_FIELD), record - .getAsString(LINK_FIELD)); - presenter.onSelection(link); - } - }); - } - }); + cb.addListener(new ComboBoxListenerAdapter() { + @Override + public void onSelect(final ComboBox comboBox, final Record record, final int index) { + DeferredCommand.addCommand(new Command() { + public void execute() { + final LinkDTO link = new LinkDTO(record.getAsString(SHORT_NAME_FIELD), + record.getAsString(LONG_NAME_FIELD), record.getAsString(ICON_URL_FIELD), + record.getAsString(LINK_FIELD)); + presenter.onSelection(link); + } + }); + } + }); - searchForm.add(cb); - dialog.add(searchForm); + searchForm.add(cb); + dialog.add(searchForm); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -33,23 +33,23 @@ } public View getView() { - return view; + return view; } public void init(final EntityLiveSearcherView view) { - this.view = view; + this.view = view; } public void onSelection(final LinkDTO link) { - listener.onEvent(link); - view.hide(); + listener.onEvent(link); + view.hide(); } public void onSelection(final Listener<LinkDTO> listener) { - this.listener = listener; + this.listener = listener; } public void show() { - view.show(); + view.show(); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -24,7 +24,7 @@ public class GroupLiveSearchPanel extends EntityLiveSearcherPanel { public GroupLiveSearchPanel(final EntityLiveSearcherPresenter presenter, final I18nTranslationService i18n) { - super(presenter, EntityLiveSearcherType.groups, i18n); + super(presenter, EntityLiveSearcherType.groups, i18n); } } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearcherPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearcherPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearcherPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -19,7 +19,6 @@ */ package org.ourproject.kune.workspace.client.search; - public class GroupLiveSearcherPresenter extends EntityLiveSearcherPresenter implements GroupLiveSearcher { } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteBottomTrayButton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteBottomTrayButton.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteBottomTrayButton.java 2008-10-21 19:26:47 UTC (rev 917) @@ -13,25 +13,25 @@ private final ToolbarButton traybarButton; public SiteBottomTrayButton(final String icon, final String tooltip, final Window dialog, final WorkspaceSkeleton ws) { - traybarButton = new ToolbarButton(); - traybarButton.setTooltip(tooltip); - traybarButton.setIcon(icon); - traybarButton.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(final Button button, final EventObject e) { - if (dialog.isVisible()) { - dialog.hide(); - } else { - dialog.show(); - } - } + traybarButton = new ToolbarButton(); + traybarButton.setTooltip(tooltip); + traybarButton.setIcon(icon); + traybarButton.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + if (dialog.isVisible()) { + dialog.hide(); + } else { + dialog.show(); + } + } - }); - ws.getSiteTraybar().addButton(traybarButton); + }); + ws.getSiteTraybar().addButton(traybarButton); } public void destroy() { - traybarButton.destroy(); + traybarButton.destroy(); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcher.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcher.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcher.java 2008-10-21 19:26:47 UTC (rev 917) @@ -21,8 +21,8 @@ public interface SiteSearcher { - public void doSearch(String termToSearch); + void doSearch(String termToSearch); - public void doSearchOfType(String termToSearch, SiteSearcherType type); + void doSearchOfType(String termToSearch, SiteSearcherType type); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcher.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcher.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcher.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,6 +20,5 @@ package org.ourproject.kune.workspace.client.search; - public interface UserLiveSearcher extends EntityLiveSearcher { } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -24,7 +24,7 @@ public class UserLiveSearcherPanel extends EntityLiveSearcherPanel { public UserLiveSearcherPanel(final EntityLiveSearcherPresenter presenter, final I18nTranslationService i18n) { - super(presenter, EntityLiveSearcherType.users, i18n); + super(presenter, EntityLiveSearcherType.users, i18n); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -19,7 +19,6 @@ */ package org.ourproject.kune.workspace.client.search; - public class UserLiveSearcherPresenter extends EntityLiveSearcherPresenter implements UserLiveSearcher { } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2008-10-21 19:26:47 UTC (rev 917) @@ -188,11 +188,11 @@ wantPersonalHomePage = new Radio(); noPersonalHomePage = new Radio(); personalSpaceFieldSet.setCollapsible(false); - createRadio(personalSpaceFieldSet, wantPersonalHomePage, i18n - .t("Yes, I want a homepage for publish my contents."), WANNAPERSONALHOMEPAGE_FIELD); + createRadio(personalSpaceFieldSet, wantPersonalHomePage, + i18n.t("Yes, I want a homepage for publish my contents."), WANNAPERSONALHOMEPAGE_FIELD); wantPersonalHomePage.setChecked(true); createRadio(personalSpaceFieldSet, noPersonalHomePage, i18n.t("No, I don't want. Maybe in the future."), - NOPERSONALHOMEPAGE_FIELD); + NOPERSONALHOMEPAGE_FIELD); add(personalSpaceFieldSet); } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -222,8 +222,8 @@ public void showWelcolmeDialog() { if (welcomeDialog == null) { - welcomeDialog = new InfoDialog(i18n.t("Welcome"), i18n.t("Thanks for registering"), i18n - .t("Now you can participate more actively in this site with other people and groups. " + welcomeDialog = new InfoDialog(i18n.t("Welcome"), i18n.t("Thanks for registering"), + i18n.t("Now you can participate more actively in this site with other people and groups. " + "You can also use your personal space to publish contents. " + "Your email is not verified, please follow the instructions you will receive by email."), i18n.t("Ok"), true, true, 400, 270); 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -119,8 +119,8 @@ boolean wantPersonalHomepage = view.wantPersonalHomepage(); - final UserDTO user = new UserDTO(view.getLongName(), view.getShortName(), view.getRegisterPassword(), view - .getEmail(), language, country, timezone, null, true, SubscriptionMode.manual, "blue"); + final UserDTO user = new UserDTO(view.getLongName(), view.getShortName(), view.getRegisterPassword(), + view.getEmail(), language, country, timezone, null, true, SubscriptionMode.manual, "blue"); final AsyncCallback<UserInfoDTO> callback = new AsyncCallback<UserInfoDTO>() { public void onFailure(final Throwable caught) { view.unMask(); @@ -128,10 +128,10 @@ throw caught; } catch (final EmailAddressInUseException e) { view.setRegisterMessage(i18n.t("This email in in use by other person, try with another."), - SiteErrorType.error); + SiteErrorType.error); } catch (final GroupNameInUseException e) { view.setRegisterMessage(i18n.t("This name in already in use, try with a different name."), - SiteErrorType.error); + SiteErrorType.error); } catch (final Throwable e) { view.setRegisterMessage(i18n.t("Error during registration."), SiteErrorType.error); GWT.log("Other kind of exception in user registration" + e.getMessage() + ", " Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java 2008-10-21 19:26:47 UTC (rev 917) @@ -24,52 +24,52 @@ public interface SignInView extends View { - public void center(); + void center(); - public String getCountry(); + String getCountry(); - public String getEmail(); + String getEmail(); - public String getLanguage(); + String getLanguage(); - public String getLoginPassword(); + String getLoginPassword(); - public String getLongName(); + String getLongName(); - public String getNickOrEmail(); + String getNickOrEmail(); - public String getRegisterPassword(); + String getRegisterPassword(); - public String getRegisterPasswordDup(); + String getRegisterPasswordDup(); - public String getShortName(); + String getShortName(); - public String getTimezone(); + String getTimezone(); - public void hide(); + void hide(); - public void hideMessages(); + void hideMessages(); - public boolean isRegisterFormValid(); + boolean isRegisterFormValid(); - public boolean isSignInFormValid(); + boolean isSignInFormValid(); - public void maskProcessing(); + void maskProcessing(); - public void reset(); + void reset(); - public void show(); + void setCookie(String userHash); - public void showWelcolmeDialog(); + void setRegisterMessage(String message, SiteErrorType type); - public void unMask(); + void setSignInMessage(String message, SiteErrorType type); - public boolean wantPersonalHomepage(); + void show(); - void setCookie(String userHash); + void showWelcolmeDialog(); - void setRegisterMessage(String message, SiteErrorType type); + void unMask(); - void setSignInMessage(String message, SiteErrorType type); + boolean wantPersonalHomepage(); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/Site.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/site/Site.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/Site.java 2008-10-21 19:26:47 UTC (rev 917) @@ -35,54 +35,54 @@ private static Provider<SiteMessage> siteMessageProvider; public static void error(final String value) { - getSiteMessage().setMessage(value, SiteErrorType.error); + getSiteMessage().setMessage(value, SiteErrorType.error); } public static void hideProgress() { - progress.hideProgress(); + progress.hideProgress(); } public static void important(final String value) { - getSiteMessage().setMessage(value, SiteErrorType.imp); + getSiteMessage().setMessage(value, SiteErrorType.imp); } public static void info(final String value) { - getSiteMessage().setMessage(value, SiteErrorType.info); + getSiteMessage().setMessage(value, SiteErrorType.info); } public static void showProgress(final String text) { - progress.showProgress(text); + progress.showProgress(text); } public static void showProgressLoading() { - progress.showProgress(i18n.t("Loading")); + progress.showProgress(i18n.t("Loading")); } public static void showProgressProcessing() { - progress.showProgress(i18n.t("Processing")); + progress.showProgress(i18n.t("Processing")); } public static void showProgressSaving() { - progress.showProgress(i18n.t("Saving")); + progress.showProgress(i18n.t("Saving")); } public static void showProgressStarting() { - progress.showProgress(i18n.t("Starting")); + progress.showProgress(i18n.t("Starting")); } public static void veryImportant(final String value) { - getSiteMessage().setMessage(value, SiteErrorType.veryimp); + getSiteMessage().setMessage(value, SiteErrorType.veryimp); } private static SiteMessage getSiteMessage() { - return siteMessageProvider.get(); + return siteMessageProvider.get(); } public Site(final I18nUITranslationService i18n, final SiteProgress progress, - final Provider<SiteMessage> siteMessageProvider) { - Site.i18n = i18n; - Site.progress = progress; - Site.siteMessageProvider = siteMessageProvider; + final Provider<SiteMessage> siteMessageProvider) { + Site.i18n = i18n; + Site.progress = progress; + Site.siteMessageProvider = siteMessageProvider; } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/MessagePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/MessagePresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/MessagePresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -24,8 +24,8 @@ public interface MessagePresenter { - public abstract void resetMessage(); + void resetMessage(); - public abstract void setMessage(final String message, final SiteErrorType type); + void setMessage(final String message, final SiteErrorType type); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SimpleMessagePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SimpleMessagePanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SimpleMessagePanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -14,63 +14,63 @@ Image messageIcon = null; public SimpleMessagePanel() { - message = new HTML(); - messageIcon = new Image(); - final Images images = Images.App.getInstance(); - add(messageIcon); - add(message); - setCellVerticalAlignment(messageIcon, VerticalPanel.ALIGN_MIDDLE); - setVisible(false); - setStyleName("kune-SiteMessagePanel"); - addStyleDependentName("info"); - images.info().applyTo(messageIcon); - messageIcon.addStyleName("gwt-Image"); - message.setWidth("100%"); - this.setCellWidth(message, "100%"); + message = new HTML(); + messageIcon = new Image(); + final Images images = Images.App.getInstance(); + add(messageIcon); + add(message); + setCellVerticalAlignment(messageIcon, VerticalPanel.ALIGN_MIDDLE); + setVisible(false); + setStyleName("kune-SiteMessagePanel"); + addStyleDependentName("info"); + images.info().applyTo(messageIcon); + messageIcon.addStyleName("gwt-Image"); + message.setWidth("100%"); + this.setCellWidth(message, "100%"); } public void adjustWidth(final int windowWidth) { - final int messageWidth = windowWidth * 60 / 100 - 3; - this.setWidth("" + messageWidth); + final int messageWidth = windowWidth * 60 / 100 - 3; + this.setWidth("" + messageWidth); } public void hide() { - message.setText(""); - this.setVisible(false); + message.setText(""); + this.setVisible(false); } public void reset() { - message.setText(""); + message.setText(""); } public void setMessage(final String text) { - this.message.setHTML(text); + this.message.setHTML(text); } public void setMessage(final String text, final SiteErrorType lastMessageType, final SiteErrorType type) { - final Images images = Images.App.getInstance(); - AbstractImagePrototype imagePrototype = null; - switch (type) { - case error: - imagePrototype = images.error(); - break; - case veryimp: - imagePrototype = images.important(); - break; - case imp: - imagePrototype = images.emblemImportant(); - break; - case info: - imagePrototype = images.info(); - break; - } - imagePrototype.applyTo(messageIcon); - removeStyleDependentName(lastMessageType.toString()); - addStyleDependentName(type.toString()); - setMessage(text); + final Images images = Images.App.getInstance(); + AbstractImagePrototype imagePrototype = null; + switch (type) { + case error: + imagePrototype = images.error(); + break; + case veryimp: + imagePrototype = images.important(); + break; + case imp: + imagePrototype = images.emblemImportant(); + break; + case info: + imagePrototype = images.info(); + break; + } + imagePrototype.applyTo(messageIcon); + removeStyleDependentName(lastMessageType.toString()); + addStyleDependentName(type.toString()); + setMessage(text); } public void show() { - this.setVisible(true); + this.setVisible(true); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteMessagePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteMessagePanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteMessagePanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -41,79 +41,79 @@ private final ExtElement extElem; public SiteMessagePanel(final MessagePresenter presenter, final boolean closable, - final I18nUITranslationService i18n) { - final Images images = Images.App.getInstance(); - timer = new Timer() { - public void run() { - hide(); - if (presenter != null) { - presenter.resetMessage(); - } - } - }; + final I18nUITranslationService i18n) { + final Images images = Images.App.getInstance(); + timer = new Timer() { + public void run() { + hide(); + if (presenter != null) { + presenter.resetMessage(); + } + } + }; - if (closable) { - final PushButton closeIcon = new PushButton(images.cross().createImage(), images.crossDark().createImage()); - KuneUiUtils.setQuickTip(closeIcon, i18n.t("Click to close")); - add(closeIcon); - closeIcon.addClickListener(new ClickListener() { - public void onClick(final Widget sender) { - if (sender == closeIcon) { - setVisible(false); - hide(); - if (presenter != null) { - presenter.resetMessage(); - } - } - } - }); - setCellVerticalAlignment(closeIcon, VerticalPanel.ALIGN_BOTTOM); - } - extElem = new ExtElement(this.getElement()); - final int clientWidth = Window.getClientWidth(); - adjustWidth(clientWidth); - Window.addWindowResizeListener(new WindowResizeListener() { - public void onWindowResized(final int width, final int height) { - // Log.debug("Window width: " + width + ", height: " + height); - setXY(width); - adjustWidth(width); - } - }); - super.reset(); - super.show(); - extElem.setVisible(false, false); - RootPanel.get().add(this, calculateX(clientWidth), calculateY()); + if (closable) { + final PushButton closeIcon = new PushButton(images.cross().createImage(), images.crossDark().createImage()); + KuneUiUtils.setQuickTip(closeIcon, i18n.t("Click to close")); + add(closeIcon); + closeIcon.addClickListener(new ClickListener() { + public void onClick(final Widget sender) { + if (sender == closeIcon) { + setVisible(false); + hide(); + if (presenter != null) { + presenter.resetMessage(); + } + } + } + }); + setCellVerticalAlignment(closeIcon, VerticalPanel.ALIGN_BOTTOM); + } + extElem = new ExtElement(this.getElement()); + final int clientWidth = Window.getClientWidth(); + adjustWidth(clientWidth); + Window.addWindowResizeListener(new WindowResizeListener() { + public void onWindowResized(final int width, final int height) { + // Log.debug("Window width: " + width + ", height: " + height); + setXY(width); + adjustWidth(width); + } + }); + super.reset(); + super.show(); + extElem.setVisible(false, false); + RootPanel.get().add(this, calculateX(clientWidth), calculateY()); } @Override public void adjustWidth(final int windowWidth) { - super.adjustWidth(windowWidth); + super.adjustWidth(windowWidth); } public void hide() { - extElem.hide(true); - super.reset(); - timer.cancel(); + extElem.hide(true); + super.reset(); + timer.cancel(); } public void show() { - extElem.show(false); - // super.show(); - timer.schedule(TIMEVISIBLE); + extElem.show(false); + // super.show(); + timer.schedule(TIMEVISIBLE); } private int calculateX(final int clientWidth) { - final int x = clientWidth * 20 / 100 - 10; - // Log.debug("X: " + x); - return x; + final int x = clientWidth * 20 / 100 - 10; + // Log.debug("X: " + x); + return x; } private int calculateY() { - return 2; + return 2; } private void setXY(final int clientWidth) { - extElem.setXY(calculateX(clientWidth), calculateY(), false); + extElem.setXY(calculateX(clientWidth), calculateY(), false); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteMessagePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteMessagePresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteMessagePresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -33,53 +33,53 @@ @Deprecated public void adjustWidth(final int windowWidth) { - view.adjustWidth(windowWidth); + view.adjustWidth(windowWidth); } public View getView() { - return view; + return view; } public void init(final SiteMessageView siteMessageView) { - this.view = siteMessageView; - this.lastMessageType = SiteErrorType.info; - resetMessage(); + this.view = siteMessageView; + this.lastMessageType = SiteErrorType.info; + resetMessage(); } public void resetMessage() { - this.message = ""; - this.isVisible = false; - view.hide(); + this.message = ""; + this.isVisible = false; + view.hide(); } public void setMessage(final String message, final SiteErrorType type) { - if (isVisible) { - if (!this.message.equals(message)) { - // Concatenate message (if not is the same) - this.message = this.message + "<br>" + message; - } - } else { - // New message - this.message = message; - } - if (lastMessageType != type) { - if (isVisible) { - if (type.compareTo(lastMessageType) < 0) { - // more severe message - view.setMessage(this.message, lastMessageType, type); - lastMessageType = type; - } else { - view.setMessage(this.message); - } - } else { - // Was closed, and different message level - view.setMessage(this.message, lastMessageType, type); - lastMessageType = type; - } - } else { - view.setMessage(this.message); - } - isVisible = true; - view.show(); + if (isVisible) { + if (!this.message.equals(message)) { + // Concatenate message (if not is the same) + this.message = this.message + "<br>" + message; + } + } else { + // New message + this.message = message; + } + if (lastMessageType != type) { + if (isVisible) { + if (type.compareTo(lastMessageType) < 0) { + // more severe message + view.setMessage(this.message, lastMessageType, type); + lastMessageType = type; + } else { + view.setMessage(this.message); + } + } else { + // Was closed, and different message level + view.setMessage(this.message, lastMessageType, type); + lastMessageType = type; + } + } else { + view.setMessage(this.message); + } + isVisible = true; + view.show(); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteMessageView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteMessageView.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteMessageView.java 2008-10-21 19:26:47 UTC (rev 917) @@ -24,14 +24,14 @@ public interface SiteMessageView extends View { - public void adjustWidth(int windowWidth); + void adjustWidth(int windowWidth); - public void hide(); + void hide(); - public void setMessage(String message); + void setMessage(String message); - public void setMessage(String message, SiteErrorType oldStyle, SiteErrorType newStyle); + void setMessage(String message, SiteErrorType oldStyle, SiteErrorType newStyle); - public void show(); + void show(); } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -11,19 +11,19 @@ private SiteLogoView view; public SiteLogoPresenter(final Session session) { - session.onInitDataReceived(new Listener<InitDataDTO>() { - public void onEvent(final InitDataDTO initData) { - view.setSiteLogoUrl(initData.getSiteLogoUrl()); - } - }); + session.onInitDataReceived(new Listener<InitDataDTO>() { + public void onEvent(final InitDataDTO initData) { + view.setSiteLogoUrl(initData.getSiteLogoUrl()); + } + }); } public View getView() { - return view; + return view; } public void init(final SiteLogoView view) { - this.view = view; + this.view = view; } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -9,12 +9,12 @@ public class SiteNewGroupLinkPanel implements SiteNewGroupLinkView { public SiteNewGroupLinkPanel(final SiteNewGroupLinkPresenter presenter, final WorkspaceSkeleton ws, - final I18nUITranslationService i18n) { - final Hyperlink newGroupHyperlink = new Hyperlink(); - newGroupHyperlink.setText(i18n.t("Create New Group")); - newGroupHyperlink.setTargetHistoryToken(SiteToken.newgroup.toString()); - ws.getSiteBar().addSeparator(); - ws.getSiteBar().add(newGroupHyperlink); - ws.getSiteBar().addSpacer(); + final I18nUITranslationService i18n) { + final Hyperlink newGroupHyperlink = new Hyperlink(); + newGroupHyperlink.setText(i18n.t("Create New Group")); + newGroupHyperlink.setTargetHistoryToken(SiteToken.newgroup.toString()); + ws.getSiteBar().addSeparator(); + ws.getSiteBar().add(newGroupHyperlink); + ws.getSiteBar().addSpacer(); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -4,19 +4,17 @@ public class SiteNewGroupLinkPresenter implements SiteNewGroupLink { -private SiteNewGroupLinkView view; + private SiteNewGroupLinkView view; -public SiteNewGroupLinkPresenter() { -} + public SiteNewGroupLinkPresenter() { + } -public void init(SiteNewGroupLinkView view) { -this.view = view; -} + public void init(SiteNewGroupLinkView view) { + this.view = view; + } - public View getView() { return view; } } - Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkView.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkView.java 2008-10-21 19:26:47 UTC (rev 917) @@ -4,4 +4,3 @@ public interface SiteNewGroupLinkView extends View { } - 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -18,39 +18,39 @@ public class SiteOptionsPanel implements SiteOptionsView { public SiteOptionsPanel(final SiteOptionsPresenter presenter, final WorkspaceSkeleton ws, - final I18nUITranslationService i18n, final Provider<I18nTranslator> translatorProvider) { - final PushButton optionsButton = new PushButton(""); - // optionsButton.setText(i18n.t("Options")); - optionsButton.setHTML(i18n.t("Options") - + "<img style=\"vertical-align: middle;\" src=\"images/arrowdown.png\" />"); - optionsButton.setStyleName("k-sitebar-labellink"); - ws.getSiteBar().addSeparator(); - ws.getSiteBar().add(optionsButton); - ws.getSiteBar().addSpacer(); - ws.getSiteBar().addSpacer(); - final Menu optionsMenu = new Menu(); - optionsButton.addClickListener(new ClickListener() { - public void onClick(final Widget sender) { - optionsMenu.showAt(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 10); - } - }); - final Item linkHelpInTrans = new Item(i18n.t("Help with the translation"), new BaseItemListenerAdapter() { - @Override - public void onClick(BaseItem item, EventObject e) { - super.onClick(item, e); - translatorProvider.get().doShowTranslator(); - } - }, "images/language.gif"); + final I18nUITranslationService i18n, final Provider<I18nTranslator> translatorProvider) { + final PushButton optionsButton = new PushButton(""); + // optionsButton.setText(i18n.t("Options")); + optionsButton.setHTML(i18n.t("Options") + + "<img style=\"vertical-align: middle;\" src=\"images/arrowdown.png\" />"); + optionsButton.setStyleName("k-sitebar-labellink"); + ws.getSiteBar().addSeparator(); + ws.getSiteBar().add(optionsButton); + ws.getSiteBar().addSpacer(); + ws.getSiteBar().addSpacer(); + final Menu optionsMenu = new Menu(); + optionsButton.addClickListener(new ClickListener() { + public void onClick(final Widget sender) { + optionsMenu.showAt(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 10); + } + }); + final Item linkHelpInTrans = new Item(i18n.t("Help with the translation"), new BaseItemListenerAdapter() { + @Override + public void onClick(BaseItem item, EventObject e) { + super.onClick(item, e); + translatorProvider.get().doShowTranslator(); + } + }, "images/language.gif"); - final Item linkKuneBugs = new Item(i18n.t("Report kune bugs"), new BaseItemListenerAdapter() { - @Override - public void onClick(BaseItem item, EventObject e) { - super.onClick(item, e); - Window.open("http://code.google.com/p/kune/issues/list", "_blank", null); - } - }, "images/kuneicon16.gif"); - optionsMenu.addItem(linkHelpInTrans); - optionsMenu.addItem(linkKuneBugs); + final Item linkKuneBugs = new Item(i18n.t("Report kune bugs"), new BaseItemListenerAdapter() { + @Override + public void onClick(BaseItem item, EventObject e) { + super.onClick(item, e); + Window.open("http://code.google.com/p/kune/issues/list", "_blank", null); + } + }, "images/kuneicon16.gif"); + optionsMenu.addItem(linkHelpInTrans); + optionsMenu.addItem(linkKuneBugs); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -10,11 +10,11 @@ } public View getView() { - return view; + return view; } public void init(final SiteOptionsView view) { - this.view = view; + this.view = view; } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsView.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsView.java 2008-10-21 19:26:47 UTC (rev 917) @@ -4,4 +4,3 @@ public interface SiteOptionsView extends View { } - Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -18,29 +18,29 @@ private final Provider<SitePublicSpaceLink> publicLinkProvider; public SiteProgressPanel(final SiteProgressPresenter presenter, - final Provider<SitePublicSpaceLink> publicLinkProvider) { - this.publicLinkProvider = publicLinkProvider; - progressPanel = RootPanel.get("kuneprogresspanel"); - progressText = RootPanel.get("kuneprogresstext"); + final Provider<SitePublicSpaceLink> publicLinkProvider) { + this.publicLinkProvider = publicLinkProvider; + progressPanel = RootPanel.get("kuneprogresspanel"); + progressText = RootPanel.get("kuneprogresstext"); } public void hideProgress() { - timeProgressMaxTime.cancel(); - progressPanel.setVisible(false); - publicLinkProvider.get().setVisible(true); + timeProgressMaxTime.cancel(); + progressPanel.setVisible(false); + publicLinkProvider.get().setVisible(true); } public void showProgress(final String text) { - if (timeProgressMaxTime == null) { - timeProgressMaxTime = new Timer() { - public void run() { - hideProgress(); - } - }; - } - timeProgressMaxTime.schedule(MAX_TIME_PROGRESS_BAR); - publicLinkProvider.get().setVisible(false); - progressPanel.setVisible(true); - DOM.setInnerText(progressText.getElement(), text); + if (timeProgressMaxTime == null) { + timeProgressMaxTime = new Timer() { + public void run() { + hideProgress(); + } + }; + } + timeProgressMaxTime.schedule(MAX_TIME_PROGRESS_BAR); + publicLinkProvider.get().setVisible(false); + progressPanel.setVisible(true); + DOM.setInnerText(progressText.getElement(), text); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -10,19 +10,19 @@ } public View getView() { - return view; + return view; } public void hideProgress() { - view.hideProgress(); + view.hideProgress(); } public void init(final SiteProgressView view) { - this.view = view; + this.view = view; } public void showProgress(final String text) { - view.showProgress(text); + view.showProgress(text); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLink.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,6 +1,5 @@ package org.ourproject.kune.workspace.client.sitebar.sitepublic; - public interface SitePublicSpaceLink { void setVisible(boolean visible); 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -13,34 +13,34 @@ private SitePublicSpaceLinkView view; public SitePublicSpaceLinkPresenter(final StateManager stateManager) { - stateManager.onStateChanged(new Listener<StateDTO>() { - public void onEvent(final StateDTO state) { - setState(state); - } - }); + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(final StateDTO state) { + setState(state); + } + }); } public View getView() { - return view; + return view; } public void init(final SitePublicSpaceLinkView view) { - this.view = view; + this.view = view; } public void setVisible(final boolean visible) { - view.setVisible(visible); + view.setVisible(visible); } private void setState(final StateDTO state) { - final StateToken token = state.getStateToken(); - if (state.getAccessLists().getViewers().getMode().equals(GroupListDTO.EVERYONE)) { - final String publicUrl = token.getPublicUrl(); - view.setContentGotoPublicUrl(publicUrl); - view.setContentPublic(true); - } else { - view.setContentPublic(false); - } + final StateToken token = state.getStateToken(); + if (state.getAccessLists().getViewers().getMode().equals(GroupListDTO.EVERYONE)) { + final String publicUrl = token.getPublicUrl(); + view.setContentGotoPublicUrl(publicUrl); + view.setContentPublic(true); + } else { + view.setContentPublic(false); + } } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -11,31 +11,31 @@ private final Provider<SiteSearcher> provider; public SiteSearchPresenter(final Provider<SiteSearcher> provider) { - this.provider = provider; + this.provider = provider; } public void doSearch(final String termToSearch) { - provider.get().doSearch(termToSearch); + provider.get().doSearch(termToSearch); } public View getView() { - return view; + return view; } public void init(final SiteSearchView view) { - this.view = view; + this.view = view; } public void onSearchFocus() { - view.setTextSearchBig(); - view.clearSearchText(); + view.setTextSearchBig(); + view.clearSearchText(); } public void onSearchLostFocus(final String search) { - if (search.length() == 0) { - view.setDefaultTextSearch(); - view.setTextSearchSmall(); - } + if (search.length() == 0) { + view.setDefaultTextSearch(); + view.setTextSearchSmall(); + } } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -13,16 +13,16 @@ private final Hyperlink signInHyperlink; public SiteSignInLinkPanel(final SiteSignInLinkPresenter presenter, final I18nUITranslationService i18n, - final WorkspaceSkeleton ws) { - signInHyperlink = new Hyperlink(); - signInHyperlink.ensureDebugId(SITE_SIGN_IN); - signInHyperlink.setText(i18n.t("Sign in to collaborate")); - signInHyperlink.setTargetHistoryToken(SiteToken.signin.toString()); - ws.getSiteBar().add(signInHyperlink); - ws.getSiteBar().addSpacer(); + final WorkspaceSkeleton ws) { + signInHyperlink = new Hyperlink(); + signInHyperlink.ensureDebugId(SITE_SIGN_IN); + signInHyperlink.setText(i18n.t("Sign in to collaborate")); + signInHyperlink.setTargetHistoryToken(SiteToken.signin.toString()); + ws.getSiteBar().add(signInHyperlink); + ws.getSiteBar().addSpacer(); } public void setVisible(final boolean visible) { - signInHyperlink.setVisible(visible); + signInHyperlink.setVisible(visible); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -12,25 +12,25 @@ private SiteSignInLinkView view; public SiteSignInLinkPresenter(final Session session) { - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO user) { - view.setVisible(false); - } - }); - session.onUserSignOut(new Listener0() { - public void onEvent() { - view.setVisible(true); - } - }); + session.onUserSignIn(new Listener<UserInfoDTO>() { + public void onEvent(final UserInfoDTO user) { + view.setVisible(false); + } + }); + session.onUserSignOut(new Listener0() { + public void onEvent() { + view.setVisible(true); + } + }); } public View getView() { - return view; + return view; } public void init(final SiteSignInLinkView view) { - this.view = view; - view.setVisible(false); + this.view = view; + view.setVisible(false); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -15,21 +15,21 @@ private final Label signOutLabel; public SiteSignOutLinkPanel(final SiteSignOutLinkPresenter presenter, final I18nUITranslationService i18n, - final WorkspaceSkeleton ws) { - signOutLabel = new Label(); - signOutLabel.setText(i18n.t("Sign out")); - signOutLabel.addStyleName("k-sitebar-labellink"); - signOutLabel.ensureDebugId(SITE_SIGN_OUT); - ws.getSiteBar().add(signOutLabel); - signOutLabel.addClickListener(new ClickListener() { - public void onClick(final Widget arg0) { - Site.showProgressProcessing(); - presenter.doSignOut(); - } - }); + final WorkspaceSkeleton ws) { + signOutLabel = new Label(); + signOutLabel.setText(i18n.t("Sign out")); + signOutLabel.addStyleName("k-sitebar-labellink"); + signOutLabel.ensureDebugId(SITE_SIGN_OUT); + ws.getSiteBar().add(signOutLabel); + signOutLabel.addClickListener(new ClickListener() { + public void onClick(final Widget arg0) { + Site.showProgressProcessing(); + presenter.doSignOut(); + } + }); } public void setVisible(final boolean visible) { - signOutLabel.setVisible(visible); + signOutLabel.setVisible(visible); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -25,70 +25,70 @@ private final Provider<UserServiceAsync> userServiceProvider; public SiteSignOutLinkPresenter(final Session session, final Provider<UserServiceAsync> userServiceProvider, - final Provider<KuneErrorHandler> kuneErrorHandlerProvider) { - this.session = session; - this.userServiceProvider = userServiceProvider; - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO userInfoDTO) { - view.setVisible(true); - } - }); - session.onUserSignOut(new Listener0() { - public void onEvent() { - view.setVisible(false); - } - }); - kuneErrorHandlerProvider.get().onSessionExpired(new Listener0() { - public void onEvent() { - clientUIsignOut(); - } - }); + final Provider<KuneErrorHandler> kuneErrorHandlerProvider) { + this.session = session; + this.userServiceProvider = userServiceProvider; + session.onUserSignIn(new Listener<UserInfoDTO>() { + public void onEvent(final UserInfoDTO userInfoDTO) { + view.setVisible(true); + } + }); + session.onUserSignOut(new Listener0() { + public void onEvent() { + view.setVisible(false); + } + }); + kuneErrorHandlerProvider.get().onSessionExpired(new Listener0() { + public void onEvent() { + clientUIsignOut(); + } + }); } public void doSignOut() { - final AsyncCallback<Object> callback = new AsyncCallback<Object>() { - public void onFailure(final Throwable caught) { - Site.hideProgress(); - try { - throw caught; - } catch (final SessionExpiredException e) { - clientUIsignOut(); - } catch (final UserMustBeLoggedException e) { - clientUIsignOut(); - } catch (final Throwable e) { - GWT.log("Other kind of exception in doLogout", null); - throw new RuntimeException(); - } - } + final AsyncCallback<Object> callback = new AsyncCallback<Object>() { + public void onFailure(final Throwable caught) { + Site.hideProgress(); + try { + throw caught; + } catch (final SessionExpiredException e) { + clientUIsignOut(); + } catch (final UserMustBeLoggedException e) { + clientUIsignOut(); + } catch (final Throwable e) { + GWT.log("Other kind of exception in doLogout", null); + throw new RuntimeException(); + } + } - public void onSuccess(final Object arg0) { - Site.hideProgress(); - clientUIsignOut(); - } + public void onSuccess(final Object arg0) { + Site.hideProgress(); + clientUIsignOut(); + } - }; - userServiceProvider.get().logout(session.getUserHash(), callback); + }; + userServiceProvider.get().logout(session.getUserHash(), callback); } public View getView() { - return view; + return view; } public void init(final SiteSignOutLinkView view) { - this.view = view; - view.setVisible(false); + this.view = view; + view.setVisible(false); } private void clientUIsignOut() { - // FIXME: Remove cookie doesn't works in all browsers, know - // issue: - // http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/ded8… - // http://code.google.com/p/google-web-toolkit/issues/detail?id=1735&q=removeC… - Cookies.removeCookie(Site.USERHASH); - // Workaround: - Cookies.setCookie(Site.USERHASH, null, new Date(0), null, "/", false); - session.setUserHash(null); - session.setCurrentUserInfo(null); + // FIXME: Remove cookie doesn't works in all browsers, know + // issue: + // http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/ded8… + // http://code.google.com/p/google-web-toolkit/issues/detail?id=1735&q=removeC… + Cookies.removeCookie(Site.USERHASH); + // Workaround: + Cookies.setCookie(Site.USERHASH, null, new Date(0), null, "/", false); + session.setUserHash(null); + session.setCurrentUserInfo(null); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -27,68 +27,68 @@ private final Menu userParticipation; public SiteUserMenuPanel(final SiteUserMenuPresenter presenter, final WorkspaceSkeleton ws, - final I18nUITranslationService i18n) { - loggedUserMenu = new PushButton(""); - loggedUserMenu.ensureDebugId(LOGGED_USER_MENU); - loggedUserMenu.setStyleName("k-sitebar-labellink"); - ws.getSiteBar().add(loggedUserMenu); - separator = ws.getSiteBar().addSeparator(); - userMenu = new Menu(); - loggedUserMenu.addClickListener(new ClickListener() { - public void onClick(final Widget sender) { - userMenu.showAt(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 10); - } - }); - final Item userHomePage = new Item(i18n.t("Your homepage")); - userHomePage.setIcon("images/group-home.gif"); - userHomePage.addListener(new BaseItemListenerAdapter() { - @Override - public void onClick(final BaseItem item, final EventObject e) { - super.onClick(item, e); - presenter.onUserHomePage(); - } - }); - userHomePage.setId(USER_HOME_PAGE_MENU_ITEM); - userMenu.addItem(userHomePage); - final Item userPreferences = new Item(i18n.t("Your preferences")); - userPreferences.setId(USER_PREFERENCES_MENU_ITEM); - userPreferences.setIcon("images/kune-preferences.gif"); - userPreferences.addListener(new BaseItemListenerAdapter() { - @Override - public void onClick(final BaseItem item, final EventObject e) { - super.onClick(item, e); - presenter.onUserPreferences(); - } - }); - userMenu.addItem(userPreferences); - userParticipation = new Menu(); - userParticipation.setId(USER_PARTICIPATION_MENU_ITEM); - final MenuItem userParticipationItem = new MenuItem(i18n.t("Your groups"), userParticipation); - userParticipationItem.setIcon(""); - userMenu.addItem(userParticipationItem); + final I18nUITranslationService i18n) { + loggedUserMenu = new PushButton(""); + loggedUserMenu.ensureDebugId(LOGGED_USER_MENU); + loggedUserMenu.setStyleName("k-sitebar-labellink"); + ws.getSiteBar().add(loggedUserMenu); + separator = ws.getSiteBar().addSeparator(); + userMenu = new Menu(); + loggedUserMenu.addClickListener(new ClickListener() { + public void onClick(final Widget sender) { + userMenu.showAt(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 10); + } + }); + final Item userHomePage = new Item(i18n.t("Your homepage")); + userHomePage.setIcon("images/group-home.gif"); + userHomePage.addListener(new BaseItemListenerAdapter() { + @Override + public void onClick(final BaseItem item, final EventObject e) { + super.onClick(item, e); + presenter.onUserHomePage(); + } + }); + userHomePage.setId(USER_HOME_PAGE_MENU_ITEM); + userMenu.addItem(userHomePage); + final Item userPreferences = new Item(i18n.t("Your preferences")); + userPreferences.setId(USER_PREFERENCES_MENU_ITEM); + userPreferences.setIcon("images/kune-preferences.gif"); + userPreferences.addListener(new BaseItemListenerAdapter() { + @Override + public void onClick(final BaseItem item, final EventObject e) { + super.onClick(item, e); + presenter.onUserPreferences(); + } + }); + userMenu.addItem(userPreferences); + userParticipation = new Menu(); + userParticipation.setId(USER_PARTICIPATION_MENU_ITEM); + final MenuItem userParticipationItem = new MenuItem(i18n.t("Your groups"), userParticipation); + userParticipationItem.setIcon(""); + userMenu.addItem(userParticipationItem); } public void setLoggedUserName(final String name) { - loggedUserMenu.setHTML(name + "<img style=\"vertical-align: middle;\" src=\"images/arrowdown.png\" />"); + loggedUserMenu.setHTML(name + "<img style=\"vertical-align: middle;\" src=\"images/arrowdown.png\" />"); } public void setParticipation(final MenuItemCollection<GroupDTO> participateInGroups) { - userParticipation.removeAll(); - for (final org.ourproject.kune.platf.client.ui.MenuItem<GroupDTO> groupItem : participateInGroups) { - final Item item = new Item(groupItem.getTitle(), new BaseItemListenerAdapter() { - @Override - public void onClick(BaseItem item, EventObject e) { - super.onClick(item, e); - groupItem.fire(null); - } - }); - item.setIcon(groupItem.getIcon()); - userParticipation.addItem(item); - } + userParticipation.removeAll(); + for (final org.ourproject.kune.platf.client.ui.MenuItem<GroupDTO> groupItem : participateInGroups) { + final Item item = new Item(groupItem.getTitle(), new BaseItemListenerAdapter() { + @Override + public void onClick(BaseItem item, EventObject e) { + super.onClick(item, e); + groupItem.fire(null); + } + }); + item.setIcon(groupItem.getIcon()); + userParticipation.addItem(item); + } } public void setVisible(final boolean visible) { - loggedUserMenu.setVisible(visible); - separator.setVisible(visible); + loggedUserMenu.setVisible(visible); + separator.setVisible(visible); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -19,59 +19,59 @@ private final Session session; public SiteUserMenuPresenter(final Session session, final StateManager stateManager) { - this.session = session; - this.stateManager = stateManager; - participateInGroups = new MenuItemCollection<GroupDTO>(); - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO userInfoDTO) { - onUserSignIn(userInfoDTO); - } + this.session = session; + this.stateManager = stateManager; + participateInGroups = new MenuItemCollection<GroupDTO>(); + session.onUserSignIn(new Listener<UserInfoDTO>() { + public void onEvent(final UserInfoDTO userInfoDTO) { + onUserSignIn(userInfoDTO); + } - }); - session.onUserSignOut(new Listener0() { - public void onEvent() { - view.setVisible(false); - view.setLoggedUserName(""); - } - }); + }); + session.onUserSignOut(new Listener0() { + public void onEvent() { + view.setVisible(false); + view.setLoggedUserName(""); + } + }); } public View getView() { - return view; + return view; } public void init(final SiteUserMenuView view) { - this.view = view; + this.view = view; } public void onUserHomePage() { - stateManager.gotoToken(session.getCurrentUserInfo().getShortName()); + stateManager.gotoToken(session.getCurrentUserInfo().getShortName()); } public void onUserPreferences() { - // TODO Auto-generated method stub + // TODO Auto-generated method stub } private void addPartipation(final GroupDTO group) { - participateInGroups.add(new MenuItem<GroupDTO>("images/group-def-icon.gif", group.getShortName(), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO param) { - stateManager.gotoToken(group.getShortName()); - } - })); + participateInGroups.add(new MenuItem<GroupDTO>("images/group-def-icon.gif", group.getShortName(), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO param) { + stateManager.gotoToken(group.getShortName()); + } + })); } private void onUserSignIn(final UserInfoDTO userInfoDTO) { - view.setVisible(true); - view.setLoggedUserName(userInfoDTO.getShortName()); - participateInGroups.clear(); - for (final GroupDTO group : userInfoDTO.getGroupsIsAdmin()) { - addPartipation(group); - } - for (final GroupDTO group : userInfoDTO.getGroupsIsCollab()) { - addPartipation(group); - } - view.setParticipation(participateInGroups); + view.setVisible(true); + view.setLoggedUserName(userInfoDTO.getShortName()); + participateInGroups.clear(); + for (final GroupDTO group : userInfoDTO.getGroupsIsAdmin()) { + addPartipation(group); + } + for (final GroupDTO group : userInfoDTO.getGroupsIsCollab()) { + addPartipation(group); + } + view.setParticipation(participateInGroups); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/AbstractBar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/AbstractBar.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/AbstractBar.java 2008-10-21 19:26:47 UTC (rev 917) @@ -6,40 +6,44 @@ import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; +/** + * + * + */ public class AbstractBar extends Composite { private final HorizontalPanel childPanel; private final HorizontalPanel mainPanel; public AbstractBar() { - mainPanel = new HorizontalPanel(); - childPanel = new HorizontalPanel(); - mainPanel.add(childPanel); - initWidget(mainPanel); - mainPanel.setWidth("100%"); + mainPanel = new HorizontalPanel(); + childPanel = new HorizontalPanel(); + mainPanel.add(childPanel); + initWidget(mainPanel); + mainPanel.setWidth("100%"); } public void add(final Widget widget) { - childPanel.add(widget); - childPanel.setCellVerticalAlignment(widget, VerticalPanel.ALIGN_MIDDLE); + childPanel.add(widget); + childPanel.setCellVerticalAlignment(widget, VerticalPanel.ALIGN_MIDDLE); } public void addFill() { - final Label emptyLabel = new Label(""); - this.add(emptyLabel); - childPanel.setCellWidth(emptyLabel, "100%"); + final Label emptyLabel = new Label(""); + this.add(emptyLabel); + childPanel.setCellWidth(emptyLabel, "100%"); } public void addSeparator() { - final Label emptyLabel = new Label(""); - emptyLabel.setStyleName("ytb-sep"); - emptyLabel.addStyleName("k-toolbar-sep"); - this.add(emptyLabel); + final Label emptyLabel = new Label(""); + emptyLabel.setStyleName("ytb-sep"); + emptyLabel.addStyleName("k-toolbar-sep"); + this.add(emptyLabel); } public void addSpacer() { - final Label emptyLabel = new Label(""); - emptyLabel.setStyleName("ytb-spacer"); - this.add(emptyLabel); + final Label emptyLabel = new Label(""); + emptyLabel.setStyleName("ytb-spacer"); + this.add(emptyLabel); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SimpleToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SimpleToolbar.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SimpleToolbar.java 2008-10-21 19:26:47 UTC (rev 917) @@ -12,41 +12,41 @@ private final HorizontalPanel mainPanel; public SimpleToolbar() { - mainPanel = new HorizontalPanel(); - childPanel = new HorizontalPanel(); - mainPanel.add(childPanel); - initWidget(mainPanel); - mainPanel.setWidth("100%"); + mainPanel = new HorizontalPanel(); + childPanel = new HorizontalPanel(); + mainPanel.add(childPanel); + initWidget(mainPanel); + mainPanel.setWidth("100%"); } public void add(final Widget widget) { - childPanel.add(widget); - childPanel.setCellVerticalAlignment(widget, VerticalPanel.ALIGN_MIDDLE); + childPanel.add(widget); + childPanel.setCellVerticalAlignment(widget, VerticalPanel.ALIGN_MIDDLE); } public Widget addFill() { - final Label emptyLabel = new Label(""); - this.add(emptyLabel); - childPanel.setCellWidth(emptyLabel, "100%"); - return emptyLabel; + final Label emptyLabel = new Label(""); + this.add(emptyLabel); + childPanel.setCellWidth(emptyLabel, "100%"); + return emptyLabel; } public Widget addSeparator() { - final Label emptyLabel = new Label(""); - emptyLabel.setStyleName("ytb-sep"); - emptyLabel.addStyleName("k-toolbar-sep"); - this.add(emptyLabel); - return emptyLabel; + final Label emptyLabel = new Label(""); + emptyLabel.setStyleName("ytb-sep"); + emptyLabel.addStyleName("k-toolbar-sep"); + this.add(emptyLabel); + return emptyLabel; } public Widget addSpacer() { - final Label emptyLabel = new Label(""); - emptyLabel.setStyleName("ytb-spacer"); - this.add(emptyLabel); - return emptyLabel; + final Label emptyLabel = new Label(""); + emptyLabel.setStyleName("ytb-spacer"); + this.add(emptyLabel); + return emptyLabel; } public void removeAll() { - childPanel.clear(); + childPanel.clear(); } } \ No newline at end of file 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -26,6 +26,8 @@ private final Label nick; public BuddieWidget(String nickName, ClickListener clickListener) { + // For Drag& drop, see gwt-ext-ux image: + // http://www.gwt-ext.com:8080/demo-ux/#imageDDSample VerticalPanel vp = new VerticalPanel(); icon = new Image("images/persons/person2-32.png"); nick = new Label(nickName); @@ -80,11 +82,11 @@ } }; menuItemsContainer.createItemMenu(user.getShortName(), actionCollection, - new Listener<ActionItem<UserSimpleDTO>>() { - public void onEvent(ActionItem<UserSimpleDTO> actionItem) { - doAction(actionItem); - } - }); + new Listener<ActionItem<UserSimpleDTO>>() { + public void onEvent(ActionItem<UserSimpleDTO> actionItem) { + doAction(actionItem); + } + }); flowPanel.add(new BuddieWidget(user.getShortName(), listener)); } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -55,13 +55,14 @@ } protected void setState(StateDTO state) { - if (state.getGroup().getType().equals(GroupType.PERSONAL)) { + if (state.getGroup().getGroupType().equals(GroupType.PERSONAL)) { view.clear(); UserBuddiesDataDTO userBuddies = state.getUserBuddies(); List<UserSimpleDTO> buddies = userBuddies.getBuddies(); for (UserSimpleDTO user : buddies) { - view.addBuddie(user, actionRegistry.getCurrentActions(user, UserActionRegistry.GENERAL, session - .isLogged(), new AccessRightsDTO(true, true, true), false)); + view.addBuddie(user, actionRegistry.getCurrentActions(user, UserActionRegistry.GENERAL, + session.isLogged(), new AccessRightsDTO(true, + true, true), false)); } boolean hasLocalBuddies = buddies.size() > 0; int numExtBuddies = userBuddies.getOtherExternalBuddies(); @@ -69,10 +70,11 @@ if (hasLocalBuddies) { // i18n: plural view.setOtherUsers(i18n.t( - numExtBuddies == 1 ? "and [%d] external user" : "and [%d] external users", numExtBuddies)); + numExtBuddies == 1 ? "and [%d] external user" : "and [%d] external users", + numExtBuddies)); } else { view.setOtherUsers(i18n.t(numExtBuddies == 1 ? "[%d] external user" : "[%d] external users", - numExtBuddies)); + numExtBuddies)); } } else { if (hasLocalBuddies) { 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -37,9 +37,9 @@ this.presenter = presenter; this.i18n = i18n; - final GridDragConfiguration dragConf = new GridDragConfiguration(UserGridPanel.USER_GROUP_DD, i18n - .t("Drop in the chat area to start a chat.") - + "<br/>" + i18n.t("Drop into a room to invite the user to join the chat room")); + final GridDragConfiguration dragConf = new GridDragConfiguration(UserGridPanel.USER_GROUP_DD, + i18n.t("Drop in the chat area to start a chat.") + "<br/>" + + i18n.t("Drop into a room to invite the user to join the chat room")); gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This is an orphaned project, if you are interested " + "please request to join to work on it"), dragConf, true, true, false, true, false); gridMenuPanel.setBorder(true); @@ -112,17 +112,17 @@ public void confirmAddCollab(final String groupShortName, final String groupLongName) { final String groupName = groupLongName + " (" + groupShortName + ")"; MessageBox.confirm(i18n.t("Confirm addition of member"), i18n.t("Add [%s] as member?", groupName), - new MessageBox.ConfirmCallback() { - public void execute(final String btnID) { - if (btnID.equals("yes")) { - DeferredCommand.addCommand(new Command() { - public void execute() { - presenter.addCollab(groupShortName); - } - }); - } - } - }); + new MessageBox.ConfirmCallback() { + public void execute(final String btnID) { + if (btnID.equals("yes")) { + DeferredCommand.addCommand(new Command() { + public void execute() { + presenter.addCollab(groupShortName); + } + }); + } + } + }); } @Override 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -65,23 +65,23 @@ final String collabsTitle = i18n.t("Collaborators"); final String pendingTitle = i18n.t("Pending"); adminCategory = new GridGroup(adminsTitle, adminsTitle, i18n.t("People that can admin this group"), true); - collabCategory = new GridGroup(collabsTitle, collabsTitle, i18n - .t("Other people that collaborate with this group"), true); - pendigCategory = new GridGroup(pendingTitle, pendingTitle, i18n - .t("People pending to be accepted in this group by the admins"), imageUtils - .getImageHtml(ImageDescriptor.alert), true); + collabCategory = new GridGroup(collabsTitle, collabsTitle, + i18n.t("Other people that collaborate with this group"), true); + pendigCategory = new GridGroup(pendingTitle, pendingTitle, + i18n.t("People pending to be accepted in this group by the admins"), + imageUtils.getImageHtml(ImageDescriptor.alert), true); // i18n.t("Add member") - addMember = new GridButton("images/add-green.gif", "", i18n - .t("Add a group or a person as member of this group"), new Listener<String>() { - public void onEvent(final String parameter) { - liveSearcherProvider.get().onSelection(new Listener<LinkDTO>() { - public void onEvent(final LinkDTO link) { - view.confirmAddCollab(link.getShortName(), link.getLongName()); + addMember = new GridButton("images/add-green.gif", "", + i18n.t("Add a group or a person as member of this group"), new Listener<String>() { + public void onEvent(final String parameter) { + liveSearcherProvider.get().onSelection(new Listener<LinkDTO>() { + public void onEvent(final LinkDTO link) { + view.confirmAddCollab(link.getShortName(), link.getLongName()); + } + }); + liveSearcherProvider.get().show(); } }); - liveSearcherProvider.get().show(); - } - }); super.addGroupOperation(gotoGroupMenuItem, false); super.addUserOperation(gotoMemberMenuItem, false); } @@ -89,14 +89,14 @@ public void addCollab(final String groupShortName) { Site.showProgressProcessing(); snServiceProvider.get().addCollabMember(session.getUserHash(), session.getCurrentState().getStateToken(), - groupShortName, new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Member added as collaborator")); - stateManager.setSocialNetwork(result); - } + groupShortName, new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Member added as collaborator")); + stateManager.setSocialNetwork(result); + } - }); + }); } public void init(final GroupMembersSummaryView view) { @@ -139,19 +139,15 @@ if (userCanView) { for (final GroupDTO admin : adminsList) { - view - .addItem(createGridItem(adminCategory, admin, rights, changeToCollabMenuItem, - removeMemberMenuItem)); + view.addItem(createGridItem(adminCategory, admin, rights, changeToCollabMenuItem, removeMemberMenuItem)); } for (final GroupDTO collab : collabList) { - view - .addItem(createGridItem(collabCategory, collab, rights, changeToAdminMenuItem, - removeMemberMenuItem)); + view.addItem(createGridItem(collabCategory, collab, rights, changeToAdminMenuItem, removeMemberMenuItem)); } if (userIsAdmin) { for (final GroupDTO pendingCollab : pendingCollabsList) { view.addItem(createGridItem(pendigCategory, pendingCollab, rights, acceptJoinGroupMenuItem, - denyJoinGroupMenuItem)); + denyJoinGroupMenuItem)); } } } @@ -159,7 +155,7 @@ } private void setState(final StateDTO state) { - if (state.getGroup().getType().equals(GroupType.PERSONAL)) { + if (state.getGroup().getGroupType().equals(GroupType.PERSONAL)) { view.setVisible(false); } else { setGroupMembers(state.getGroupMembers(), state.getGroupRights()); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummary.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummary.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.workspace.client.socialnet; - public interface ParticipationSummary { } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -47,62 +47,62 @@ private final GridGroup collabOnlyCategory; public ParticipationSummaryPresenter(final I18nUITranslationService i18n, final StateManager stateManager, - final ImageUtils imageUtils, final Session session, - final Provider<SocialNetworkServiceAsync> snServiceProvider, final WsThemePresenter wsThemePresenter) { - super(i18n, stateManager, imageUtils, session, snServiceProvider); - adminCategory = new GridGroup("admin in:", " ", i18n.tWithNT("Administrate these groups", - "talking about a person"), false); - collabCategory = new GridGroup(i18n.t("and as collaborator in:"), " ", i18n.t("Collaborate in these groups"), - false); - collabOnlyCategory = new GridGroup(i18n.t("collaborator in:"), " ", i18n.t("Collaborate in these groups"), - false); - super.addGroupOperation(gotoGroupMenuItem, false); - final Listener<StateDTO> setStateListener = new Listener<StateDTO>() { - public void onEvent(StateDTO state) { - setState(state); - } - }; - stateManager.onStateChanged(setStateListener); - stateManager.onSocialNetworkChanged(setStateListener); - wsThemePresenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() { - public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { - view.setTheme(oldTheme, newTheme); - } - }); + final ImageUtils imageUtils, final Session session, + final Provider<SocialNetworkServiceAsync> snServiceProvider, final WsThemePresenter wsThemePresenter) { + super(i18n, stateManager, imageUtils, session, snServiceProvider); + adminCategory = new GridGroup("admin in:", " ", i18n.tWithNT("Administrate these groups", + "talking about a person"), false); + collabCategory = new GridGroup(i18n.t("and as collaborator in:"), " ", i18n.t("Collaborate in these groups"), + false); + collabOnlyCategory = new GridGroup(i18n.t("collaborator in:"), " ", i18n.t("Collaborate in these groups"), + false); + super.addGroupOperation(gotoGroupMenuItem, false); + final Listener<StateDTO> setStateListener = new Listener<StateDTO>() { + public void onEvent(StateDTO state) { + setState(state); + } + }; + stateManager.onStateChanged(setStateListener); + stateManager.onSocialNetworkChanged(setStateListener); + wsThemePresenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() { + public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { + view.setTheme(oldTheme, newTheme); + } + }); } public void init(final ParticipationSummaryView view) { - this.view = view; + this.view = view; } private void hide() { - view.hide(); + view.hide(); } @SuppressWarnings("unchecked") private void setState(final StateDTO state) { - final ParticipationDataDTO participation = state.getParticipation(); - final AccessRightsDTO rights = state.getGroupRights(); - view.clear(); - final List<GroupDTO> groupsIsAdmin = participation.getGroupsIsAdmin(); - final List<GroupDTO> groupsIsCollab = participation.getGroupsIsCollab(); - Log.info(participation.toString()); - final int numAdmins = groupsIsAdmin.size(); - final int numCollaborators = groupsIsCollab.size(); - if (numAdmins == 0) { - collabCategory = collabOnlyCategory; - } - for (final GroupDTO group : groupsIsAdmin) { - view.addItem(createGridItem(adminCategory, group, rights, unJoinMenuItem)); - } - for (final GroupDTO group : groupsIsCollab) { - view.addItem(createGridItem(collabCategory, group, rights, unJoinMenuItem)); - } - if (numAdmins > 0 || numCollaborators > 0) { - view.show(); - } else { - hide(); - } + final ParticipationDataDTO participation = state.getParticipation(); + final AccessRightsDTO rights = state.getGroupRights(); + view.clear(); + final List<GroupDTO> groupsIsAdmin = participation.getGroupsIsAdmin(); + final List<GroupDTO> groupsIsCollab = participation.getGroupsIsCollab(); + Log.info(participation.toString()); + final int numAdmins = groupsIsAdmin.size(); + final int numCollaborators = groupsIsCollab.size(); + if (numAdmins == 0) { + collabCategory = collabOnlyCategory; + } + for (final GroupDTO group : groupsIsAdmin) { + view.addItem(createGridItem(adminCategory, group, rights, unJoinMenuItem)); + } + for (final GroupDTO group : groupsIsCollab) { + view.addItem(createGridItem(collabCategory, group, rights, unJoinMenuItem)); + } + if (numAdmins > 0 || numCollaborators > 0) { + view.show(); + } else { + hide(); + } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -104,48 +104,49 @@ } private void createButtons() { - requestJoin = new GridButton("images/add-green.gif", i18n.t("Participate"), i18n - .t("Request to participate in this group"), new Listener<String>() { - public void onEvent(final String parameter) { - Site.showProgressProcessing(); - snServiceProvider.get().requestJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - Site.hideProgress(); - final SocialNetworkRequestResult resultType = (SocialNetworkRequestResult) result; - switch (resultType) { - case accepted: - Site.info(i18n.t("You are now member of this group")); - stateManager.reload(); - break; - case denied: - Site.important(i18n.t("Sorry this is a closed group")); - break; - case moderated: - Site.info(i18n.t("Requested. Waiting for admins decision")); - break; - } - } - }); - } - }); + requestJoin = new GridButton("images/add-green.gif", i18n.t("Participate"), + i18n.t("Request to participate in this group"), new Listener<String>() { + public void onEvent(final String parameter) { + Site.showProgressProcessing(); + snServiceProvider.get().requestJoinGroup(session.getUserHash(), + session.getCurrentState().getStateToken(), + new AsyncCallbackSimple<Object>() { + public void onSuccess(final Object result) { + Site.hideProgress(); + final SocialNetworkRequestResult resultType = (SocialNetworkRequestResult) result; + switch (resultType) { + case accepted: + Site.info(i18n.t("You are now member of this group")); + stateManager.reload(); + break; + case denied: + Site.important(i18n.t("Sorry this is a closed group")); + break; + case moderated: + Site.info(i18n.t("Requested. Waiting for admins decision")); + break; + } + } + }); + } + }); - unJoinButton = new GridButton("images/del.gif", i18n.t("Unjoin"), i18n - .t("Don't participate more in this group"), new Listener<String>() { - public void onEvent(final String parameter) { - removeMemberAction(); - } - }); + unJoinButton = new GridButton("images/del.gif", i18n.t("Unjoin"), + i18n.t("Don't participate more in this group"), new Listener<String>() { + public void onEvent(final String parameter) { + removeMemberAction(); + } + }); } private GridItem<GroupDTO> createDefMemberMenu(final GroupDTO group, final GridGroup gridGroup) { final CustomMenu<GroupDTO> menu = new CustomMenu<GroupDTO>(group); final String longName = group.getLongName(); - boolean isPersonal = group.getType().equals(GroupType.PERSONAL); - final String toolTip = i18n.t(isPersonal ? "User nickname: [%s]" : "Group short name: [%s]", group - .getShortName()); - final String imageHtml = isPersonal ? imageUtils.getImageHtml(ImageDescriptor.personDef) : imageUtils - .getImageHtml(ImageDescriptor.groupDefIcon); + boolean isPersonal = group.getGroupType().equals(GroupType.PERSONAL); + final String toolTip = i18n.t(isPersonal ? "User nickname: [%s]" : "Group short name: [%s]", + group.getShortName()); + final String imageHtml = isPersonal ? imageUtils.getImageHtml(ImageDescriptor.personDef) + : imageUtils.getImageHtml(ImageDescriptor.groupDefIcon); final GridItem<GroupDTO> gridItem = new GridItem<GroupDTO>(group, gridGroup, group.getShortName(), imageHtml, longName, longName, " ", longName, toolTip, menu); if (!isPersonal) { @@ -188,14 +189,16 @@ public void onEvent(final GroupDTO group) { Site.showProgressProcessing(); snServiceProvider.get().setAdminAsCollab(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Type of member changed")); - stateManager.setSocialNetwork(result); - } - }); + session.getCurrentState().getStateToken(), + group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess( + final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Type of member changed")); + stateManager.setSocialNetwork(result); + } + }); } }); removeMemberMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Remove this member"), @@ -203,18 +206,24 @@ public void onEvent(final GroupDTO group) { Site.showProgressProcessing(); snServiceProvider.get().deleteMember(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Member removed")); - stateManager.reload(); - // in the future, only if I cannot - // be affected: - // snService.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) - // result); - } - }); + session.getCurrentState().getStateToken(), + group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess( + final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Member removed")); + stateManager.reload(); + // in the + // future, + // only if + // I cannot + // be + // affected: + // snService.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) + // result); + } + }); } }); changeToAdminMenuItem = new MenuItem<GroupDTO>("images/arrow-up-green.gif", i18n.t("Change to admin"), @@ -222,29 +231,33 @@ public void onEvent(final GroupDTO group) { Site.showProgressProcessing(); snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Type of member changed")); - stateManager.setSocialNetwork(result); - } - }); + session.getCurrentState().getStateToken(), + group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess( + final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Type of member changed")); + stateManager.setSocialNetwork(result); + } + }); } }); acceptJoinGroupMenuItem = new MenuItem<GroupDTO>("images/accept.gif", i18n.t("Accept this member"), new Listener<GroupDTO>() { public void onEvent(final GroupDTO group) { Site.showProgressProcessing(); - snServiceProvider.get().AcceptJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Member accepted")); - stateManager.setSocialNetwork(result); - } - }); + snServiceProvider.get().acceptJoinGroup(session.getUserHash(), + session.getCurrentState().getStateToken(), + group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess( + final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Member accepted")); + stateManager.setSocialNetwork(result); + } + }); } }); denyJoinGroupMenuItem = new MenuItem<GroupDTO>("images/cancel.gif", i18n.t("Don't accept this member"), @@ -252,14 +265,16 @@ public void onEvent(final GroupDTO group) { Site.showProgressProcessing(); snServiceProvider.get().denyJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Member rejected")); - stateManager.setSocialNetwork(result); - } - }); + session.getCurrentState().getStateToken(), + group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess( + final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Member rejected")); + stateManager.setSocialNetwork(result); + } + }); } }); } @@ -271,15 +286,16 @@ private void removeMemberAction(final GroupDTO groupDTO) { Site.showProgressProcessing(); snServiceProvider.get().unJoinGroup(session.getUserHash(), new StateToken(groupDTO.getShortName()), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Removed as member")); - stateManager.reload(); - // in the future with user info: - // services.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) - // result); - } - }); + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Removed as member")); + stateManager.reload(); + // in the future with user + // info: + // services.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) + // result); + } + }); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummary.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummary.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,7 +20,6 @@ package org.ourproject.kune.workspace.client.summary; - public interface GroupSummary { } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummaryPanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummaryPanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -32,24 +32,24 @@ private final VerticalPanel vp; public GroupSummaryPanel(final GroupSummaryPresenter presenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws) { - super(i18n.t("Group Summary"), true); - setHeaderTitle(i18n.t("Some summarized information about current project" + Site.IN_DEVELOPMENT)); - vp = new VerticalPanel(); - vp.setWidth("100%"); - super.setContent(vp); - super.setContentVisible(true); - super.setBorderStylePrimaryName("k-dropdownouter-summary"); - addStyleName("kune-Margin-Medium-t"); - // Disabled while in development - // ws.getEntitySummary().addInSummary(this); + final WorkspaceSkeleton ws) { + super(i18n.t("Group Summary"), true); + setHeaderTitle(i18n.t("Some summarized information about current project" + Site.IN_DEVELOPMENT)); + vp = new VerticalPanel(); + vp.setWidth("100%"); + super.setContent(vp); + super.setContentVisible(true); + super.setBorderStylePrimaryName("k-dropdownouter-summary"); + addStyleName("kune-Margin-Medium-t"); + // Disabled while in development + // ws.getEntitySummary().addInSummary(this); } public void setComment(final String comment) { - final Label label = new Label(comment); - label.addStyleName("kune-Margin-Small-trbl"); - vp.clear(); - vp.add(label); + final Label label = new Label(comment); + label.addStyleName("kune-Margin-Small-trbl"); + vp.clear(); + vp.add(label); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummaryPresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummaryPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -33,28 +33,28 @@ private GroupSummaryView view; public GroupSummaryPresenter(final StateManager stateManager, final WsThemePresenter wsThemePresenter) { - stateManager.onStateChanged(new Listener<StateDTO>() { - public void onEvent(final StateDTO state) { - setState(state); - } - }); - wsThemePresenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() { - public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { - view.setTheme(oldTheme, newTheme); - } - }); + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(final StateDTO state) { + setState(state); + } + }); + wsThemePresenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() { + public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { + view.setTheme(oldTheme, newTheme); + } + }); } public View getView() { - return view; + return view; } public void init(final GroupSummaryView view) { - this.view = view; + this.view = view; } private void setState(final StateDTO state) { - view.setComment("Summary about this group (in development)"); + view.setComment("Summary about this group (in development)"); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -43,46 +43,46 @@ private final Session session; public TagsSummaryPresenter(final Session session, final Provider<SiteSearcher> searcherProvider, - final StateManager stateManager, final WsThemePresenter wsThemePresenter) { - this.session = session; - this.searcherProvider = searcherProvider; - stateManager.onStateChanged(new Listener<StateDTO>() { - public void onEvent(final StateDTO state) { - setState(state); - } - }); - wsThemePresenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() { - public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { - view.setTheme(oldTheme, newTheme); - } - }); + final StateManager stateManager, final WsThemePresenter wsThemePresenter) { + this.session = session; + this.searcherProvider = searcherProvider; + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(final StateDTO state) { + setState(state); + } + }); + wsThemePresenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() { + public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { + view.setTheme(oldTheme, newTheme); + } + }); } public void doSearchTag(final String name) { - searcherProvider.get().doSearchOfType( - "group:" + session.getCurrentState().getGroup().getShortName() + " tag:" + name, - SiteSearcherType.content); + searcherProvider.get().doSearchOfType( + "group:" + session.getCurrentState().getGroup().getShortName() + " tag:" + + name, SiteSearcherType.content); } public View getView() { - return view; + return view; } public void init(final TagsSummaryView view) { - this.view = view; + this.view = view; } public void setGroupTags(final List<TagResultDTO> groupTags) { - view.setTags(groupTags); + view.setTags(groupTags); } void setState(final StateDTO state) { - if (state.getTags() != null && state.getTags().length() > 0) { - view.setVisible(true); - view.setTags(state.getGroupTags()); - } else { - view.setVisible(false); - } + if (state.getTags() != null && state.getTags().length() > 0) { + view.setVisible(true); + view.setTags(state.getGroupTags()); + } else { + view.setVisible(false); + } } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsTheme.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsTheme.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsTheme.java 2008-10-21 19:26:47 UTC (rev 917) @@ -4,45 +4,45 @@ private final String name; public WsTheme(final String name) { - this.name = name; + this.name = name; } @Override public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final WsTheme other = (WsTheme) obj; - if (name == null) { - if (other.name != null) { - return false; - } - } else if (!name.equals(other.name)) { - return false; - } - return true; + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final WsTheme other = (WsTheme) obj; + if (name == null) { + if (other.name != null) { + return false; + } + } else if (!name.equals(other.name)) { + return false; + } + return true; } public String getName() { - return name; + return name; } @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (name == null ? 0 : name.hashCode()); - return result; + final int prime = 31; + int result = 1; + result = prime * result + (name == null ? 0 : name.hashCode()); + return result; } public String toString() { - return name; + return name; } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -18,42 +18,42 @@ private final I18nUITranslationService i18n; public WsThemePanel(final WorkspaceSkeleton ws, final WsThemePresenter presenter, - final I18nUITranslationService i18n) { - this.presenter = presenter; - this.i18n = i18n; - menu = new Menu(); + final I18nUITranslationService i18n) { + this.presenter = presenter; + this.i18n = i18n; + menu = new Menu(); - menu.setDefaultAlign("br-tr"); - super.setMenu(menu); - super.setIcon("images/colors.gif"); - super.setTooltip(i18n.t("Select Workspace theme for this group")); - ws.getSiteTraybar().addButton(this); - presenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() { - public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { - ws.setTheme(oldTheme, newTheme); - } - }); + menu.setDefaultAlign("br-tr"); + super.setMenu(menu); + super.setIcon("images/colors.gif"); + super.setTooltip(i18n.t("Select Workspace theme for this group")); + ws.getSiteTraybar().addButton(this); + presenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() { + public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { + ws.setTheme(oldTheme, newTheme); + } + }); } public void setThemes(final String[] themes) { - for (int i = 0; i < themes.length; i++) { - final WsTheme theme = new WsTheme(themes[i]); - final MenuItem item = new MenuItem(); - final String name = theme.getName(); - item.setIconCls("k-wstheme-icon-" + name); - item.setText(i18n.t(name)); - menu.addItem(item); - item.addListener(new BaseItemListenerAdapter() { - @Override - public void onClick(final BaseItem item, final EventObject e) { - presenter.onChangeGroupWsTheme(theme); - } - }); - } + for (int i = 0; i < themes.length; i++) { + final WsTheme theme = new WsTheme(themes[i]); + final MenuItem item = new MenuItem(); + final String name = theme.getName(); + item.setIconCls("k-wstheme-icon-" + name); + item.setText(i18n.t(name)); + menu.addItem(item); + item.addListener(new BaseItemListenerAdapter() { + @Override + public void onClick(final BaseItem item, final EventObject e) { + presenter.onChangeGroupWsTheme(theme); + } + }); + } } public void setVisible(final boolean visible) { - super.setVisible(visible); + super.setVisible(visible); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -51,12 +51,12 @@ protected void onChangeGroupWsTheme(final WsTheme newTheme) { Site.showProgressProcessing(); groupServiceProvider.get().changeGroupWsTheme(session.getUserHash(), session.getCurrentState().getStateToken(), - newTheme.getName(), new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - setTheme(newTheme); - Site.hideProgress(); - } - }); + newTheme.getName(), new AsyncCallbackSimple<Object>() { + public void onSuccess(final Object result) { + setTheme(newTheme); + Site.hideProgress(); + } + }); } private void setState(final StateDTO state) { 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -60,8 +60,8 @@ private void setState(final StateDTO state) { if (state.hasDocument()) { - view.setContentSubTitleLeft(i18n.tWithNT("by: [%s]", "used in a list of authors", state.getAuthors().get(0) - .getName())); + view.setContentSubTitleLeft(i18n.tWithNT("by: [%s]", "used in a list of authors", + state.getAuthors().get(0).getName())); view.setContentSubTitleLeftVisible(true); } else { view.setContentSubTitleLeftVisible(false); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java 2008-10-21 19:26:47 UTC (rev 917) @@ -34,61 +34,61 @@ private final Image icon; public EntityTitlePanel(final WorkspaceSkeleton ws, final EntityTitlePresenter presenter) { - icon = new Image(); - titleLabel = new EditableIconLabel(new EditableClickListener() { - public void onEdited(final String text) { - presenter.onTitleRename(text); - } - }); - dateLabel = new Label(); + icon = new Image(); + titleLabel = new EditableIconLabel(new EditableClickListener() { + public void onEdited(final String text) { + presenter.onTitleRename(text); + } + }); + dateLabel = new Label(); - final SimpleToolbar wsTitle = ws.getEntityWorkspace().getTitleComponent(); - wsTitle.add(icon); - wsTitle.add(titleLabel); - wsTitle.addFill(); - wsTitle.add(dateLabel); - icon.addStyleName("kune-Margin-Large-l"); - titleLabel.addStyleName("kune-Margin-Medium-l"); - titleLabel.addStyleName("kune-ft17px"); - titleLabel.ensureDebugId("k-entity-title-title"); - dateLabel.addStyleName("kune-Margin-Large-r"); - dateLabel.addStyleName("kune-ft12px"); - dateLabel.ensureDebugId("k-entity-title-date"); + final SimpleToolbar wsTitle = ws.getEntityWorkspace().getTitleComponent(); + wsTitle.add(icon); + wsTitle.add(titleLabel); + wsTitle.addFill(); + wsTitle.add(dateLabel); + icon.addStyleName("kune-Margin-Large-l"); + titleLabel.addStyleName("kune-Margin-Medium-l"); + titleLabel.addStyleName("kune-ft17px"); + titleLabel.ensureDebugId("k-entity-title-title"); + dateLabel.addStyleName("kune-Margin-Large-r"); + dateLabel.addStyleName("kune-ft12px"); + dateLabel.ensureDebugId("k-entity-title-date"); } public void restoreOldTitle() { - titleLabel.restoreOldText(); + titleLabel.restoreOldText(); } public void setContentDate(final String date) { - dateLabel.setText(date); + dateLabel.setText(date); } public void setContentIcon(final String iconUrl) { - icon.setUrl(iconUrl); + icon.setUrl(iconUrl); } public void setContentIconVisible(final boolean visible) { - icon.setVisible(visible); - if (visible) { - titleLabel.removeStyleName("kune-Margin-Large-l"); - titleLabel.addStyleName("kune-Margin-Medium-l"); - } else { - titleLabel.removeStyleName("kune-Margin-Medium-l"); - titleLabel.addStyleName("kune-Margin-Large-l"); - } + icon.setVisible(visible); + if (visible) { + titleLabel.removeStyleName("kune-Margin-Large-l"); + titleLabel.addStyleName("kune-Margin-Medium-l"); + } else { + titleLabel.removeStyleName("kune-Margin-Medium-l"); + titleLabel.addStyleName("kune-Margin-Large-l"); + } } public void setContentTitle(final String title) { - titleLabel.setText(title); + titleLabel.setText(title); } public void setContentTitleEditable(final boolean editable) { - titleLabel.setEditable(editable); + titleLabel.setEditable(editable); } public void setDateVisible(final boolean visible) { - dateLabel.setVisible(visible); + dateLabel.setVisible(visible); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2008-10-21 19:26:47 UTC (rev 917) @@ -50,96 +50,96 @@ private final ContentIconsRegistry iconsRegistry; public EntityTitlePresenter(final I18nTranslationService i18n, final KuneErrorHandler errorHandler, - final StateManager stateManager, final Session session, - final Provider<ContentServiceAsync> contentServiceProvider, - final Provider<ContextNavigator> contextNavigatorProvider, final ContentIconsRegistry iconsRegistry) { - this.i18n = i18n; - this.errorHandler = errorHandler; - this.session = session; - this.contentServiceProvider = contentServiceProvider; - this.contextNavigatorProvider = contextNavigatorProvider; - this.iconsRegistry = iconsRegistry; - stateManager.onStateChanged(new Listener<StateDTO>() { - public void onEvent(final StateDTO state) { - setState(state); - } - }); + final StateManager stateManager, final Session session, + final Provider<ContentServiceAsync> contentServiceProvider, + final Provider<ContextNavigator> contextNavigatorProvider, final ContentIconsRegistry iconsRegistry) { + this.i18n = i18n; + this.errorHandler = errorHandler; + this.session = session; + this.contentServiceProvider = contentServiceProvider; + this.contextNavigatorProvider = contextNavigatorProvider; + this.iconsRegistry = iconsRegistry; + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(final StateDTO state) { + setState(state); + } + }); } public View getView() { - return view; + return view; } public void init(final EntityTitleView view) { - this.view = view; + this.view = view; } public void setContentDate(final Date publishedOn) { - final DateTimeFormat fmt = DateTimeFormat.getFormat("MM/dd/yyyy, Z"); - view.setContentDate(i18n.t("Published on: [%s]", fmt.format(publishedOn))); + final DateTimeFormat fmt = DateTimeFormat.getFormat("MM/dd/yyyy, Z"); + view.setContentDate(i18n.t("Published on: [%s]", fmt.format(publishedOn))); } /** * Used renaming from context */ public void setContentTitle(final String title) { - view.setContentTitle(title); + view.setContentTitle(title); } public void setContentTitle(final String title, final boolean editable) { - setContentTitle(title); - view.setContentTitleEditable(editable); + setContentTitle(title); + view.setContentTitleEditable(editable); } protected void onTitleRename(final String newName) { - Site.showProgressSaving(); - final StateToken stateToken = session.getCurrentState().getStateToken(); - final AsyncCallback<String> asyncCallback = new AsyncCallback<String>() { - public void onFailure(final Throwable caught) { - view.restoreOldTitle(); - errorHandler.process(caught); - } + Site.showProgressSaving(); + final StateToken stateToken = session.getCurrentState().getStateToken(); + final AsyncCallback<String> asyncCallback = new AsyncCallback<String>() { + public void onFailure(final Throwable caught) { + view.restoreOldTitle(); + errorHandler.process(caught); + } - public void onSuccess(final String result) { - Site.hideProgress(); - view.setContentTitle(result); - contextNavigatorProvider.get().setItemText(stateToken, newName); - } - }; - if (stateToken.isComplete()) { - contentServiceProvider.get().renameContent(session.getUserHash(), stateToken, newName, asyncCallback); - } else { - contentServiceProvider.get().renameContainer(session.getUserHash(), stateToken, newName, asyncCallback); - } - Site.hideProgress(); + public void onSuccess(final String result) { + Site.hideProgress(); + view.setContentTitle(result); + contextNavigatorProvider.get().setItemText(stateToken, newName); + } + }; + if (stateToken.isComplete()) { + contentServiceProvider.get().renameContent(session.getUserHash(), stateToken, newName, asyncCallback); + } else { + contentServiceProvider.get().renameContainer(session.getUserHash(), stateToken, newName, asyncCallback); + } + Site.hideProgress(); } private void setContentDateVisible(final boolean visible) { - view.setDateVisible(visible); + view.setDateVisible(visible); } private void setState(final StateDTO state) { - if (state.hasDocument()) { - setContentTitle(state.getTitle(), state.getContentRights().isEditable()); - setContentDateVisible(true); - setContentDate(state.getPublishedOn()); - } else { - if (state.getContainer().getParentFolderId() == null) { - // We translate root folder names (documents, chat room, - // etcetera) - setContentTitle(i18n.t(state.getTitle()), false); - } else { - setContentTitle(state.getTitle(), state.getContentRights().isEditable()); - } - setContentDateVisible(false); - } - final String contentTypeIcon = iconsRegistry.getContentTypeIcon(state.getTypeId(), state.getMimeType()); - if (contentTypeIcon.length() > 0) { - view.setContentIcon(contentTypeIcon); - view.setContentIconVisible(true); - } else { - view.setContentIconVisible(false); - } + if (state.hasDocument()) { + setContentTitle(state.getTitle(), state.getContentRights().isEditable()); + setContentDateVisible(true); + setContentDate(state.getPublishedOn()); + } else { + if (state.getContainer().getParentFolderId() == null) { + // We translate root folder names (documents, chat room, + // etcetera) + setContentTitle(i18n.t(state.getTitle()), false); + } else { + setContentTitle(state.getTitle(), state.getContentRights().isEditable()); + } + setContentDateVisible(false); + } + final String contentTypeIcon = iconsRegistry.getContentTypeIcon(state.getTypeId(), state.getMimeType()); + if (contentTypeIcon.length() > 0) { + view.setContentIcon(contentTypeIcon); + view.setContentIconVisible(true); + } else { + view.setContentIconVisible(false); + } } } Modified: trunk/src/main/resources/dozerBeanMapping.xml =================================================================== --- trunk/src/main/resources/dozerBeanMapping.xml 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/main/resources/dozerBeanMapping.xml 2008-10-21 19:26:47 UTC (rev 917) @@ -47,7 +47,11 @@ <mapping> <class-a>org.ourproject.kune.platf.client.dto.GroupDTO</class-a> - <class-b>org.ourproject.kune.platf.server.domain.Group</class-b> + <class-b>org.ourproject.kune.platf.server.domain.Group</class-b> + <field> + <a get-method="hasLogo">hasLogo</a> + <b>hasLogo</b> + </field> </mapping> <mapping> Modified: trunk/src/test/java/org/ourproject/kune/chat/ChatToolTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/chat/ChatToolTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/chat/ChatToolTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -10,9 +10,9 @@ @Test public void clientAndServerAreSync() { - assertEquals(ChatServerTool.NAME, ChatClientTool.NAME); - assertEquals(ChatServerTool.TYPE_ROOT, ChatClientTool.TYPE_ROOT); - assertEquals(ChatServerTool.TYPE_ROOM, ChatClientTool.TYPE_ROOM); - assertEquals(ChatServerTool.TYPE_CHAT, ChatClientTool.TYPE_CHAT); + assertEquals(ChatServerTool.NAME, ChatClientTool.NAME); + assertEquals(ChatServerTool.TYPE_ROOT, ChatClientTool.TYPE_ROOT); + assertEquals(ChatServerTool.TYPE_ROOM, ChatClientTool.TYPE_ROOM); + assertEquals(ChatServerTool.TYPE_CHAT, ChatClientTool.TYPE_CHAT); } } Modified: trunk/src/test/java/org/ourproject/kune/docs/DocumentToolTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/docs/DocumentToolTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/docs/DocumentToolTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -10,9 +10,9 @@ @Test public void clientAndServerSync() { - assertEquals(DocumentServerTool.NAME, DocumentClientTool.NAME); - assertEquals(DocumentServerTool.TYPE_ROOT, DocumentClientTool.TYPE_ROOT); - assertEquals(DocumentServerTool.TYPE_FOLDER, DocumentClientTool.TYPE_FOLDER); - assertEquals(DocumentServerTool.TYPE_DOCUMENT, DocumentClientTool.TYPE_DOCUMENT); + assertEquals(DocumentServerTool.NAME, DocumentClientTool.NAME); + assertEquals(DocumentServerTool.TYPE_ROOT, DocumentClientTool.TYPE_ROOT); + assertEquals(DocumentServerTool.TYPE_FOLDER, DocumentClientTool.TYPE_FOLDER); + assertEquals(DocumentServerTool.TYPE_DOCUMENT, DocumentClientTool.TYPE_DOCUMENT); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -23,78 +23,79 @@ @Test public void actionsEmptyButNeverNull() { - Mockito.stub(session.isLogged()).toReturn(true); - checkActionLists(0, new AccessRightsDTO(true, true, true), true); - checkActionLists(0, new AccessRightsDTO(true, true, true), false); - checkActionLists(0, new AccessRightsDTO(false, true, true), true); - checkActionLists(0, new AccessRightsDTO(false, true, true), false); - checkActionLists(0, new AccessRightsDTO(false, false, true), true); - checkActionLists(0, new AccessRightsDTO(false, false, true), false); + Mockito.stub(session.isLogged()).toReturn(true); + checkActionLists(0, new AccessRightsDTO(true, true, true), true); + checkActionLists(0, new AccessRightsDTO(true, true, true), false); + checkActionLists(0, new AccessRightsDTO(false, true, true), true); + checkActionLists(0, new AccessRightsDTO(false, true, true), false); + checkActionLists(0, new AccessRightsDTO(false, false, true), true); + checkActionLists(0, new AccessRightsDTO(false, false, true), false); } @Before public void before() { - session = Mockito.mock(Session.class); - registry = new ActionRegistry<StateToken>(); - adminAction = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Administrator, - ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken parameter) { - } - }); - editorAction = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Editor, - ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken parameter) { - } - }); + session = Mockito.mock(Session.class); + registry = new ActionRegistry<StateToken>(); + adminAction = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Administrator, + ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken parameter) { + } + }); + editorAction = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Editor, + ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken parameter) { + } + }); - viewerAction = new ActionMenuItemDescriptor<StateToken>(AccessRolDTO.Viewer, new Listener<StateToken>() { - public void onEvent(final StateToken parameter) { - } - }); - viewerAction.setMustBeAuthenticated(false); + viewerAction = new ActionMenuItemDescriptor<StateToken>(AccessRolDTO.Viewer, new Listener<StateToken>() { + public void onEvent(final StateToken parameter) { + } + }); + viewerAction.setMustBeAuthenticated(false); } @Test public void mustBeAuthFalse() { - Mockito.stub(session.isLogged()).toReturn(false); - addDefActions(); - checkActionLists(0, new AccessRightsDTO(false, true, true), true); - checkActionLists(1, new AccessRightsDTO(false, true, true), false); + Mockito.stub(session.isLogged()).toReturn(false); + addDefActions(); + checkActionLists(0, new AccessRightsDTO(false, true, true), true); + checkActionLists(1, new AccessRightsDTO(false, true, true), false); } @Test public void testAddWhenAdmin() { - Mockito.stub(session.isLogged()).toReturn(true); - addDefActions(); - checkActionLists(2, new AccessRightsDTO(true, true, true), true); - checkActionLists(3, new AccessRightsDTO(true, true, true), false); + Mockito.stub(session.isLogged()).toReturn(true); + addDefActions(); + checkActionLists(2, new AccessRightsDTO(true, true, true), true); + checkActionLists(3, new AccessRightsDTO(true, true, true), false); } @Test public void testAddWhenEditor() { - Mockito.stub(session.isLogged()).toReturn(true); - addDefActions(); - checkActionLists(1, new AccessRightsDTO(false, true, true), true); - checkActionLists(2, new AccessRightsDTO(false, true, true), false); + Mockito.stub(session.isLogged()).toReturn(true); + addDefActions(); + checkActionLists(1, new AccessRightsDTO(false, true, true), true); + checkActionLists(2, new AccessRightsDTO(false, true, true), false); } @Test public void testAddWhenViewer() { - Mockito.stub(session.isLogged()).toReturn(true); - addDefActions(); - checkActionLists(0, new AccessRightsDTO(false, false, true), true); - checkActionLists(1, new AccessRightsDTO(false, false, true), false); + Mockito.stub(session.isLogged()).toReturn(true); + addDefActions(); + checkActionLists(0, new AccessRightsDTO(false, false, true), true); + checkActionLists(1, new AccessRightsDTO(false, false, true), false); } private void addDefActions() { - registry.addAction(adminAction, DEF_CONTENT_TYPE_ID); - registry.addAction(editorAction, DEF_CONTENT_TYPE_ID); - registry.addAction(viewerAction, DEF_CONTENT_TYPE_ID); + registry.addAction(adminAction, DEF_CONTENT_TYPE_ID); + registry.addAction(editorAction, DEF_CONTENT_TYPE_ID); + registry.addAction(viewerAction, DEF_CONTENT_TYPE_ID); } private void checkActionLists(final int expectedActions, final AccessRightsDTO accessRightsDTO, - final boolean toolbarActions) { - assertEquals(expectedActions, registry.getCurrentActions(new StateToken(), DEF_CONTENT_TYPE_ID, - session.isLogged(), accessRightsDTO, toolbarActions).size()); + final boolean toolbarActions) { + assertEquals(expectedActions, + registry.getCurrentActions(new StateToken(), DEF_CONTENT_TYPE_ID, session.isLogged(), + accessRightsDTO, toolbarActions).size()); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ContentIconsRegistryTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -17,65 +17,65 @@ @Before public void before() { - reg = new ContentIconsRegistry(); + reg = new ContentIconsRegistry(); } @Test public void testBasic() { - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, ICON); - assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, ICON); + assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); } @Test public void testBasicMimeType() { - final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, mimeType, ICON); - assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); - assertEquals("", reg.getContentTypeIcon(CONTENT_TYPE_TEST)); + final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, mimeType, ICON); + assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); + assertEquals("", reg.getContentTypeIcon(CONTENT_TYPE_TEST)); } @Test public void testBasicMimeTypeWithDef() { - final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, mimeType, ICON); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, OTHERICON); - assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); - assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); + final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, mimeType, ICON); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, OTHERICON); + assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); + assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); } @Test public void testBasicMimeTypeWithDefType() { - final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); - final BasicMimeTypeDTO genericMimeType = new BasicMimeTypeDTO("image"); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, mimeType, ICON); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType, OTHERICON); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, JUSTANOTHERICON); - assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); - assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType)); - assertEquals(JUSTANOTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); + final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); + final BasicMimeTypeDTO genericMimeType = new BasicMimeTypeDTO("image"); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, mimeType, ICON); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType, OTHERICON); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, JUSTANOTHERICON); + assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); + assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType)); + assertEquals(JUSTANOTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); } @Test public void testBasicMimeTypeWithOnlyDefType() { - final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); - final BasicMimeTypeDTO genericMimeType = new BasicMimeTypeDTO("image"); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType, OTHERICON); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, JUSTANOTHERICON); - assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); - assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType)); - assertEquals(JUSTANOTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); + final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); + final BasicMimeTypeDTO genericMimeType = new BasicMimeTypeDTO("image"); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType, OTHERICON); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, JUSTANOTHERICON); + assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); + assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType)); + assertEquals(JUSTANOTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); } @Test public void testNoResult() { - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, new BasicMimeTypeDTO("text", "plain"), ICON); - assertEquals("", reg.getContentTypeIcon(CONTENT_TYPE_TEST, new BasicMimeTypeDTO("text", "rtf"))); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, new BasicMimeTypeDTO("text", "plain"), ICON); + assertEquals("", reg.getContentTypeIcon(CONTENT_TYPE_TEST, new BasicMimeTypeDTO("text", "rtf"))); } @Test public void testNullBasicMimeType() { - final BasicMimeTypeDTO mimeType = null; - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, ICON); - assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); + final BasicMimeTypeDTO mimeType = null; + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, ICON); + assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTOTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -8,40 +8,40 @@ @Test public void testNoSubtype() { - final BasicMimeTypeDTO mime = new BasicMimeTypeDTO("somesimplemime"); - assertEquals("somesimplemime", mime.getType()); - assertEquals(null, mime.getSubtype()); - assertEquals("somesimplemime", mime.toString()); + final BasicMimeTypeDTO mime = new BasicMimeTypeDTO("somesimplemime"); + assertEquals("somesimplemime", mime.getType()); + assertEquals(null, mime.getSubtype()); + assertEquals("somesimplemime", mime.toString()); } @Test public void testNoSubtypeWithSlash() { - final BasicMimeTypeDTO mime = new BasicMimeTypeDTO("somesimplemime/"); - assertEquals("somesimplemime", mime.getType()); - assertEquals(null, mime.getSubtype()); - assertEquals("somesimplemime", mime.toString()); + final BasicMimeTypeDTO mime = new BasicMimeTypeDTO("somesimplemime/"); + assertEquals("somesimplemime", mime.getType()); + assertEquals(null, mime.getSubtype()); + assertEquals("somesimplemime", mime.toString()); } @Test public void testNull() { - final BasicMimeTypeDTO mime = new BasicMimeTypeDTO(null); - assertEquals(null, mime.getType()); - assertEquals(null, mime.getSubtype()); + final BasicMimeTypeDTO mime = new BasicMimeTypeDTO(null); + assertEquals(null, mime.getType()); + assertEquals(null, mime.getSubtype()); } @Test public void testSeveralSlashs() { - final BasicMimeTypeDTO mime = new BasicMimeTypeDTO("somesimplemime/subtype/thisisposible?"); - assertEquals("somesimplemime", mime.getType()); - assertEquals("subtype/thisisposible?", mime.getSubtype()); - assertEquals("somesimplemime/subtype/thisisposible?", mime.toString()); + final BasicMimeTypeDTO mime = new BasicMimeTypeDTO("somesimplemime/subtype/thisisposible?"); + assertEquals("somesimplemime", mime.getType()); + assertEquals("subtype/thisisposible?", mime.getSubtype()); + assertEquals("somesimplemime/subtype/thisisposible?", mime.toString()); } @Test public void testSubtype() { - final BasicMimeTypeDTO mime = new BasicMimeTypeDTO("somesimplemime/subtype"); - assertEquals("somesimplemime", mime.getType()); - assertEquals("subtype", mime.getSubtype()); - assertEquals("somesimplemime/subtype", mime.toString()); + final BasicMimeTypeDTO mime = new BasicMimeTypeDTO("somesimplemime/subtype"); + assertEquals("somesimplemime", mime.getType()); + assertEquals("subtype", mime.getSubtype()); + assertEquals("somesimplemime/subtype", mime.toString()); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -9,6 +9,8 @@ import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.workspace.client.site.SiteToken; +import com.calclab.suco.client.event.DirectEventFactory; +import com.calclab.suco.client.event.Events; import com.calclab.suco.client.listener.Listener; import com.calclab.suco.client.listener.Listener2; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -24,62 +26,66 @@ @SuppressWarnings("unchecked") @Test public void changeStateWithDifferentGroupsMustFireListener() { - final Listener2<GroupDTO, GroupDTO> groupListener = Mockito.mock(Listener2.class); - stateManager.onGroupChanged(groupListener); - stateManager.onHistoryChanged("group1.tool1"); - stateManager.onHistoryChanged("group2.tool1"); - // TODO, think how to test this - // Mockito.verify(groupListener).onEvent("group1", "group2"); + final Listener2<GroupDTO, GroupDTO> groupListener = Mockito.mock(Listener2.class); + stateManager.onGroupChanged(groupListener); + stateManager.onHistoryChanged("group1.tool1"); + stateManager.onHistoryChanged("group2.tool1"); + // TODO, think how to test this + // Mockito.verify(groupListener).onEvent("group1", "group2"); } @SuppressWarnings("unchecked") @Test public void changeStateWithDifferentToolsMustFireListener() { - final Listener2<String, String> toolListener = Mockito.mock(Listener2.class); - stateManager.onToolChanged(toolListener); - stateManager.gotoToken("group1.tool1"); - stateManager.gotoToken("group1.tool2"); - // TODO, think how to test this - // Mockito.verify(toolListener).onEvent("tool1", "tool2"); + final Listener2<String, String> toolListener = Mockito.mock(Listener2.class); + stateManager.onToolChanged(toolListener); + stateManager.gotoToken("group1.tool1"); + stateManager.gotoToken("group1.tool2"); + // TODO, think how to test this + // Mockito.verify(toolListener).onEvent("tool1", "tool2"); } @SuppressWarnings("unchecked") @Test public void getDefGroup() { - stateManager.onHistoryChanged("site.docs"); - Mockito.verify(contentProvider, Mockito.times(1)).getContent(Mockito.anyString(), - (StateToken) Mockito.anyObject(), (AsyncCallback<StateDTO>) Mockito.anyObject()); + stateManager.onHistoryChanged("site.docs"); + Mockito.verify(contentProvider, Mockito.times(1)).getContent(Mockito.anyString(), + (StateToken) Mockito.anyObject(), + (AsyncCallback<StateDTO>) Mockito.anyObject()); } @Before public void init() { - contentProvider = Mockito.mock(ContentProvider.class); - session = Mockito.mock(Session.class); - history = Mockito.mock(HistoryWrapper.class); - stateManager = new StateManagerDefault(contentProvider, session, history); - Mockito.stub(session.getUserHash()).toReturn(HASH); + Events.setEventFactory(new DirectEventFactory()); + contentProvider = Mockito.mock(ContentProvider.class); + session = Mockito.mock(Session.class); + history = Mockito.mock(HistoryWrapper.class); + stateManager = new StateManagerDefault(contentProvider, session, history); + Mockito.stub(session.getUserHash()).toReturn(HASH); } @SuppressWarnings("unchecked") @Test public void normalStartLoggedUser() { - // When a user enter reload state, also if the application is starting - // (and the user was logged) - Mockito.stub(history.getToken()).toReturn(""); - stateManager.reload(); - Mockito.verify(contentProvider, Mockito.times(1)).getContent(Mockito.anyString(), - (StateToken) Mockito.anyObject(), (AsyncCallback<StateDTO>) Mockito.anyObject()); + // When a user enter reload state, also if the application is starting + // (and the user was logged) + Mockito.stub(history.getToken()).toReturn(""); + stateManager.reload(); + Mockito.verify(contentProvider, Mockito.times(1)).getContent(Mockito.anyString(), + (StateToken) Mockito.anyObject(), + (AsyncCallback<StateDTO>) Mockito.anyObject()); } @SuppressWarnings("unchecked") @Test public void siteTokenFirstLoadDefContentAndFireListener() { - final Listener listener = Mockito.mock(Listener.class); - final String token = SiteToken.signin.toString(); - stateManager.addSiteToken(token, listener); - stateManager.onHistoryChanged(token); - Mockito.verify(listener, Mockito.times(1)).onEvent(Mockito.anyObject()); - Mockito.verify(contentProvider, Mockito.times(1)).getContent(Mockito.anyString(), - (StateToken) Mockito.anyObject(), (AsyncCallback<StateDTO>) Mockito.anyObject()); + final Listener listener = Mockito.mock(Listener.class); + final String token = SiteToken.signin.toString(); + stateManager.addSiteToken(token, listener); + stateManager.onHistoryChanged(token); + Mockito.verify(listener, Mockito.times(1)).onEvent(Mockito.anyObject()); + Mockito.verify(contentProvider, Mockito.times(1)).getContent(Mockito.anyString(), + (StateToken) Mockito.anyObject(), + (AsyncCallback<StateDTO>) Mockito.anyObject()); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/client/state/StateTokenTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/state/StateTokenTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/client/state/StateTokenTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -11,31 +11,31 @@ @Test public void checkAllEmpty() { - final StateToken token = new StateToken(""); - assertNull(token.getGroup()); - assertNull(token.getTool()); - assertNull(token.getFolder()); - assertNull(token.getDocument()); + final StateToken token = new StateToken(""); + assertNull(token.getGroup()); + assertNull(token.getTool()); + assertNull(token.getFolder()); + assertNull(token.getDocument()); } @Test public void checkEquals() { - final StateToken token1 = new StateToken("abc", "da", "1", "1"); - final StateToken token2 = new StateToken("abc", "da", "1", "1"); - assertEquals(token1, token2); + final StateToken token1 = new StateToken("abc", "da", "1", "1"); + final StateToken token2 = new StateToken("abc", "da", "1", "1"); + assertEquals(token1, token2); } @Test public void checkEqualsEncoded() { - final StateToken token1 = new StateToken("abc.da.1.1"); - final StateToken token2 = new StateToken("abc.da.1.1"); - assertEquals(token1, token2); + final StateToken token1 = new StateToken("abc.da.1.1"); + final StateToken token2 = new StateToken("abc.da.1.1"); + assertEquals(token1, token2); } @Test public void checkNoEquals() { - final StateToken token1 = new StateToken("abc", "da", "1", "1"); - final StateToken token2 = new StateToken("abc", "da", 1l); - assertFalse(token1.equals(token2)); + final StateToken token1 = new StateToken("abc", "da", "1", "1"); + final StateToken token2 = new StateToken("abc", "da", 1L); + assertFalse(token1.equals(token2)); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/client/tool/ToolSelectorPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/tool/ToolSelectorPresenterTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/client/tool/ToolSelectorPresenterTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -17,76 +17,76 @@ @Test public void addFirstToolMustNotSelect() { - setToolNames(); - toolSelector.addTool(toolSelectorItem1); - Mockito.verify(toolSelectorItem1).setSelected(false); + setToolNames(); + toolSelector.addTool(toolSelectorItem1); + Mockito.verify(toolSelectorItem1).setSelected(false); } @Test(expected = RuntimeException.class) public void addToolWithoutNameMustGiveException() { - toolSelector.addTool(toolSelectorItem1); + toolSelector.addTool(toolSelectorItem1); } @Test public void addTwoToolsMustSelectNothing() { - setToolNames(); - toolSelector.addTool(toolSelectorItem1); - toolSelector.addTool(toolSelectorItem2); - Mockito.verify(toolSelectorItem1).setSelected(false); - Mockito.verify(toolSelectorItem2).setSelected(false); + setToolNames(); + toolSelector.addTool(toolSelectorItem1); + toolSelector.addTool(toolSelectorItem2); + Mockito.verify(toolSelectorItem1).setSelected(false); + Mockito.verify(toolSelectorItem2).setSelected(false); } @Test(expected = RuntimeException.class) public void addTwoToolsWithSameNameMustGiveException() { - setToolNames(); - final ToolSelectorItem toolSelectorItemCopy = Mockito.mock(ToolSelectorItem.class); - Mockito.stub(toolSelectorItemCopy.getShortName()).toReturn(TOOL1_NAME); - toolSelector.addTool(toolSelectorItem1); - toolSelector.addTool(toolSelectorItemCopy); + setToolNames(); + final ToolSelectorItem toolSelectorItemCopy = Mockito.mock(ToolSelectorItem.class); + Mockito.stub(toolSelectorItemCopy.getShortName()).toReturn(TOOL1_NAME); + toolSelector.addTool(toolSelectorItem1); + toolSelector.addTool(toolSelectorItemCopy); } @Before public void begin() { - final StateManager stateManager = Mockito.mock(StateManager.class); - final WsThemePresenter themePresenter = Mockito.mock(WsThemePresenter.class); - toolSelector = new ToolSelectorPresenter(stateManager, themePresenter); - toolSelectorItem1 = Mockito.mock(ToolSelectorItem.class); - toolSelectorItem2 = Mockito.mock(ToolSelectorItem.class); + final StateManager stateManager = Mockito.mock(StateManager.class); + final WsThemePresenter themePresenter = Mockito.mock(WsThemePresenter.class); + toolSelector = new ToolSelectorPresenter(stateManager, themePresenter); + toolSelectorItem1 = Mockito.mock(ToolSelectorItem.class); + toolSelectorItem2 = Mockito.mock(ToolSelectorItem.class); } @Test public void setStateFirstMustSelect() { - setToolNames(); - toolSelector.addTool(toolSelectorItem1); - toolSelector.onToolChanged(null, TOOL1_NAME); - Mockito.verify(toolSelectorItem1, Mockito.times(1)).setSelected(false); - Mockito.verify(toolSelectorItem1, Mockito.times(1)).setSelected(true); + setToolNames(); + toolSelector.addTool(toolSelectorItem1); + toolSelector.onToolChanged(null, TOOL1_NAME); + Mockito.verify(toolSelectorItem1, Mockito.times(1)).setSelected(false); + Mockito.verify(toolSelectorItem1, Mockito.times(1)).setSelected(true); } @Test public void setStateWithADifferentGroupMustSetLink() { - setToolNames(); - toolSelector.addTool(toolSelectorItem1); - toolSelector.addTool(toolSelectorItem2); - toolSelector.onGroupChanged(GROUP1_NAME); - Mockito.verify(toolSelectorItem1, Mockito.times(1)).setGroupShortName(GROUP1_NAME); - Mockito.verify(toolSelectorItem2, Mockito.times(1)).setGroupShortName(GROUP1_NAME); + setToolNames(); + toolSelector.addTool(toolSelectorItem1); + toolSelector.addTool(toolSelectorItem2); + toolSelector.onGroupChanged(GROUP1_NAME); + Mockito.verify(toolSelectorItem1, Mockito.times(1)).setGroupShortName(GROUP1_NAME); + Mockito.verify(toolSelectorItem2, Mockito.times(1)).setGroupShortName(GROUP1_NAME); } @Test public void setStateWithADifferentToolNameMustSelectAndUnSelectTheOlder() { - setToolNames(); - toolSelector.addTool(toolSelectorItem1); - toolSelector.addTool(toolSelectorItem2); - toolSelector.onToolChanged(TOOL1_NAME, TOOL2_NAME); - Mockito.verify(toolSelectorItem2, Mockito.times(1)).setSelected(false); - Mockito.verify(toolSelectorItem1, Mockito.times(2)).setSelected(false); - Mockito.verify(toolSelectorItem2, Mockito.times(1)).setSelected(true); + setToolNames(); + toolSelector.addTool(toolSelectorItem1); + toolSelector.addTool(toolSelectorItem2); + toolSelector.onToolChanged(TOOL1_NAME, TOOL2_NAME); + Mockito.verify(toolSelectorItem2, Mockito.times(1)).setSelected(false); + Mockito.verify(toolSelectorItem1, Mockito.times(2)).setSelected(false); + Mockito.verify(toolSelectorItem2, Mockito.times(1)).setSelected(true); } public void setToolNames() { - Mockito.stub(toolSelectorItem1.getShortName()).toReturn(TOOL1_NAME); - Mockito.stub(toolSelectorItem2.getShortName()).toReturn(TOOL2_NAME); + Mockito.stub(toolSelectorItem1.getShortName()).toReturn(TOOL1_NAME); + Mockito.stub(toolSelectorItem2.getShortName()).toReturn(TOOL2_NAME); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -10,49 +10,49 @@ @Test public void testTagNull() { - final String tagsString = null; - final ArrayList<String> tags = KuneStringUtils.splitTags(tagsString); - assertEquals(0, tags.size()); + final String tagsString = null; + final ArrayList<String> tags = KuneStringUtils.splitTags(tagsString); + assertEquals(0, tags.size()); } @Test public void testTagStripsSimple() { - final String tagsString = "ab cd"; - final ArrayList<String> tags = KuneStringUtils.splitTags(tagsString); - assertEquals("ab", tags.get(0)); - assertEquals("cd", tags.get(1)); + final String tagsString = "ab cd"; + final ArrayList<String> tags = KuneStringUtils.splitTags(tagsString); + assertEquals("ab", tags.get(0)); + assertEquals("cd", tags.get(1)); } @Test public void testTagStripsWithCommas() { - final String tagsString = "ab,cd"; - final ArrayList<String> tags = KuneStringUtils.splitTags(tagsString); - assertEquals("ab", tags.get(0)); - assertEquals("cd", tags.get(1)); + final String tagsString = "ab,cd"; + final ArrayList<String> tags = KuneStringUtils.splitTags(tagsString); + assertEquals("ab", tags.get(0)); + assertEquals("cd", tags.get(1)); } @Test public void testTagStripsWithCommasAndSpaces() { - final String tagsString = "ab, cd"; - final ArrayList<String> tags = KuneStringUtils.splitTags(tagsString); - assertEquals("ab", tags.get(0)); - assertEquals("cd", tags.get(1)); + final String tagsString = "ab, cd"; + final ArrayList<String> tags = KuneStringUtils.splitTags(tagsString); + assertEquals("ab", tags.get(0)); + assertEquals("cd", tags.get(1)); } @Test public void testTagStripsWithQuotes() { - final String tagsString = "ab \"cd\""; - final ArrayList<String> tags = KuneStringUtils.splitTags(tagsString); - assertEquals("ab", tags.get(0)); - assertEquals("cd", tags.get(1)); + final String tagsString = "ab \"cd\""; + final ArrayList<String> tags = KuneStringUtils.splitTags(tagsString); + assertEquals("ab", tags.get(0)); + assertEquals("cd", tags.get(1)); } @Test public void testTagStripsWithSpaces() { - final String tagsString = " ab cd "; - final ArrayList<String> tags = KuneStringUtils.splitTags(tagsString); - assertEquals("ab", tags.get(0)); - assertEquals("cd", tags.get(1)); + final String tagsString = " ab cd "; + final ArrayList<String> tags = KuneStringUtils.splitTags(tagsString); + assertEquals("ab", tags.get(0)); + assertEquals("cd", tags.get(1)); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,55 +20,55 @@ @Before public void before() { - session = Mockito.mock(Session.class); - view = Mockito.mock(FileUploaderView.class); - presenter = new FileUploaderPresenter(session, null); - presenter.init(view); - Mockito.stub(session.getUserHash()).toReturn(SOMEUSER_HASH); + session = Mockito.mock(Session.class); + view = Mockito.mock(FileUploaderView.class); + presenter = new FileUploaderPresenter(session, null); + presenter.init(view); + Mockito.stub(session.getUserHash()).toReturn(SOMEUSER_HASH); } @Test public void testFirstAddFromDocInSameContainer() { - Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.1.1")); - assertTrue(presenter.checkFolderChange()); - Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.tool.1"); + Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.1.1")); + assertTrue(presenter.checkFolderChange()); + Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.tool.1"); } @Test public void testFirstAddInSameContainer() { - Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.1")); - assertTrue(presenter.checkFolderChange()); - Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.tool.1"); + Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.1")); + assertTrue(presenter.checkFolderChange()); + Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.tool.1"); } @Test public void testSomeAddsInDiffContainersButNotUploading() { - Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.1")); - assertTrue(presenter.checkFolderChange()); - Mockito.stub(view.hasUploadingFiles()).toReturn(false); - Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.2")); - assertTrue(presenter.checkFolderChange()); - Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.tool.1"); - Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.tool.2"); + Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.1")); + assertTrue(presenter.checkFolderChange()); + Mockito.stub(view.hasUploadingFiles()).toReturn(false); + Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.2")); + assertTrue(presenter.checkFolderChange()); + Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.tool.1"); + Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.tool.2"); } @Test public void testSomeAddsInDiffContainersButUploading() { - Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.1")); - assertTrue(presenter.checkFolderChange()); - Mockito.stub(view.hasUploadingFiles()).toReturn(true); - Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.2")); - assertFalse(presenter.checkFolderChange()); - Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.tool.1"); - Mockito.verify(view, Mockito.never()).setUploadParams(SOMEUSER_HASH, "group.tool.2"); + Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.1")); + assertTrue(presenter.checkFolderChange()); + Mockito.stub(view.hasUploadingFiles()).toReturn(true); + Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.2")); + assertFalse(presenter.checkFolderChange()); + Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.tool.1"); + Mockito.verify(view, Mockito.never()).setUploadParams(SOMEUSER_HASH, "group.tool.2"); } @Test public void testSomeAddsInSameContainer() { - Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.1")); - assertTrue(presenter.checkFolderChange()); - Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.1")); - assertTrue(presenter.checkFolderChange()); - Mockito.verify(view, Mockito.times(2)).setUploadParams(SOMEUSER_HASH, "group.tool.1"); + Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.1")); + assertTrue(presenter.checkFolderChange()); + Mockito.stub(session.getCurrentStateToken()).toReturn(new StateToken("group.tool.1")); + assertTrue(presenter.checkFolderChange()); + Mockito.verify(view, Mockito.times(2)).setUploadParams(SOMEUSER_HASH, "group.tool.1"); } } Added: trunk/src/test/java/org/ourproject/kune/platf/client/utils/UrlTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/utils/UrlTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/client/utils/UrlTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,43 @@ +package org.ourproject.kune.platf.client.utils; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class UrlTest { + + @Test + public void testBooleanFalse() { + assertEquals("test?param1=value1&param2=false", new Url("test", new UrlParam("param1", "value1"), new UrlParam( + "param2", false)).toString()); + } + + @Test + public void testBooleanTrue() { + assertEquals("test?param1=value1&param2=true", new Url("test", new UrlParam("param1", "value1"), new UrlParam( + "param2", true)).toString()); + } + + @Test + public void testOneParam() { + assertEquals("test?param1=value1", new Url("test", new UrlParam("param1", "value1")).toString()); + } + + @Test + public void testOnlyBase() { + assertEquals("test", new Url("test").toString()); + } + + @Test + public void testThreeParams() { + assertEquals("test?param1=value1&param2=value2&param3=value3", + new Url("test", new UrlParam("param1", "value1"), new UrlParam("param2", "value2"), new UrlParam( + "param3", "value3")).toString()); + } + + @Test + public void testTwoParams() { + assertEquals("test?param1=value1&param2=value2", new Url("test", new UrlParam("param1", "value1"), + new UrlParam("param2", "value2")).toString()); + } +} Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java 2008-10-21 19:26:47 UTC (rev 917) @@ -17,213 +17,213 @@ public class HttpServletRequestMocked implements HttpServletRequest { public Object getAttribute(final String arg0) { - return null; + return null; } @SuppressWarnings("unchecked") public Enumeration getAttributeNames() { - return null; + return null; } public String getAuthType() { - return null; + return null; } public String getCharacterEncoding() { - return null; + return null; } public int getContentLength() { - return 0; + return 0; } public String getContentType() { - return null; + return null; } public String getContextPath() { - return null; + return null; } public Cookie[] getCookies() { - return null; + return null; } public long getDateHeader(final String arg0) { - return 0; + return 0; } public String getHeader(final String arg0) { - return null; + return null; } @SuppressWarnings("unchecked") public Enumeration getHeaderNames() { - return null; + return null; } @SuppressWarnings("unchecked") public Enumeration getHeaders(final String arg0) { - return null; + return null; } public ServletInputStream getInputStream() throws IOException { - return null; + return null; } public int getIntHeader(final String arg0) { - return 0; + return 0; } public String getLocalAddr() { - return null; + return null; } public Locale getLocale() { - return null; + return null; } @SuppressWarnings("unchecked") public Enumeration getLocales() { - return null; + return null; } public String getLocalName() { - return null; + return null; } public int getLocalPort() { - return 0; + return 0; } public String getMethod() { - return null; + return null; } public String getParameter(final String arg0) { - return null; + return null; } @SuppressWarnings("unchecked") public Map getParameterMap() { - return null; + return null; } @SuppressWarnings("unchecked") public Enumeration getParameterNames() { - return null; + return null; } public String[] getParameterValues(final String arg0) { - return null; + return null; } public String getPathInfo() { - return null; + return null; } public String getPathTranslated() { - return null; + return null; } public String getProtocol() { - return null; + return null; } public String getQueryString() { - return null; + return null; } public BufferedReader getReader() throws IOException { - return null; + return null; } public String getRealPath(final String arg0) { - return null; + return null; } public String getRemoteAddr() { - return null; + return null; } public String getRemoteHost() { - return null; + return null; } public int getRemotePort() { - return 0; + return 0; } public String getRemoteUser() { - return null; + return null; } public RequestDispatcher getRequestDispatcher(final String arg0) { - return null; + return null; } public String getRequestedSessionId() { - return null; + return null; } public String getRequestURI() { - return null; + return null; } public StringBuffer getRequestURL() { - return null; + return null; } public String getScheme() { - return null; + return null; } public String getServerName() { - return null; + return null; } public int getServerPort() { - return 0; + return 0; } public String getServletPath() { - return null; + return null; } public HttpSession getSession() { - return null; + return null; } public HttpSession getSession(final boolean arg0) { - return null; + return null; } public Principal getUserPrincipal() { - return null; + return null; } public boolean isRequestedSessionIdFromCookie() { - return false; + return false; } public boolean isRequestedSessionIdFromUrl() { - return false; + return false; } public boolean isRequestedSessionIdFromURL() { - return false; + return false; } public boolean isRequestedSessionIdValid() { - return false; + return false; } public boolean isSecure() { - return false; + return false; } public boolean isUserInRole(final String arg0) { - return false; + return false; } public void removeAttribute(final String arg0) { Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java 2008-10-21 19:26:47 UTC (rev 917) @@ -19,17 +19,21 @@ public static Injector createInjector() { final Injector injector = Guice.createInjector(new PlatformServerModule(), new DocumentServerModule(), - new ChatServerModule(), new AbstractModule() { - @Override - protected void configure() { - bindScope(SessionScoped.class, Scopes.SINGLETON); - // test: use memory - // test_db: use mysql - bindConstant().annotatedWith(JpaUnit.class).to("test"); - bindConstant().annotatedWith(PropertiesFileName.class).to("kune.properties"); - bind(HttpServletRequest.class).to(HttpServletRequestMocked.class); - } - }); + new ChatServerModule(), new AbstractModule() { + @Override + protected void configure() { + bindScope(SessionScoped.class, Scopes.SINGLETON); + // test: use + // memory + // test_db: use + // mysql + bindConstant().annotatedWith(JpaUnit.class).to("test"); + bindConstant().annotatedWith(PropertiesFileName.class).to( + "kune.properties"); + bind(HttpServletRequest.class).to( + HttpServletRequestMocked.class); + } + }); return injector; } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -17,27 +17,27 @@ @Test public void commentDefaultContent() throws Exception { - doLogin(); - final String commentText = "Some comment"; - final CommentDTO commentDTO = contentService.addComment(session.getHash(), defaultContent.getStateToken(), - commentText); - assertEquals(commentDTO.getText(), commentText); - assertEquals(commentDTO.getPositiveVotersCount(), 0); - assertEquals(commentDTO.getNegativeVotersCount(), 0); - assertEquals(commentDTO.getAbuseInformersCount(), 0); + doLogin(); + final String commentText = "Some comment"; + final CommentDTO commentDTO = contentService.addComment(session.getHash(), defaultContent.getStateToken(), + commentText); + assertEquals(commentDTO.getText(), commentText); + assertEquals(commentDTO.getPositiveVotersCount(), 0); + assertEquals(commentDTO.getNegativeVotersCount(), 0); + assertEquals(commentDTO.getAbuseInformersCount(), 0); } @Test(expected = UserMustBeLoggedException.class) public void commentWithoutLoginMustFail() throws DefaultException { - final String commentText = "Some comment"; - contentService.addComment(session.getHash(), defaultContent.getStateToken(), commentText); + final String commentText = "Some comment"; + contentService.addComment(session.getHash(), defaultContent.getStateToken(), commentText); } @Before public void init() throws Exception { - new IntegrationTestHelper(this); - groupName = getDefSiteGroupName(); - defaultContent = getDefaultContent(); + new IntegrationTestHelper(this); + groupName = getDefSiteGroupName(); + defaultContent = getDefaultContent(); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -25,98 +25,98 @@ @Before public void init() throws Exception { - new IntegrationTestHelper(this); - groupName = getDefSiteGroupName(); + new IntegrationTestHelper(this); + groupName = getDefSiteGroupName(); } @Test(expected = UserMustBeLoggedException.class) public void noLoggedInShouldThrowIllegalAccess() throws ContentNotFoundException, Exception { - defaultContent = getDefaultContent(); - contentService.addContent(session.getHash(), defaultContent.getContainer().getStateToken(), "a name"); + defaultContent = getDefaultContent(); + contentService.addContent(session.getHash(), defaultContent.getContainer().getStateToken(), "a name"); } @Test public void testAddContent() throws Exception { - doLogin(); - defaultContent = getDefaultContent(); - assertEquals(1, defaultContent.getContainer().getContents().size()); - final AccessRightsDTO cntRights = defaultContent.getContentRights(); - final AccessRightsDTO ctxRights = defaultContent.getContainerRights(); - final AccessRightsDTO groupRights = defaultContent.getGroupRights(); + doLogin(); + defaultContent = getDefaultContent(); + assertEquals(1, defaultContent.getContainer().getContents().size()); + final AccessRightsDTO cntRights = defaultContent.getContentRights(); + final AccessRightsDTO ctxRights = defaultContent.getContainerRights(); + final AccessRightsDTO groupRights = defaultContent.getGroupRights(); - final String title = "New Content Title"; - final StateDTO added = contentService.addContent(session.getHash(), defaultContent.getContainer() - .getStateToken(), title); - assertNotNull(added); - final List<ContentSimpleDTO> contents = added.getContainer().getContents(); - assertEquals(title, added.getTitle()); - assertEquals(2, contents.size()); - assertEquals(cntRights, added.getContentRights()); - assertEquals(ctxRights, added.getContainerRights()); - assertEquals(groupRights, added.getGroupRights()); - assertNotNull(added.getGroupMembers()); - assertNotNull(added.getParticipation()); - assertNotNull(added.getAccessLists()); + final String title = "New Content Title"; + final StateDTO added = contentService.addContent(session.getHash(), + defaultContent.getContainer().getStateToken(), title); + assertNotNull(added); + final List<ContentSimpleDTO> contents = added.getContainer().getContents(); + assertEquals(title, added.getTitle()); + assertEquals(2, contents.size()); + assertEquals(cntRights, added.getContentRights()); + assertEquals(ctxRights, added.getContainerRights()); + assertEquals(groupRights, added.getGroupRights()); + assertNotNull(added.getGroupMembers()); + assertNotNull(added.getParticipation()); + assertNotNull(added.getAccessLists()); - final StateToken newState = added.getStateToken(); - final StateDTO sameAgain = contentService.getContent(session.getHash(), newState); - assertNotNull(sameAgain); - assertEquals(2, sameAgain.getContainer().getContents().size()); + final StateToken newState = added.getStateToken(); + final StateDTO sameAgain = contentService.getContent(session.getHash(), newState); + assertNotNull(sameAgain); + assertEquals(2, sameAgain.getContainer().getContents().size()); } @Test public void testAddFolder() throws Exception { - doLogin(); - defaultContent = getDefaultContent(); - final ContainerDTO parent = defaultContent.getContainer(); - final String title = "folder name"; - final StateDTO newState = contentService.addFolder(session.getHash(), parent.getStateToken(), title, - DocumentClientTool.TYPE_FOLDER); - assertNotNull(newState); - assertNotNull(newState.getGroupMembers()); - assertNotNull(newState.getParticipation()); - assertNotNull(newState.getAccessLists()); - assertNotNull(newState.getContainerRights()); - assertNotNull(newState.getGroupRights()); - assertNotNull(newState.getRootContainer().getContents().get(0).getRights()); + doLogin(); + defaultContent = getDefaultContent(); + final ContainerDTO parent = defaultContent.getContainer(); + final String title = "folder name"; + final StateDTO newState = contentService.addFolder(session.getHash(), parent.getStateToken(), title, + DocumentClientTool.TYPE_FOLDER); + assertNotNull(newState); + assertNotNull(newState.getGroupMembers()); + assertNotNull(newState.getParticipation()); + assertNotNull(newState.getAccessLists()); + assertNotNull(newState.getContainerRights()); + assertNotNull(newState.getGroupRights()); + assertNotNull(newState.getRootContainer().getContents().get(0).getRights()); - final ContainerDTO parentAgain = getDefaultContent().getContainer(); - final ContainerSimpleDTO child = parentAgain.getChilds().get(0); - assertEquals(parent.getId(), child.getParentFolderId()); + final ContainerDTO parentAgain = getDefaultContent().getContainer(); + final ContainerSimpleDTO child = parentAgain.getChilds().get(0); + assertEquals(parent.getId(), child.getParentFolderId()); - assertEquals(parent.getId(), parentAgain.getId()); - assertEquals(1, parentAgain.getChilds().size()); + assertEquals(parent.getId(), parentAgain.getId()); + assertEquals(1, parentAgain.getChilds().size()); } // @Test public void testAddRoom() throws Exception { - doLogin(); - defaultContent = getDefaultContent(); - final ContainerDTO parent = defaultContent.getContainer(); - final String roomName = "testroom"; - final StateDTO newState = contentService.addRoom(session.getHash(), parent.getStateToken(), roomName); - assertNotNull(newState); + doLogin(); + defaultContent = getDefaultContent(); + final ContainerDTO parent = defaultContent.getContainer(); + final String roomName = "testroom"; + final StateDTO newState = contentService.addRoom(session.getHash(), parent.getStateToken(), roomName); + assertNotNull(newState); } @Test public void testAddTwoFolders() throws Exception { - doLogin(); - defaultContent = getDefaultContent(); - final ContainerDTO parent = defaultContent.getContainer(); - final String title = "folder name"; - final StateDTO newState = contentService.addFolder(session.getHash(), parent.getStateToken(), title, - DocumentClientTool.TYPE_FOLDER); - assertNotNull(newState); + doLogin(); + defaultContent = getDefaultContent(); + final ContainerDTO parent = defaultContent.getContainer(); + final String title = "folder name"; + final StateDTO newState = contentService.addFolder(session.getHash(), parent.getStateToken(), title, + DocumentClientTool.TYPE_FOLDER); + assertNotNull(newState); - final StateDTO newState2 = contentService.addFolder(session.getHash(), parent.getStateToken(), title, - DocumentClientTool.TYPE_FOLDER); - assertNotNull(newState2); + final StateDTO newState2 = contentService.addFolder(session.getHash(), parent.getStateToken(), title, + DocumentClientTool.TYPE_FOLDER); + assertNotNull(newState2); - final ContainerDTO parentAgain = getDefaultContent().getContainer(); + final ContainerDTO parentAgain = getDefaultContent().getContainer(); - assertEquals(parent.getId(), parentAgain.getId()); - assertEquals(2, parentAgain.getChilds().size()); + assertEquals(parent.getId(), parentAgain.getId()); + assertEquals(2, parentAgain.getChilds().size()); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -15,81 +15,81 @@ @Test public void contentWithLoggedUserIsEditable() throws Exception { - final String userHash = doLogin(); - final StateDTO response = contentService.getContent(userHash, new StateToken()); - assertNotNull(response.getContentRights()); - assertTrue(response.getContentRights().isEditable()); - // assertTrue(response.getAccessLists().getAdmin().size() == 1); + final String userHash = doLogin(); + final StateDTO response = contentService.getContent(userHash, new StateToken()); + assertNotNull(response.getContentRights()); + assertTrue(response.getContentRights().isEditable()); + // assertTrue(response.getAccessLists().getAdmin().size() == 1); } @Before public void create() { - new IntegrationTestHelper(this); + new IntegrationTestHelper(this); } @Test public void defaultCountentShouldExist() throws Exception { - final StateDTO content = contentService.getContent(null, new StateToken()); - assertNotNull(content); - assertNotNull(content.getGroup()); - assertNotNull(content.getContainer()); - assertNotNull(content.getContainer().getId()); - assertNotNull(content.getToolName()); - assertNotNull(content.getDocumentId()); - assertNotNull(content.getRateByUsers()); - assertNotNull(content.getRate()); + final StateDTO content = contentService.getContent(null, new StateToken()); + assertNotNull(content); + assertNotNull(content.getGroup()); + assertNotNull(content.getContainer()); + assertNotNull(content.getContainer().getId()); + assertNotNull(content.getToolName()); + assertNotNull(content.getDocumentId()); + assertNotNull(content.getRateByUsers()); + assertNotNull(content.getRate()); } @Test public void noContentNotLogged() throws Exception { - final StateDTO response = contentService.getContent(null, new StateToken()); - assertNotNull(response); + final StateDTO response = contentService.getContent(null, new StateToken()); + assertNotNull(response); } @Test(expected = ContentNotFoundException.class) public void nonExistentContent() throws Exception { - contentService.getContent(null, new StateToken("foo foo foo")); + contentService.getContent(null, new StateToken("foo foo foo")); } @Test(expected = ContentNotFoundException.class) public void nonExistentContent2() throws Exception { - contentService.getContent(null, new StateToken("site.foofoo")); + contentService.getContent(null, new StateToken("site.foofoo")); } @Test(expected = ContentNotFoundException.class) public void nonExistentContent3() throws Exception { - contentService.getContent(null, new StateToken("site.docs.foofoo")); + contentService.getContent(null, new StateToken("site.docs.foofoo")); } @Test(expected = ContentNotFoundException.class) public void nonExistentContent4() throws Exception { - final StateDTO stateDTO = getDefaultContent(); - contentService.getContent(null, stateDTO.getStateToken().clone().setDocument("dadaas")); + final StateDTO stateDTO = getDefaultContent(); + contentService.getContent(null, stateDTO.getStateToken().clone().setDocument("dadaas")); } @Test(expected = ContentNotFoundException.class) public void nonExistentContent5() throws Exception { - contentService.getContent(null, new StateToken("comm3.docs.19")); + contentService.getContent(null, new StateToken("comm3.docs.19")); } @Test public void notLoggedUserShouldNotEditDefaultDoc() throws Exception { - final StateDTO content = contentService.getContent(null, new StateToken()); - assertFalse(content.getContentRights().isAdministrable()); - assertFalse(content.getContentRights().isEditable()); - assertTrue(content.getContentRights().isVisible()); - assertFalse(content.getContainerRights().isAdministrable()); - assertFalse(content.getContainerRights().isEditable()); - assertTrue(content.getContainerRights().isVisible()); + final StateDTO content = contentService.getContent(null, new StateToken()); + assertFalse(content.getContentRights().isAdministrable()); + assertFalse(content.getContentRights().isEditable()); + assertTrue(content.getContentRights().isVisible()); + assertFalse(content.getContainerRights().isAdministrable()); + assertFalse(content.getContainerRights().isEditable()); + assertTrue(content.getContainerRights().isVisible()); } @Test public void unknownContent() throws Exception { - final StateDTO content = contentService.getContent(null, new StateToken("site.docs")); - assertNotNull(content); - assertNotNull(content.getGroup()); - assertNotNull(content.getContainer()); - assertNotNull(content.getContainer().getId()); - assertNotNull(content.getToolName()); + final StateDTO content = contentService.getContent(null, new StateToken("site.docs")); + assertNotNull(content); + assertNotNull(content.getGroup()); + assertNotNull(content.getContainer()); + assertNotNull(content.getContainer().getId()); + assertNotNull(content.getToolName()); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -12,9 +12,9 @@ protected ContentService contentService; protected StateDTO getDefaultContent() throws Exception { - final StateToken stateToken = new StateToken(getDefSiteGroupName()); - final StateDTO content = contentService.getContent(session.getHash(), stateToken); - return content; + final StateToken stateToken = new StateToken(getDefSiteGroupName()); + final StateDTO content = contentService.getContent(session.getHash(), stateToken); + return content; } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceSaveTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -14,33 +14,33 @@ @Before public void init() throws Exception { - new IntegrationTestHelper(this); + new IntegrationTestHelper(this); - defaultContent = getDefaultContent(); - doLogin(); + defaultContent = getDefaultContent(); + doLogin(); } @Test public void testSaveAndRetrieve() throws Exception { - final String text = "Lorem ipsum dolor sit amet"; - final int version = defaultContent.getVersion(); - final int currentVersion = contentService.save(getHash(), defaultContent.getStateToken(), text); - assertEquals(version + 2, currentVersion); - final StateDTO again = contentService.getContent(getHash(), defaultContent.getStateToken()); - assertEquals(text, again.getContent()); - assertEquals(0, (int) again.getRateByUsers()); - assertEquals(new Double(0), again.getRate()); + final String text = "Lorem ipsum dolor sit amet"; + final int version = defaultContent.getVersion(); + final int currentVersion = contentService.save(getHash(), defaultContent.getStateToken(), text); + assertEquals(version + 2, currentVersion); + final StateDTO again = contentService.getContent(getHash(), defaultContent.getStateToken()); + assertEquals(text, again.getContent()); + assertEquals(0, (int) again.getRateByUsers()); + assertEquals(new Double(0), again.getRate()); } @Test public void testSaveAndRetrieveBig() throws Exception { - final String text = TestDomainHelper.createBigText(); - ; - final int version = defaultContent.getVersion(); - final int currentVersion = contentService.save(getHash(), defaultContent.getStateToken(), text); - assertEquals(version + 2, currentVersion); - final StateDTO again = contentService.getContent(getHash(), defaultContent.getStateToken()); - assertEquals(text, again.getContent()); + final String text = TestDomainHelper.createBigText(); + ; + final int version = defaultContent.getVersion(); + final int currentVersion = contentService.save(getHash(), defaultContent.getStateToken(), text); + assertEquals(version + 2, currentVersion); + final StateDTO again = contentService.getContent(getHash(), defaultContent.getStateToken()); + assertEquals(text, again.getContent()); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -25,184 +25,185 @@ @Test public void addRemoveAuthor() throws Exception { - final List<UserSimpleDTO> authors = defaultContent.getAuthors(); - assertEquals(1, authors.size()); - final UserSimpleDTO author = authors.get(0); - final String authorShortName = author.getShortName(); - contentService.removeAuthor(getHash(), defaultContent.getStateToken(), authorShortName); - final List<UserSimpleDTO> authors2 = getDefaultContent().getAuthors(); - assertEquals(0, authors2.size()); - contentService.addAuthor(getHash(), defaultContent.getStateToken(), authorShortName); - final List<UserSimpleDTO> authors3 = getDefaultContent().getAuthors(); - assertEquals(1, authors3.size()); - contentService.addAuthor(getHash(), defaultContent.getStateToken(), authorShortName); - final List<UserSimpleDTO> authors4 = getDefaultContent().getAuthors(); - assertEquals(1, authors4.size()); + final List<UserSimpleDTO> authors = defaultContent.getAuthors(); + assertEquals(1, authors.size()); + final UserSimpleDTO author = authors.get(0); + final String authorShortName = author.getShortName(); + contentService.removeAuthor(getHash(), defaultContent.getStateToken(), authorShortName); + final List<UserSimpleDTO> authors2 = getDefaultContent().getAuthors(); + assertEquals(0, authors2.size()); + contentService.addAuthor(getHash(), defaultContent.getStateToken(), authorShortName); + final List<UserSimpleDTO> authors3 = getDefaultContent().getAuthors(); + assertEquals(1, authors3.size()); + contentService.addAuthor(getHash(), defaultContent.getStateToken(), authorShortName); + final List<UserSimpleDTO> authors4 = getDefaultContent().getAuthors(); + assertEquals(1, authors4.size()); } @Test public void contentRateAndRetrieve() throws Exception { - contentService.rateContent(getHash(), defaultContent.getStateToken(), 4.5); - final StateDTO again = contentService.getContent(getHash(), defaultContent.getStateToken()); - assertEquals(true, again.isRateable()); - assertEquals(new Double(4.5), again.getCurrentUserRate()); - assertEquals(new Double(4.5), again.getRate()); - assertEquals(new Integer(1), again.getRateByUsers()); + contentService.rateContent(getHash(), defaultContent.getStateToken(), 4.5); + final StateDTO again = contentService.getContent(getHash(), defaultContent.getStateToken()); + assertEquals(true, again.isRateable()); + assertEquals(new Double(4.5), again.getCurrentUserRate()); + assertEquals(new Double(4.5), again.getRate()); + assertEquals(new Integer(1), again.getRateByUsers()); } @Test public void contentSetLanguage() throws Exception { - contentService.setLanguage(getHash(), defaultContent.getStateToken(), "es"); - final StateDTO contentRetrieved = contentService.getContent(getHash(), defaultContent.getStateToken()); - assertEquals("es", contentRetrieved.getLanguage().getCode()); + contentService.setLanguage(getHash(), defaultContent.getStateToken(), "es"); + final StateDTO contentRetrieved = contentService.getContent(getHash(), defaultContent.getStateToken()); + assertEquals("es", contentRetrieved.getLanguage().getCode()); } @Test public void defAdminDontShowAsParticipation() throws Exception { - doLogin(); - final StateDTO content = contentService.getContent(getHash(), new StateToken(getSiteAdminShortName())); - assertEquals(0, content.getParticipation().getGroupsIsCollab().size()); - assertEquals(1, content.getParticipation().getGroupsIsAdmin().size()); + doLogin(); + final StateDTO content = contentService.getContent(getHash(), new StateToken(getSiteAdminShortName())); + assertEquals(0, content.getParticipation().getGroupsIsCollab().size()); + assertEquals(1, content.getParticipation().getGroupsIsAdmin().size()); } @Test public void folderRename() throws Exception { - doLogin(); - defaultContent = getDefaultContent(); + doLogin(); + defaultContent = getDefaultContent(); - final String oldTitle = "some title"; - String newTitle = "folder new name"; - final StateDTO newState = contentService.addFolder(session.getHash(), defaultContent.getStateToken(), oldTitle, - DocumentClientTool.TYPE_FOLDER); + final String oldTitle = "some title"; + String newTitle = "folder new name"; + final StateDTO newState = contentService.addFolder(session.getHash(), defaultContent.getStateToken(), oldTitle, + DocumentClientTool.TYPE_FOLDER); - final ContainerDTO newFolder = newState.getContainer(); + final ContainerDTO newFolder = newState.getContainer(); - assertEquals(oldTitle, newFolder.getName()); + assertEquals(oldTitle, newFolder.getName()); - final StateToken folderToken = new StateToken(groupShortName, defaultContent.getStateToken().getTool(), - newFolder.getId().toString(), null); - String result = contentService.renameContainer(getHash(), folderToken, newTitle); + final StateToken folderToken = new StateToken(groupShortName, defaultContent.getStateToken().getTool(), + newFolder.getId().toString(), null); + String result = contentService.renameContainer(getHash(), folderToken, newTitle); - assertEquals(newTitle, result); + assertEquals(newTitle, result); - final StateToken newFolderToken = new StateToken(groupShortName, defaultContent.getStateToken().getTool(), - newFolder.getId().toString(), null); - StateDTO folderAgain = contentService.getContent(getHash(), newFolderToken); + final StateToken newFolderToken = new StateToken(groupShortName, defaultContent.getStateToken().getTool(), + newFolder.getId().toString(), null); + StateDTO folderAgain = contentService.getContent(getHash(), newFolderToken); - assertEquals(newTitle, folderAgain.getContainer().getName()); + assertEquals(newTitle, folderAgain.getContainer().getName()); - newTitle = "folder last name"; + newTitle = "folder last name"; - result = contentService.renameContainer(getHash(), newFolderToken, newTitle); + result = contentService.renameContainer(getHash(), newFolderToken, newTitle); - folderAgain = contentService.getContent(getHash(), newFolderToken); + folderAgain = contentService.getContent(getHash(), newFolderToken); - assertEquals(newTitle, folderAgain.getContainer().getName()); + assertEquals(newTitle, folderAgain.getContainer().getName()); } @Test(expected = AccessViolationException.class) public void folderRenameOtherGroupFails() throws Exception { - doLogin(); - defaultContent = getDefaultContent(); - final ContainerDTO folder = defaultContent.getContainer(); - final StateToken folderToken = new StateToken("otherGroup", defaultContent.getStateToken().getTool(), folder - .getId().toString(), null); + doLogin(); + defaultContent = getDefaultContent(); + final ContainerDTO folder = defaultContent.getContainer(); + final StateToken folderToken = new StateToken("otherGroup", defaultContent.getStateToken().getTool(), + folder.getId().toString(), null); - final String newTitle = "folder new name"; - contentService.renameContainer(getHash(), folderToken, newTitle); + final String newTitle = "folder new name"; + contentService.renameContainer(getHash(), folderToken, newTitle); } @Test(expected = RuntimeException.class) public void folderRootRenameMustFail() throws Exception { - doLogin(); - defaultContent = getDefaultContent(); - final ContainerDTO folder = defaultContent.getContainer(); + doLogin(); + defaultContent = getDefaultContent(); + final ContainerDTO folder = defaultContent.getContainer(); - final String newTitle = "folder new name"; - final StateToken folderToken = new StateToken(groupShortName, defaultContent.getStateToken().getTool(), folder - .getId().toString(), null); - final String result = contentService.renameContainer(getHash(), folderToken, newTitle); + final String newTitle = "folder new name"; + final StateToken folderToken = new StateToken(groupShortName, defaultContent.getStateToken().getTool(), + folder.getId().toString(), null); + final String result = contentService.renameContainer(getHash(), folderToken, newTitle); - assertEquals(newTitle, result); + assertEquals(newTitle, result); - final ContainerDTO folderAgain = getDefaultContent().getContainer(); + final ContainerDTO folderAgain = getDefaultContent().getContainer(); - assertEquals(newTitle, folderAgain.getName()); + assertEquals(newTitle, folderAgain.getName()); } @Before public void init() throws Exception { - new IntegrationTestHelper(this); - doLogin(); - defaultContent = getDefaultContent(); - groupShortName = defaultContent.getStateToken().getGroup(); + new IntegrationTestHelper(this); + doLogin(); + defaultContent = getDefaultContent(); + groupShortName = defaultContent.getStateToken().getGroup(); } @Test public void setTagsAndResults() throws Exception { - contentService.setTags(getHash(), defaultContent.getStateToken(), "bfoo cfoa afoo2"); - final List<TagResultDTO> summaryTags = contentService.getSummaryTags(getHash(), defaultContent.getStateToken()); - assertEquals(3, summaryTags.size()); + contentService.setTags(getHash(), defaultContent.getStateToken(), "bfoo cfoa afoo2"); + final List<TagResultDTO> summaryTags = contentService.getSummaryTags(getHash(), defaultContent.getStateToken()); + assertEquals(3, summaryTags.size()); - TagResultDTO tagResultDTO = summaryTags.get(0); - assertEquals("afoo2", tagResultDTO.getName()); - assertEquals(1, (long) tagResultDTO.getCount()); + TagResultDTO tagResultDTO = summaryTags.get(0); + assertEquals("afoo2", tagResultDTO.getName()); + assertEquals(1, (long) tagResultDTO.getCount()); - tagResultDTO = summaryTags.get(1); - assertEquals("bfoo", tagResultDTO.getName()); - assertEquals(1, (long) tagResultDTO.getCount()); + tagResultDTO = summaryTags.get(1); + assertEquals("bfoo", tagResultDTO.getName()); + assertEquals(1, (long) tagResultDTO.getCount()); - tagResultDTO = summaryTags.get(2); - assertEquals("cfoa", tagResultDTO.getName()); - assertEquals(1, (long) tagResultDTO.getCount()); + tagResultDTO = summaryTags.get(2); + assertEquals("cfoa", tagResultDTO.getName()); + assertEquals(1, (long) tagResultDTO.getCount()); } @Test public void setTagsAndRetrieve() throws Exception { - contentService.setTags(getHash(), defaultContent.getStateToken(), "foo foa foo"); - final String tagsRetrieved = getDefaultContent().getTags(); - assertEquals("foo foa", tagsRetrieved); + contentService.setTags(getHash(), defaultContent.getStateToken(), "foo foa foo"); + final String tagsRetrieved = getDefaultContent().getTags(); + assertEquals("foo foa", tagsRetrieved); } @Test public void testSetAsDefContent() throws Exception { - doLogin(); - defaultContent = getDefaultContent(); + doLogin(); + defaultContent = getDefaultContent(); - final StateDTO added = contentService.addContent(session.getHash(), defaultContent.getStateToken(), - "New Content Title"); - assertNotNull(added); + final StateDTO added = contentService.addContent(session.getHash(), defaultContent.getStateToken(), + "New Content Title"); + assertNotNull(added); - final ContentSimpleDTO newDefContent = contentService.setAsDefaultContent(session.getHash(), added.getStateToken()); + final ContentSimpleDTO newDefContent = contentService.setAsDefaultContent(session.getHash(), + added.getStateToken()); - assertTrue(!defaultContent.getStateToken().equals(newDefContent.getStateToken())); - assertTrue(added.getStateToken().equals(newDefContent.getStateToken())); + assertTrue(!defaultContent.getStateToken().equals(newDefContent.getStateToken())); + assertTrue(added.getStateToken().equals(newDefContent.getStateToken())); } @Test public void tokenRename() throws Exception { - doLogin(); - defaultContent = getDefaultContent(); - final ContainerDTO folder = defaultContent.getContainer(); + doLogin(); + defaultContent = getDefaultContent(); + final ContainerDTO folder = defaultContent.getContainer(); - final String oldTitle = "some title"; - String newTitle = "folder new name"; - final StateDTO newState = contentService.addFolder(session.getHash(), folder.getStateToken(), oldTitle, - DocumentClientTool.TYPE_FOLDER); + final String oldTitle = "some title"; + String newTitle = "folder new name"; + final StateDTO newState = contentService.addFolder(session.getHash(), folder.getStateToken(), oldTitle, + DocumentClientTool.TYPE_FOLDER); - final ContainerDTO newFolder = newState.getContainer(); + final ContainerDTO newFolder = newState.getContainer(); - assertEquals(oldTitle, newFolder.getName()); + assertEquals(oldTitle, newFolder.getName()); - newTitle = "folder last name"; + newTitle = "folder last name"; - final String result = contentService.renameContainer(getHash(), newState.getStateToken(), newTitle); + final String result = contentService.renameContainer(getHash(), newState.getStateToken(), newTitle); - assertEquals(newTitle, result); + assertEquals(newTitle, result); - final StateDTO folderAgain = contentService.getContent(getHash(), newState.getStateToken()); + final StateDTO folderAgain = contentService.getContent(getHash(), newState.getStateToken()); - assertEquals(newTitle, folderAgain.getContainer().getName()); + assertEquals(newTitle, folderAgain.getContainer().getName()); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -44,7 +44,7 @@ assertEquals(groupCreated.getLongName(), group.getLongName()); assertEquals(groupCreated.getAdmissionType(), AdmissionType.Open); - assertEquals(groupCreated.getType(), GroupType.COMMUNITY); + assertEquals(groupCreated.getGroupType(), GroupType.COMMUNITY); } @Test(expected = Exception.class) @@ -76,7 +76,7 @@ assertEquals(groupCreated.getLongName(), group.getLongName()); assertEquals(groupCreated.getAdmissionType(), AdmissionType.Moderated); - assertEquals(groupCreated.getType(), GroupType.PROJECT); + assertEquals(groupCreated.getGroupType(), GroupType.PROJECT); } @Test @@ -94,7 +94,7 @@ assertEquals(groupCreated.getShortName(), group.getShortName()); assertEquals(groupCreated.getLongName(), group.getLongName()); assertEquals(groupCreated.getAdmissionType(), AdmissionType.Moderated); - assertEquals(groupCreated.getType(), GroupType.ORGANIZATION); + assertEquals(groupCreated.getGroupType(), GroupType.ORGANIZATION); } @Test @@ -113,7 +113,7 @@ assertEquals(groupCreated.getShortName(), group.getShortName()); assertEquals(groupCreated.getLongName(), group.getLongName()); assertEquals(groupCreated.getAdmissionType(), AdmissionType.Open); - assertEquals(groupCreated.getType(), GroupType.ORPHANED_PROJECT); + assertEquals(groupCreated.getGroupType(), GroupType.ORPHANED_PROJECT); assertEquals(0, groupCreated.getSocialNetwork().getAccessLists().getAdmins().getList().size()); assertEquals(0, groupCreated.getSocialNetwork().getAccessLists().getEditors().getList().size()); } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -32,26 +32,26 @@ @Before public void init() { - new IntegrationTestHelper(this); + new IntegrationTestHelper(this); } @Test public void testGetInitData() throws Exception { - final InitDataDTO initData = service.getInitData(null); - assertNotNull(initData); - assertValidLicenseDTOList(initData.getLicenses()); - assertTrue(initData.getLanguages().size() > 0); - assertTrue(initData.getCountries().size() > 0); - assertNotNull(initData.getLanguages().get(0).getCode()); - assertNotNull(initData.getCountries().get(0).getCode()); + final InitDataDTO initData = service.getInitData(null); + assertNotNull(initData); + assertValidLicenseDTOList(initData.getLicenses()); + assertTrue(initData.getLanguages().size() > 0); + assertTrue(initData.getCountries().size() > 0); + assertNotNull(initData.getLanguages().get(0).getCode()); + assertNotNull(initData.getCountries().get(0).getCode()); } private void assertValidLicenseDTOList(final ArrayList<LicenseDTO> licenseList) { - assertTrue(licenseList.size() > 0); - for (final Object o : licenseList) { - assertNotNull(o); - assertEquals(LicenseDTO.class, o.getClass()); - } + assertTrue(licenseList.size() > 0); + for (final Object o : licenseList) { + assertNotNull(o); + assertEquals(LicenseDTO.class, o.getClass()); + } } } Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkMembersTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkMembersTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkMembersTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -27,22 +27,22 @@ @Before public void init() { - new IntegrationTestHelper(this); - group = groupFinder.findByShortName(getSiteAdminShortName()); + new IntegrationTestHelper(this); + group = groupFinder.findByShortName(getSiteAdminShortName()); } @Test public void testAdminMembersOfGroupFinder() throws Exception { - doLogin(); - final List<Group> result = groupFinder.findAdminInGroups(group.getId()); - assertEquals(2, result.size()); + doLogin(); + final List<Group> result = groupFinder.findAdminInGroups(group.getId()); + assertEquals(2, result.size()); } @Test public void testCollabMembersOfGroupFinder() throws Exception { - doLogin(); - final List<Group> result = groupFinder.findCollabInGroups(group.getId()); - assertEquals(0, result.size()); + doLogin(); + final List<Group> result = groupFinder.findCollabInGroups(group.getId()); + assertEquals(0, result.size()); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -26,31 +26,31 @@ @Before public void init() { - new IntegrationTestHelper(this); - groupToken = new StateToken(getDefSiteGroupName()); + new IntegrationTestHelper(this); + groupToken = new StateToken(getDefSiteGroupName()); } @Test public void testGetGroupMembersNotLogged() throws Exception { - final SocialNetworkDTO groupMembers = socialNetworkService.getGroupMembers(null, groupToken); - assertNotNull(groupMembers); + final SocialNetworkDTO groupMembers = socialNetworkService.getGroupMembers(null, groupToken); + assertNotNull(groupMembers); } @Test public void testGetParticipationNotLogged() throws Exception { - final ParticipationDataDTO participation = socialNetworkService.getParticipation(null, groupToken); - assertNotNull(participation); + final ParticipationDataDTO participation = socialNetworkService.getParticipation(null, groupToken); + assertNotNull(participation); } @Test(expected = UserMustBeLoggedException.class) public void testRequestJoinNoLogged() throws Exception { - socialNetworkService.requestJoinGroup(session.getHash(), groupToken); + socialNetworkService.requestJoinGroup(session.getHash(), groupToken); } @Test(expected = AlreadyUserMemberException.class) public void testRequestJoinPersonalGroup() throws Exception { - doLogin(); - socialNetworkService.requestJoinGroup(session.getHash(), groupToken); + doLogin(); + socialNetworkService.requestJoinGroup(session.getHash(), groupToken); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/server/TestDomainHelper.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/TestDomainHelper.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/TestDomainHelper.java 2008-10-21 19:26:47 UTC (rev 917) @@ -16,8 +16,8 @@ public static User createUser(final int number) { String shortName = "shortname" + number; String longName = "name" + number; - User user = new User(shortName, longName, "email@domain" + number, "password" + number, null, null, TimeZone - .getDefault()); + User user = new User(shortName, longName, "email@domain" + number, "password" + number, null, null, + TimeZone.getDefault()); Group userGroup = new Group(shortName, longName); userGroup.setAdmissionType(AdmissionType.Closed); userGroup.setSocialNetwork(createSocialNetwork(userGroup, userGroup, userGroup, null)); 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -36,7 +36,7 @@ final Content descriptor = new Content(); final Container container = TestDomainHelper.createFolderWithIdAndToolName(5, "toolName2"); descriptor.setContainer(container); - expect(contentManager.find(1l)).andReturn(descriptor); + expect(contentManager.find(1L)).andReturn(descriptor); replay(contentManager); finder.getContent(new StateToken("groupShortName", "toolName", "5", "1"), null); @@ -48,7 +48,7 @@ final Content descriptor = new Content(); final Container container = TestDomainHelper.createFolderWithIdAndGroupAndTool(5, "groupOther", "toolName"); descriptor.setContainer(container); - expect(contentManager.find(1l)).andReturn(descriptor); + expect(contentManager.find(1L)).andReturn(descriptor); replay(contentManager); finder.getContent(new StateToken("groupShortName", "toolName", "5", "1"), null); @@ -60,7 +60,7 @@ final Content descriptor = new Content(); final Container container = TestDomainHelper.createFolderWithId(1); descriptor.setContainer(container); - expect(contentManager.find(1l)).andReturn(descriptor); + expect(contentManager.find(1L)).andReturn(descriptor); replay(contentManager); finder.getContent(new StateToken("groupShortName", "toolName", "5", "1"), null); @@ -95,10 +95,10 @@ public void testCompleteToken() throws Exception { final Container container = TestDomainHelper.createFolderWithIdAndGroupAndTool(1, "groupShortName", "toolName"); final Content descriptor = new Content(); - descriptor.setId(1l); + descriptor.setId(1L); descriptor.setContainer(container); - expect(contentManager.find(2l)).andReturn(descriptor); + expect(contentManager.find(2L)).andReturn(descriptor); replay(contentManager); final Content content = finder.getContent(new StateToken("groupShortName", "toolName", "1", "2"), null); @@ -109,7 +109,7 @@ @Test public void testDefaultGroupContent() throws Exception { final Group userGroup = new Group(); - final Content descriptor = TestDomainHelper.createDescriptor(1l, "title", "content"); + final Content descriptor = TestDomainHelper.createDescriptor(1L, "title", "content"); userGroup.setDefaultContent(descriptor); final Content content = finder.getContent(new StateToken(), userGroup); @@ -119,7 +119,7 @@ @Test public void testDefaultGroupContentHasDefLicense() throws Exception { final Group userGroup = new Group(); - final Content descriptor = TestDomainHelper.createDescriptor(1l, "title", "content"); + final Content descriptor = TestDomainHelper.createDescriptor(1L, "title", "content"); userGroup.setDefaultContent(descriptor); final Content content = finder.getContent(new StateToken(), userGroup); @@ -138,7 +138,7 @@ @Test public void testDocMissing() throws Exception { final Container container = new Container(); - expect(containerManager.find(1l)).andReturn(container); + expect(containerManager.find(1L)).andReturn(container); replay(containerManager); final Content content = finder.getContent(new StateToken("groupShortName", "toolName", "1", null), null); @@ -166,7 +166,7 @@ final Content descriptor = new Content(); final Container container = TestDomainHelper.createFolderWithIdAndToolName(5, "toolName"); descriptor.setContainer(container); - expect(contentManager.find(1l)).andReturn(descriptor); + expect(contentManager.find(1L)).andReturn(descriptor); replay(contentManager); finder.getContent(new StateToken("groupShortName", "toolName", "5", "1a"), null); 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptorTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -19,63 +19,63 @@ @Before public void before() { - auth = new AuthenticatedMethodInterceptor(); - new IntegrationTestHelper(auth, this); - invocation = Mockito.mock(MethodInvocation.class); - final AccessibleObject accessibleObject = Mockito.mock(AccessibleObject.class); - Mockito.stub(invocation.getMethod()).toReturn(this.getClass().getMethods()[0]); - Mockito.stub(invocation.getStaticPart()).toReturn(accessibleObject); - authAnnotation = Mockito.mock(Authenticated.class); - Mockito.stub(accessibleObject.getAnnotation(Authenticated.class)).toReturn(authAnnotation); + auth = new AuthenticatedMethodInterceptor(); + new IntegrationTestHelper(auth, this); + invocation = Mockito.mock(MethodInvocation.class); + final AccessibleObject accessibleObject = Mockito.mock(AccessibleObject.class); + Mockito.stub(invocation.getMethod()).toReturn(this.getClass().getMethods()[0]); + Mockito.stub(invocation.getStaticPart()).toReturn(accessibleObject); + authAnnotation = Mockito.mock(Authenticated.class); + Mockito.stub(accessibleObject.getAnnotation(Authenticated.class)).toReturn(authAnnotation); } @Test(expected = UserMustBeLoggedException.class) public void hashNullAndMandatoryMustDoNothing() throws Throwable { - Mockito.stub(authAnnotation.mandatory()).toReturn(true); - final Object[] arguments = { null }; - Mockito.stub(invocation.getArguments()).toReturn(arguments); - auth.invoke(invocation); + Mockito.stub(authAnnotation.mandatory()).toReturn(true); + final Object[] arguments = { null }; + Mockito.stub(invocation.getArguments()).toReturn(arguments); + auth.invoke(invocation); } @Test public void hashNullAndNotMandatoryMustDoNothing() throws Throwable { - Mockito.stub(authAnnotation.mandatory()).toReturn(false); - final Object[] arguments = { null }; - Mockito.stub(invocation.getArguments()).toReturn(arguments); - auth.invoke(invocation); + Mockito.stub(authAnnotation.mandatory()).toReturn(false); + final Object[] arguments = { null }; + Mockito.stub(invocation.getArguments()).toReturn(arguments); + auth.invoke(invocation); } @Test public void hashNullAsStringAndNotMandatoryMustDoNothing() throws Throwable { - Mockito.stub(authAnnotation.mandatory()).toReturn(false); - final Object[] arguments = { "null" }; - Mockito.stub(invocation.getArguments()).toReturn(arguments); - auth.invoke(invocation); + Mockito.stub(authAnnotation.mandatory()).toReturn(false); + final Object[] arguments = { "null" }; + Mockito.stub(invocation.getArguments()).toReturn(arguments); + auth.invoke(invocation); } @Test(expected = SessionExpiredException.class) public void otherHashAndMandatoryAndLoggedMustSessionExp() throws Throwable { - doLogin(); - Mockito.stub(authAnnotation.mandatory()).toReturn(true); - final Object[] arguments = { "other-hash" }; - Mockito.stub(invocation.getArguments()).toReturn(arguments); - auth.invoke(invocation); + doLogin(); + Mockito.stub(authAnnotation.mandatory()).toReturn(true); + final Object[] arguments = { "other-hash" }; + Mockito.stub(invocation.getArguments()).toReturn(arguments); + auth.invoke(invocation); } @Test public void sameHashAndMandatoryAndLoggedMustSessionExp() throws Throwable { - doLogin(); - Mockito.stub(authAnnotation.mandatory()).toReturn(true); - final Object[] arguments = { getHash() }; - Mockito.stub(invocation.getArguments()).toReturn(arguments); - auth.invoke(invocation); + doLogin(); + Mockito.stub(authAnnotation.mandatory()).toReturn(true); + final Object[] arguments = { getHash() }; + Mockito.stub(invocation.getArguments()).toReturn(arguments); + auth.invoke(invocation); } @Test(expected = SessionExpiredException.class) public void someHashAndMandatoryAndNotLoggedMustSessionExp() throws Throwable { - Mockito.stub(authAnnotation.mandatory()).toReturn(true); - final Object[] arguments = { "some-hash" }; - Mockito.stub(invocation.getArguments()).toReturn(arguments); - auth.invoke(invocation); + Mockito.stub(authAnnotation.mandatory()).toReturn(true); + final Object[] arguments = { "some-hash" }; + Mockito.stub(invocation.getArguments()).toReturn(arguments); + auth.invoke(invocation); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -21,42 +21,42 @@ @Before public void before() { - auth = new AuthorizatedMethodInterceptor(); - new IntegrationTestHelper(auth, this); - invocation = Mockito.mock(MethodInvocation.class); - final AccessibleObject accessibleObject = Mockito.mock(AccessibleObject.class); - Mockito.stub(invocation.getMethod()).toReturn(this.getClass().getMethods()[0]); - Mockito.stub(invocation.getStaticPart()).toReturn(accessibleObject); - authAnnotation = Mockito.mock(Authorizated.class); - Mockito.stub(accessibleObject.getAnnotation(Authorizated.class)).toReturn(authAnnotation); + auth = new AuthorizatedMethodInterceptor(); + new IntegrationTestHelper(auth, this); + invocation = Mockito.mock(MethodInvocation.class); + final AccessibleObject accessibleObject = Mockito.mock(AccessibleObject.class); + Mockito.stub(invocation.getMethod()).toReturn(this.getClass().getMethods()[0]); + Mockito.stub(invocation.getStaticPart()).toReturn(accessibleObject); + authAnnotation = Mockito.mock(Authorizated.class); + Mockito.stub(accessibleObject.getAnnotation(Authorizated.class)).toReturn(authAnnotation); } @Test(expected = ContentNotFoundException.class) public void tesHashNullContainer() throws Throwable { - // Mockito.stub(authAnnotation.accessRolRequired()).toReturn(AccessRol.Administrator); - Mockito.stub(authAnnotation.actionLevel()).toReturn(ActionLevel.content); - final Object[] arguments = { getHash(), new StateToken("group.docs") }; - Mockito.stub(invocation.getArguments()).toReturn(arguments); - auth.invoke(invocation); + // Mockito.stub(authAnnotation.accessRolRequired()).toReturn(AccessRol.Administrator); + Mockito.stub(authAnnotation.actionLevel()).toReturn(ActionLevel.content); + final Object[] arguments = { getHash(), new StateToken("group.docs") }; + Mockito.stub(invocation.getArguments()).toReturn(arguments); + auth.invoke(invocation); } @Test(expected = ContentNotFoundException.class) public void testHashNullContent() throws Throwable { - Mockito.stub(authAnnotation.actionLevel()).toReturn(ActionLevel.content); - final Object[] arguments = { getHash(), new StateToken("group.docs.1") }; - Mockito.stub(invocation.getArguments()).toReturn(arguments); - auth.invoke(invocation); + Mockito.stub(authAnnotation.actionLevel()).toReturn(ActionLevel.content); + final Object[] arguments = { getHash(), new StateToken("group.docs.1") }; + Mockito.stub(invocation.getArguments()).toReturn(arguments); + auth.invoke(invocation); } @Test(expected = AccessViolationException.class) public void wrongGroupNameThrowsExcep() throws Throwable { - doLogin(); - Mockito.stub(authAnnotation.accessRolRequired()).toReturn(AccessRol.Administrator); - Mockito.stub(authAnnotation.actionLevel()).toReturn(ActionLevel.content); - final Object[] arguments = { getHash(), new StateToken("groupWRONG.docs.1.1") }; - Mockito.stub(invocation.getArguments()).toReturn(arguments); - auth.invoke(invocation); + doLogin(); + Mockito.stub(authAnnotation.accessRolRequired()).toReturn(AccessRol.Administrator); + Mockito.stub(authAnnotation.actionLevel()).toReturn(ActionLevel.content); + final Object[] arguments = { getHash(), new StateToken("groupWRONG.docs.1.1") }; + Mockito.stub(invocation.getArguments()).toReturn(arguments); + auth.invoke(invocation); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/server/domain/GroupListTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/domain/GroupListTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/domain/GroupListTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -12,33 +12,33 @@ @Before public void createList() { - list = new GroupList(); - includedGroup = new Group("one", "group"); - list.add(includedGroup); + list = new GroupList(); + includedGroup = new Group("one", "group"); + list.add(includedGroup); } @Test public void testModeNormal() { - list.setMode(GroupListMode.NORMAL); - assertTrue(list.includes(includedGroup)); - assertFalse(list.includes(new Group("other", "group"))); - assertFalse(list.includes(Group.NO_GROUP)); + list.setMode(GroupListMode.NORMAL); + assertTrue(list.includes(includedGroup)); + assertFalse(list.includes(new Group("other", "group"))); + assertFalse(list.includes(Group.NO_GROUP)); } @Test public void testModeNobody() { - list.setMode(GroupListMode.NOBODY); - assertFalse(list.includes(includedGroup)); - assertFalse(list.includes(new Group("other", "group"))); - assertFalse(list.includes(Group.NO_GROUP)); + list.setMode(GroupListMode.NOBODY); + assertFalse(list.includes(includedGroup)); + assertFalse(list.includes(new Group("other", "group"))); + assertFalse(list.includes(Group.NO_GROUP)); } @Test public void testModeEverybody() { - list.setMode(GroupListMode.EVERYONE); - assertTrue(list.includes(includedGroup)); - assertTrue(list.includes(new Group("other", "group"))); - assertTrue(list.includes(Group.NO_GROUP)); + list.setMode(GroupListMode.EVERYONE); + assertTrue(list.includes(includedGroup)); + assertTrue(list.includes(new Group("other", "group"))); + assertTrue(list.includes(Group.NO_GROUP)); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/server/finders/GroupFinderTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/finders/GroupFinderTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/finders/GroupFinderTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -16,18 +16,18 @@ @Before public void insertData() { - openTransaction(); - persist(new Group("shortname1", "name1")); - persist(new Group("shortname2", "name2")); + openTransaction(); + persist(new Group("shortname1", "name1")); + persist(new Group("shortname2", "name2")); } @Test public void testGetAll() { - assertEquals(2, groupFinder.getAll().size()); + assertEquals(2, groupFinder.getAll().size()); } @After public void close() { - closeTransaction(); + closeTransaction(); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/server/finders/RateFinderTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/finders/RateFinderTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/finders/RateFinderTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -34,75 +34,75 @@ @After public void close() { - if (getTransaction().isActive()) { - getTransaction().rollback(); - } + if (getTransaction().isActive()) { + getTransaction().rollback(); + } } @Before public void insertData() throws Exception { - english = new I18nLanguage(new Long(1819), "English", "English", "en"); - languageManager.persist(english); - gb = new I18nCountry(new Long(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", "western", ","); - countryManager.persist(gb); + english = new I18nLanguage(new Long(1819), "English", "English", "en"); + languageManager.persist(english); + gb = new I18nCountry(new Long(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", "western", ","); + countryManager.persist(gb); } @Test public void testContentNotRated() { - final EntityManager manager = openTransaction(); + final EntityManager manager = openTransaction(); - final Content cd = new Content(); - cd.setLanguage(english); - cd.setPublishedOn(new Date()); - manager.persist(cd); + final Content cd = new Content(); + cd.setLanguage(english); + cd.setPublishedOn(new Date()); + manager.persist(cd); - closeTransaction(); - final Double rate = rateFinder.calculateRate(cd); - final Long rateByUsers = rateFinder.calculateRateNumberOfUsers(cd); - assertEquals(0, (long) rateByUsers); + closeTransaction(); + final Double rate = rateFinder.calculateRate(cd); + final Long rateByUsers = rateFinder.calculateRateNumberOfUsers(cd); + assertEquals(0, (long) rateByUsers); - // FIXME: Why null? in other tests this return zero - assertEquals(null, rate); + // FIXME: Why null? in other tests this return zero + assertEquals(null, rate); } @Test public void testContentRateAverage() { - final EntityManager manager = openTransaction(); + final EntityManager manager = openTransaction(); - final User user1 = TestDomainHelper.createUser(1); - final User user2 = TestDomainHelper.createUser(2); + final User user1 = TestDomainHelper.createUser(1); + final User user2 = TestDomainHelper.createUser(2); - user1.setLanguage(english); - user2.setLanguage(english); + user1.setLanguage(english); + user2.setLanguage(english); - user1.setCountry(gb); - user2.setCountry(gb); + user1.setCountry(gb); + user2.setCountry(gb); - manager.persist(user1); - manager.persist(user2); + manager.persist(user1); + manager.persist(user2); - final Content cd = new Content(); - cd.setLanguage(english); - cd.setPublishedOn(new Date()); - manager.persist(cd); + final Content cd = new Content(); + cd.setLanguage(english); + cd.setPublishedOn(new Date()); + manager.persist(cd); - manager.persist(new Rate(user1, cd, 1.3)); - manager.persist(new Rate(user2, cd, 3.3)); - // same user and content other rate - final Rate rateFinded = rateFinder.find(user2, cd); - rateFinded.setValue(4.3); - manager.persist(rateFinded); + manager.persist(new Rate(user1, cd, 1.3)); + manager.persist(new Rate(user2, cd, 3.3)); + // same user and content other rate + final Rate rateFinded = rateFinder.find(user2, cd); + rateFinded.setValue(4.3); + manager.persist(rateFinded); - closeTransaction(); - final Double rate = rateFinder.calculateRate(cd); - final Long rateByUsers = rateFinder.calculateRateNumberOfUsers(cd); - final Double average = (1.3 + 4.3) / 2; - assertEquals(average, rate); - assertEquals(new Long(2), rateByUsers); - final Rate newRate1 = rateFinder.find(user1, cd); - final Rate newRate2 = rateFinder.find(user2, cd); - assertEquals(new Double(1.3), newRate1.getValue()); - assertEquals(new Double(4.3), newRate2.getValue()); + closeTransaction(); + final Double rate = rateFinder.calculateRate(cd); + final Long rateByUsers = rateFinder.calculateRateNumberOfUsers(cd); + final Double average = (1.3 + 4.3) / 2; + assertEquals(average, rate); + assertEquals(new Long(2), rateByUsers); + final Rate newRate1 = rateFinder.find(user1, cd); + final Rate newRate2 = rateFinder.find(user2, cd); + assertEquals(new Double(1.3), newRate1.getValue()); + assertEquals(new Double(4.3), newRate2.getValue()); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -69,7 +69,7 @@ "western", ","); countryManager.persist(gb); user = userManager.createUser("username", "the user name", "email(a)example.com", "userPassword", "en", "GB", - TimeZone.getDefault().getID()); + TimeZone.getDefault().getID()); defLicense = new License("by-sa", "Creative Commons Attribution-ShareAlike", "", "http://creativecommons.org/licenses/by-sa/3.0/", true, true, false, "", ""); licenseManager.persist(defLicense); 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -120,10 +120,10 @@ public void createUserExistingEmail() throws I18nNotFoundException, GroupNameInUseException, EmailAddressInUseException { final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); + "GB", "GMT"); groupManager.createUserGroup(user1); final User user2 = userManager.createUser("test2", "test 2 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); + "GB", "GMT"); groupManager.createUserGroup(user2); } @@ -131,10 +131,10 @@ public void createUserExistingLongName() throws I18nNotFoundException, GroupNameInUseException, EmailAddressInUseException { final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); + "GB", "GMT"); groupManager.createUserGroup(user1); final User user2 = userManager.createUser("test2", "test 1 name", "test2(a)example.com", "some password", "en", - "GB", "GMT"); + "GB", "GMT"); groupManager.createUserGroup(user2); } @@ -142,17 +142,17 @@ public void createUserExistingShortName() throws I18nNotFoundException, GroupNameInUseException, EmailAddressInUseException { final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); + "GB", "GMT"); groupManager.createUserGroup(user1); final User user2 = userManager.createUser("test", "test 2 name", "test2(a)example.com", "some password", "en", - "GB", "GMT"); + "GB", "GMT"); groupManager.createUserGroup(user2); } @Test(expected = EmailAddressInUseException.class) public void createUserWithExistingEmail() throws Exception { final User user2 = userManager.createUser("username2", "the user name 2", "email(a)example.com", "userPassword", - "en", "GB", TimeZone.getDefault().getID()); + "en", "GB", TimeZone.getDefault().getID()); groupManager.createUserGroup(user2); rollbackTransaction(); } @@ -160,7 +160,7 @@ @Test(expected = GroupNameInUseException.class) public void createUserWithExistingLongName() throws Exception { final User user2 = userManager.createUser("username2", "the user name", "email2(a)example.com", "userPassword", - "en", "GB", TimeZone.getDefault().getID()); + "en", "GB", TimeZone.getDefault().getID()); groupManager.createUserGroup(user2); rollbackTransaction(); } @@ -168,7 +168,7 @@ @Test(expected = GroupNameInUseException.class) public void createUserWithExistingShortName() throws Exception { final User user2 = userManager.createUser("username", "the user name 2", "email2(a)example.com", "userPassword", - "en", "GB", TimeZone.getDefault().getID()); + "en", "GB", TimeZone.getDefault().getID()); groupManager.createUserGroup(user2); rollbackTransaction(); } @@ -200,7 +200,7 @@ "western", ","); countryManager.persist(gb); user = userManager.createUser("username", "the user name", "email(a)example.com", "userPassword", "en", "GB", - TimeZone.getDefault().getID()); + TimeZone.getDefault().getID()); defLicense = new License("by-sa", "Creative Commons Attribution-ShareAlike", "", "http://creativecommons.org/licenses/by-sa/3.0/", true, true, false, "", ""); licenseManager.persist(defLicense); 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -46,99 +46,99 @@ @After public void close() { - if (getTransaction().isActive()) { - getTransaction().rollback(); - } + if (getTransaction().isActive()) { + getTransaction().rollback(); + } } @Test public void emailCorrect() { - user = new User("test1", "test1 name", "test(a)example.com", "some passwd", english, gb, getTimeZone()); - persist(user); + user = new User("test1", "test1 name", "test(a)example.com", "some passwd", english, gb, getTimeZone()); + persist(user); } @Test(expected = InvalidStateException.class) public void emailEmpty() { - user = new User("test1", "test1 name", "", "some passwd", english, gb, getTimeZone()); - persist(user); + user = new User("test1", "test1 name", "", "some passwd", english, gb, getTimeZone()); + persist(user); } @Test(expected = InvalidStateException.class) public void emailIncorrect() { - user = new User("test1", "test1 name", "falseEmail@", "some passwd", english, gb, getTimeZone()); - persist(user); + user = new User("test1", "test1 name", "falseEmail@", "some passwd", english, gb, getTimeZone()); + persist(user); } @Before public void insertData() throws Exception { - openTransaction(); - assertEquals(0, userFinder.getAll().size()); - assertEquals(0, groupFinder.getAll().size()); - english = new I18nLanguage(new Long(1819), "English", "English", "en"); - languageManager.persist(english); - gb = new I18nCountry(new Long(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", "western", ","); - countryManager.persist(gb); - user = new User(USER_SHORT_NAME, USER_LONG_NAME, USER_EMAIL, USER_PASSWORD, english, gb, getTimeZone()); - persist(user); + openTransaction(); + assertEquals(0, userFinder.getAll().size()); + assertEquals(0, groupFinder.getAll().size()); + english = new I18nLanguage(new Long(1819), "English", "English", "en"); + languageManager.persist(english); + gb = new I18nCountry(new Long(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", "western", ","); + countryManager.persist(gb); + user = new User(USER_SHORT_NAME, USER_LONG_NAME, USER_EMAIL, USER_PASSWORD, english, gb, getTimeZone()); + persist(user); } @Test public void loginIncorrect() { - final User result = userManager.login("test", "test"); - assertNull(result); + final User result = userManager.login("test", "test"); + assertNull(result); } @Test public void loginWithEmailCorrect() { - final User result = userManager.login(USER_EMAIL, USER_PASSWORD); - assertNotNull(result.getId()); + final User result = userManager.login(USER_EMAIL, USER_PASSWORD); + assertNotNull(result.getId()); } @Test public void loginWithNickCorrect() { - final User result = userManager.login(USER_SHORT_NAME, USER_PASSWORD); - assertNotNull(result.getId()); + final User result = userManager.login(USER_SHORT_NAME, USER_PASSWORD); + assertNotNull(result.getId()); } @Test(expected = InvalidStateException.class) public void passwdLengthIncorrect() { - user = new User("test1", "test1 name", "test(a)example.com", "pass", english, gb, getTimeZone()); - persist(user); + user = new User("test1", "test1 name", "test(a)example.com", "pass", english, gb, getTimeZone()); + persist(user); } @Test(expected = EntityExistsException.class) public void testUserExist() throws I18nNotFoundException { - final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); - persist(user1); - final User user2 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); - persist(user2); + final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", + "GB", "GMT"); + persist(user1); + final User user2 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", + "GB", "GMT"); + persist(user2); } @Test(expected = InvalidStateException.class) public void userNameLengthIncorrect() { - user = new User("test1", "te", "test(a)example.com", "some passwd", english, gb, getTimeZone()); - persist(user); + user = new User("test1", "te", "test(a)example.com", "some passwd", english, gb, getTimeZone()); + persist(user); } @Test public void userSearch() throws Exception, ParseException { - userManager.reIndex(); - final SearchResult<User> result = userManager.search(USER_SHORT_NAME); - assertEquals(1, (long) result.getSize()); - assertEquals(USER_SHORT_NAME, result.getList().get(0).getShortName()); - rollbackTransaction(); + userManager.reIndex(); + final SearchResult<User> result = userManager.search(USER_SHORT_NAME); + assertEquals(1, (long) result.getSize()); + assertEquals(USER_SHORT_NAME, result.getList().get(0).getShortName()); + rollbackTransaction(); } @Test(expected = InvalidStateException.class) public void userShortNameIncorrect() { - user = new User("test1A", "test1 name", "test(a)example.com", "some passwd", english, gb, getTimeZone()); - persist(user); + user = new User("test1A", "test1 name", "test(a)example.com", "some passwd", english, gb, getTimeZone()); + persist(user); } private TimeZone getTimeZone() { - return TimeZone.getDefault(); + return TimeZone.getDefault(); } } Added: 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManagerTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,60 @@ +package org.ourproject.kune.platf.server.manager.file; + +import static org.junit.Assert.assertEquals; +import net.sf.json.JSONObject; + +import org.apache.commons.fileupload.FileItem; +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.IntegrationTestHelper; +import org.ourproject.kune.platf.integration.content.ContentServiceIntegrationTest; +import org.ourproject.kune.workspace.client.entitylogo.EntityLogoView; + +import com.google.inject.Inject; + +public class EntityLogoUploadManagerTest extends ContentServiceIntegrationTest { + + private static final String TEST_FILE = "src/test/java/org/ourproject/kune/platf/server/manager/file/orig.png"; + @Inject + EntityLogoUploadManager manager; + + @Before + public void create() { + new IntegrationTestHelper(this); + } + + @Test + public void testCreateLogo() throws Exception { + super.doLogin(); + FileItem fileItem = Mockito.mock(FileItem.class); + Mockito.stub(fileItem.getContentType()).toReturn("image/jpeg"); + Mockito.stub(fileItem.getName()).toReturn(TEST_FILE); + manager.createUploadedFile(super.getHash(), super.getDefaultContent().getStateToken(), "file", fileItem); + } + + @Test + public void testErrorResponse() { + JSONObject expected = JSONObject.fromObject("{\"success\":false,\"errors\":[{\"id\":\"" + + EntityLogoView.LOGO_FORM_FIELD + "\",\"msg\":\"Some message\"}]}"); + assertEquals(expected, manager.createJsonResponse(false, "Some message")); + } + + @Test(expected = SessionExpiredException.class) + public void testSessionExp() throws Exception { + manager.createUploadedFile("otherhash", null, null, null); + } + + @Test + public void testSuccessResponse() { + JSONObject expected = JSONObject.fromObject("{\"success\":true,\"errors\":[{}]}"); + assertEquals(expected, manager.createJsonResponse(true, null)); + } + + @Test(expected = UserMustBeLoggedException.class) + public void testUserMustBeAuth() throws Exception { + manager.createUploadedFile(null, null, null, null); + } +} Copied: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileManagerTest.java (from rev 909, trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileManagerTest.java) =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileManagerTest.java 2008-10-14 13:39:30 UTC (rev 909) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileManagerTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,63 @@ +package org.ourproject.kune.platf.server.manager.file; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; + +import org.junit.Before; +import org.junit.Test; +import org.ourproject.kune.platf.server.TestHelper; +import org.ourproject.kune.platf.server.manager.FileManager; +import org.ourproject.kune.platf.server.manager.file.FileUtils; + +import com.google.inject.Inject; + +public class FileManagerTest { + + @Inject + FileManager fileManager; + private String tempDir; + + @Before + public void inject() throws IOException { + TestHelper.inject(this); + tempDir = File.createTempFile("temp", "txt").getParent(); + } + + @Test + public void test3FileCreationWithSeq() throws IOException { + final File tempFile = File.createTempFile("some file name", ".txt"); + final File newFile1 = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); + final File newFile2 = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); + final File newFile3 = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); + assertEquals(tempDir + File.separator + seq(seq(seq(tempFile.getName()))), newFile3.getAbsolutePath()); + newFile1.delete(); + newFile2.delete(); + newFile3.delete(); + } + + @Test + public void testDirCreation() throws IOException { + final String newTestDir = tempDir + File.separator + "test1" + File.separator + "test2" + File.separator; + assertTrue(fileManager.mkdir(newTestDir)); + final File dir = new File(newTestDir); + assertTrue(dir.exists()); + fileManager.rmdir(newTestDir); + assertFalse(dir.exists()); + } + + @Test + public void testFileCreationWithSeq() throws IOException { + final File tempFile = File.createTempFile("some file name", ".txt"); + final File newFile = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); + assertEquals(tempDir + File.separator + seq(tempFile.getName()), newFile.getAbsolutePath()); + newFile.delete(); + } + + private String seq(final String file) { + return FileUtils.getNextSequentialFileName(file, true); + } +} Property changes on: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileManagerTest.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerTest.java (from rev 909, trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManagerTest.java) =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManagerTest.java 2008-10-14 13:39:30 UTC (rev 909) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,31 @@ +package org.ourproject.kune.platf.server.manager.file; + +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 com.google.inject.Inject; + +public class FileUploadManagerTest extends ContentServiceIntegrationTest { + + @Inject + FileUploadManager fileUploadManager; + + @Before + public void create() { + new IntegrationTestHelper(this); + } + + @Test(expected = SessionExpiredException.class) + public void testSessionExp() throws Exception { + fileUploadManager.createUploadedFile("otherhash", null, null, null); + } + + @Test(expected = UserMustBeLoggedException.class) + public void testUserMustBeAuth() throws Exception { + fileUploadManager.createUploadedFile(null, null, null, null); + } +} Property changes on: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerTest.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUtilsTest.java (from rev 911, trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUtilsTest.java) =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUtilsTest.java 2008-10-15 14:12:54 UTC (rev 911) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUtilsTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,109 @@ +package org.ourproject.kune.platf.server.manager.file; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.ourproject.kune.platf.server.manager.file.FileUtils; + +public class FileUtilsTest { + + private static final String SIMPLE_FILE_NAME = "simple file name"; + private static final String EXT = ".someext"; + + @Test + public void dotFileRetSeq1() { + assertEquals("." + SIMPLE_FILE_NAME + " 1", FileUtils.getNextSequentialFileName("." + SIMPLE_FILE_NAME, true)); + } + + @Test + public void dotFileRetSeq1IgnoreExt() { + assertEquals("." + SIMPLE_FILE_NAME + " 1", FileUtils.getNextSequentialFileName("." + SIMPLE_FILE_NAME, false)); + } + + @Test + public void getExtensionBasic() { + assertEquals("someext", FileUtils.getFileNameExtension("file.name.with.someext", false)); + } + + @Test + public void getExtensionWithDot() { + assertEquals("", FileUtils.getFileNameExtension("file name with no ext.", false)); + } + + @Test + public void getExtensionWithDotBasic() { + assertEquals(".someext", FileUtils.getFileNameExtension("file.name.with.someext", true)); + } + + @Test + public void getExtensionWithDotWithFinalDot() { + assertEquals("", FileUtils.getFileNameExtension("file name with no ext.", true)); + } + + @Test + public void getExtensionWithDotWithInitialDot() { + assertEquals("", FileUtils.getFileNameExtension(".file name with no ext", true)); + } + + @Test + public void getExtensionWithInitialDot() { + assertEquals("", FileUtils.getFileNameExtension(".file name with no ext", false)); + } + + @Test + public void testFileNameWExtensionSimple() { + assertEquals("test", FileUtils.getFileNameWithoutExtension("test.txt", "txt")); + } + + @Test + public void testFileNameWExtensionSimpleWithDot() { + assertEquals("test", FileUtils.getFileNameWithoutExtension("test.txt", ".txt")); + } + + @Test + public void testFileNameWithoutExtension() { + assertEquals("test", FileUtils.getFileNameWithoutExtension("test", "")); + } + + @Test + public void testFileNameWNoExtensionWithDot() { + assertEquals("test.", FileUtils.getFileNameWithoutExtension("test.", "")); + } + + @Test + public void testGetFilenameExtNull() { + assertEquals("", FileUtils.getFileNameExtension(null, true)); + } + + @Test + public void testIfSeq101return102() { + assertEquals(SIMPLE_FILE_NAME + " 102", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + " 101")); + } + + @Test + public void testIfSeq1return2() { + assertEquals(SIMPLE_FILE_NAME + " 2", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + " 1")); + } + + @Test + public void testIfSeq1WithExtreturn2WithExt() { + assertEquals(SIMPLE_FILE_NAME + " 2" + EXT, FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + " 1" + EXT, + true)); + } + + @Test + public void testNoSeqReturn1() { + assertEquals(SIMPLE_FILE_NAME + " 1", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME)); + } + + @Test + public void testNoSeqWithExtNotTakedIntoAccountReturn1() { + assertEquals(SIMPLE_FILE_NAME + EXT + " 1", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + EXT, false)); + } + + @Test + public void testNoSeqWithExtReturn1WithExt() { + assertEquals(SIMPLE_FILE_NAME + " 1" + EXT, FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + EXT, true)); + } + +} Property changes on: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUtilsTest.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/ImageUtilsDefaultTest.java (from rev 910, trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java) =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/ImageUtilsDefaultTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -0,0 +1,176 @@ +package org.ourproject.kune.platf.server.manager.file; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.awt.Dimension; +import java.io.File; + +import magick.MagickException; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * If you get a UnsatisfiedLinkError this is a problem with jmagick installation + * (in debian, apt-get install libjmagick6-jni, and add + * LD_LIBRARY_PATH=/usr/lib/jni/ to this test environment params or sudo ln -s + * /usr/lib/jni/libJMagick.so /usr/lib/libJMagick.so) + * + * See the output of: + * System.out.println(System.getProperty("java.library.path")); to see when is + * expecting the .so/.dll + */ +public class ImageUtilsDefaultTest { + + private static final String IMG_PATH = "src/test/java/org/ourproject/kune/platf/server/manager/file/"; + private static String[] images = { "orig.png", "orig.gif", "orig.jpg", "orig.tiff" }; + private static String imageDest; + + @AfterClass + public static void after() { + File file = new File(imageDest); + file.delete(); + } + + @BeforeClass + public static void before() { + imageDest = IMG_PATH + "output"; + } + + @Test + public void generateIcon() throws MagickException { + for (String image : images) { + ImageUtilsDefault.createThumb(IMG_PATH + image, imageDest, 16, 16); + Dimension dimension = ImageUtilsDefault.getDimension(imageDest); + assertEquals(16, (int) dimension.getHeight()); + assertEquals(16, (int) dimension.getWidth()); + } + } + + @Test + public void generateThumb() throws MagickException { + for (String image : images) { + ImageUtilsDefault.createThumb(IMG_PATH + image, imageDest, 100, 85); + Dimension dimension = ImageUtilsDefault.getDimension(imageDest); + assertEquals(85, (int) dimension.getHeight()); + assertEquals(85, (int) dimension.getWidth()); + } + } + + @Test + public void testProportionalHigher() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(500, 1000, 100); + assertEquals(100, proportionalDim.width); + assertEquals(200, proportionalDim.height); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(50, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testProportionalHigherLikeSamples() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(1200, 1600, 100); + assertEquals(100, proportionalDim.width); + assertEquals(133, proportionalDim.height); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(16, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testProportionalHigherSame() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(20, 100, 100); + assertEquals(20, proportionalDim.width); + assertEquals(100, proportionalDim.height); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testProportionalHigherSmaller() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(20, 10, 100); + assertEquals(20, proportionalDim.width); + assertEquals(10, proportionalDim.height); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testProportionalToBiggerNormal() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 300, false); + assertEquals(300, proportionalDim.width); + assertEquals(150, proportionalDim.height); + } + + @Test + public void testProportionalToBiggerSame() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 600, false); + assertEquals(600, proportionalDim.width); + assertEquals(300, proportionalDim.height); + } + + @Test + public void testProportionalToBiggerSmaller() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 700, false); + assertEquals(600, proportionalDim.width); + assertEquals(300, proportionalDim.height); + } + + @Test + public void testProportionalToBiggerWider() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(300, 600, 200, false); + assertEquals(100, proportionalDim.width); + assertEquals(200, proportionalDim.height); + } + + @Test + public void testProportionalWider() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(1000, 500, 100); + assertEquals(200, proportionalDim.width); + assertEquals(100, proportionalDim.height); + assertEquals(50, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testProportionalWiderSame() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(100, 20, 100); + assertEquals(100, proportionalDim.width); + assertEquals(20, proportionalDim.height); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testProportionalWiderSmaller() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(5, 10, 100); + assertEquals(5, proportionalDim.width); + assertEquals(10, proportionalDim.height); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testResize() throws MagickException { + for (String image : images) { + assertTrue(ImageUtilsDefault.scaleImage(IMG_PATH + image, imageDest, 100, 100)); + Dimension dimension = ImageUtilsDefault.getDimension(imageDest); + assertEquals(100, (int) dimension.getHeight()); + assertEquals(100, (int) dimension.getWidth()); + } + } + + @Test + public void testSize() throws MagickException { + for (String image : images) { + Dimension dimension = ImageUtilsDefault.getDimension(IMG_PATH + image); + assertEquals(400, (int) dimension.getHeight()); + assertEquals(300, (int) dimension.getWidth()); + } + } + + @Test(expected = IndexOutOfBoundsException.class) + public void thumbSmallerThanCropMustFail() throws MagickException { + ImageUtilsDefault.createThumb(IMG_PATH + images[0], imageDest, 100, 200); + } +} Property changes on: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/ImageUtilsDefaultTest.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/orig.gif (from rev 909, trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.gif) Property changes on: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/orig.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Name: svn:mergeinfo + Copied: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/orig.jpg (from rev 909, trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.jpg) Property changes on: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/orig.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Name: svn:mergeinfo + Copied: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/orig.png (from rev 909, trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.png) Property changes on: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/orig.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Name: svn:mergeinfo + Copied: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/orig.tiff (from rev 909, trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.tiff) Property changes on: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/orig.tiff ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Name: svn:mergeinfo + Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileManagerTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileManagerTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,62 +0,0 @@ -package org.ourproject.kune.platf.server.manager.impl; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; - -import org.junit.Before; -import org.junit.Test; -import org.ourproject.kune.platf.server.TestHelper; -import org.ourproject.kune.platf.server.manager.FileManager; - -import com.google.inject.Inject; - -public class FileManagerTest { - - @Inject - FileManager fileManager; - private String tempDir; - - @Before - public void inject() throws IOException { - TestHelper.inject(this); - tempDir = File.createTempFile("temp", "txt").getParent(); - } - - @Test - public void test3FileCreationWithSeq() throws IOException { - final File tempFile = File.createTempFile("some file name", ".txt"); - final File newFile1 = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); - final File newFile2 = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); - final File newFile3 = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); - assertEquals(tempDir + File.separator + seq(seq(seq(tempFile.getName()))), newFile3.getAbsolutePath()); - newFile1.delete(); - newFile2.delete(); - newFile3.delete(); - } - - @Test - public void testDirCreation() throws IOException { - final String newTestDir = tempDir + File.separator + "test1" + File.separator + "test2" + File.separator; - assertTrue(fileManager.mkdir(newTestDir)); - final File dir = new File(newTestDir); - assertTrue(dir.exists()); - fileManager.rmdir(newTestDir); - assertFalse(dir.exists()); - } - - @Test - public void testFileCreationWithSeq() throws IOException { - final File tempFile = File.createTempFile("some file name", ".txt"); - final File newFile = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); - assertEquals(tempDir + File.separator + seq(tempFile.getName()), newFile.getAbsolutePath()); - newFile.delete(); - } - - private String seq(final String file) { - return FileUtils.getNextSequentialFileName(file, true); - } -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManagerTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManagerTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,43 +0,0 @@ -package org.ourproject.kune.platf.server.manager.impl; - -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 com.google.inject.Inject; - -public class FileUploadManagerTest extends ContentServiceIntegrationTest { - - @Inject - FileUploadManager fileUploadManager; - - @Before - public void create() { - new IntegrationTestHelper(this); - } - - // @Test - public void testMimeTypePersist() throws Exception { - // doLogin(); - // final FileItem fileItem = Mockito.mock(FileItem.class); - // file = File.createTempFile("test", ".txt"); - // final Content cnt = fileUploadManager.createFile(super.getHash(), - // getDefaultContent().getContainer() - // .getStateToken(), "somefilename", fileItem); - // final StateDTO state = contentService.getContent(getHash(), - // cnt.getStateToken()); - } - - @Test(expected = SessionExpiredException.class) - public void testSessionExp() throws Exception { - fileUploadManager.createUploadedFile("otherhash", null, null, null); - } - - @Test(expected = UserMustBeLoggedException.class) - public void testUserMustBeAuth() throws Exception { - fileUploadManager.createUploadedFile(null, null, null, null); - } -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUtilsTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUtilsTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUtilsTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,108 +0,0 @@ -package org.ourproject.kune.platf.server.manager.impl; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class FileUtilsTest { - - private static final String SIMPLE_FILE_NAME = "simple file name"; - private static final String EXT = ".someext"; - - @Test - public void dotFileRetSeq1() { - assertEquals("." + SIMPLE_FILE_NAME + " 1", FileUtils.getNextSequentialFileName("." + SIMPLE_FILE_NAME, true)); - } - - @Test - public void dotFileRetSeq1IgnoreExt() { - assertEquals("." + SIMPLE_FILE_NAME + " 1", FileUtils.getNextSequentialFileName("." + SIMPLE_FILE_NAME, false)); - } - - @Test - public void getExtensionBasic() { - assertEquals("someext", FileUtils.getFileNameExtension("file.name.with.someext", false)); - } - - @Test - public void getExtensionWithDot() { - assertEquals("", FileUtils.getFileNameExtension("file name with no ext.", false)); - } - - @Test - public void getExtensionWithDotBasic() { - assertEquals(".someext", FileUtils.getFileNameExtension("file.name.with.someext", true)); - } - - @Test - public void getExtensionWithDotWithFinalDot() { - assertEquals("", FileUtils.getFileNameExtension("file name with no ext.", true)); - } - - @Test - public void getExtensionWithDotWithInitialDot() { - assertEquals("", FileUtils.getFileNameExtension(".file name with no ext", true)); - } - - @Test - public void getExtensionWithInitialDot() { - assertEquals("", FileUtils.getFileNameExtension(".file name with no ext", false)); - } - - @Test - public void testFileNameWExtensionSimple() { - assertEquals("test", FileUtils.getFileNameWithoutExtension("test.txt", "txt")); - } - - @Test - public void testFileNameWExtensionSimpleWithDot() { - assertEquals("test", FileUtils.getFileNameWithoutExtension("test.txt", ".txt")); - } - - @Test - public void testFileNameWithoutExtension() { - assertEquals("test", FileUtils.getFileNameWithoutExtension("test", "")); - } - - @Test - public void testFileNameWNoExtensionWithDot() { - assertEquals("test.", FileUtils.getFileNameWithoutExtension("test.", "")); - } - - @Test - public void testGetFilenameExtNull() { - assertEquals("", FileUtils.getFileNameExtension(null, true)); - } - - @Test - public void testIfSeq101return102() { - assertEquals(SIMPLE_FILE_NAME + " 102", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + " 101")); - } - - @Test - public void testIfSeq1return2() { - assertEquals(SIMPLE_FILE_NAME + " 2", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + " 1")); - } - - @Test - public void testIfSeq1WithExtreturn2WithExt() { - assertEquals(SIMPLE_FILE_NAME + " 2" + EXT, FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + " 1" + EXT, - true)); - } - - @Test - public void testNoSeqReturn1() { - assertEquals(SIMPLE_FILE_NAME + " 1", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME)); - } - - @Test - public void testNoSeqWithExtNotTakedIntoAccountReturn1() { - assertEquals(SIMPLE_FILE_NAME + EXT + " 1", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + EXT, false)); - } - - @Test - public void testNoSeqWithExtReturn1WithExt() { - assertEquals(SIMPLE_FILE_NAME + " 1" + EXT, FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + EXT, true)); - } - -} Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -1,176 +0,0 @@ -package org.ourproject.kune.platf.server.manager.impl; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.awt.Dimension; -import java.io.File; - -import magick.MagickException; - -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * If you get a UnsatisfiedLinkError this is a problem with jmagick installation - * (in debian, apt-get install libjmagick6-jni, and add - * LD_LIBRARY_PATH=/usr/lib/jni/ to this test environment params or sudo ln -s - * /usr/lib/jni/libJMagick.so /usr/lib/libJMagick.so) - * - * See the output of: - * System.out.println(System.getProperty("java.library.path")); to see when is - * expecting the .so/.dll - */ -public class ImageUtilsDefaultTest { - - private static final String IMG_PATH = "src/test/java/org/ourproject/kune/platf/server/manager/impl/"; - private static String[] images = { "orig.png", "orig.gif", "orig.jpg", "orig.tiff" }; - private static String imageDest; - - @AfterClass - public static void after() { - File file = new File(imageDest); - file.delete(); - } - - @BeforeClass - public static void before() { - imageDest = IMG_PATH + "output"; - } - - @Test - public void generateIcon() throws MagickException { - for (String image : images) { - ImageUtilsDefault.createThumb(IMG_PATH + image, imageDest, 16, 16); - Dimension dimension = ImageUtilsDefault.getDimension(imageDest); - assertEquals(16, (int) dimension.getHeight()); - assertEquals(16, (int) dimension.getWidth()); - } - } - - @Test - public void generateThumb() throws MagickException { - for (String image : images) { - ImageUtilsDefault.createThumb(IMG_PATH + image, imageDest, 100, 85); - Dimension dimension = ImageUtilsDefault.getDimension(imageDest); - assertEquals(85, (int) dimension.getHeight()); - assertEquals(85, (int) dimension.getWidth()); - } - } - - @Test - public void testProportionalHigher() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(500, 1000, 100); - assertEquals(100, proportionalDim.width); - assertEquals(200, proportionalDim.height); - assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); - assertEquals(50, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); - } - - @Test - public void testProportionalHigherLikeSamples() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(1200, 1600, 100); - assertEquals(100, proportionalDim.width); - assertEquals(133, proportionalDim.height); - assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); - assertEquals(16, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); - } - - @Test - public void testProportionalHigherSame() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(20, 100, 100); - assertEquals(20, proportionalDim.width); - assertEquals(100, proportionalDim.height); - assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); - assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); - } - - @Test - public void testProportionalHigherSmaller() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(20, 10, 100); - assertEquals(20, proportionalDim.width); - assertEquals(10, proportionalDim.height); - assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); - assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); - } - - @Test - public void testProportionalToBiggerNormal() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 300, false); - assertEquals(300, proportionalDim.width); - assertEquals(150, proportionalDim.height); - } - - @Test - public void testProportionalToBiggerSame() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 600, false); - assertEquals(600, proportionalDim.width); - assertEquals(300, proportionalDim.height); - } - - @Test - public void testProportionalToBiggerSmaller() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 700, false); - assertEquals(600, proportionalDim.width); - assertEquals(300, proportionalDim.height); - } - - @Test - public void testProportionalToBiggerWider() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(300, 600, 200, false); - assertEquals(100, proportionalDim.width); - assertEquals(200, proportionalDim.height); - } - - @Test - public void testProportionalWider() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(1000, 500, 100); - assertEquals(200, proportionalDim.width); - assertEquals(100, proportionalDim.height); - assertEquals(50, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); - assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); - } - - @Test - public void testProportionalWiderSame() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(100, 20, 100); - assertEquals(100, proportionalDim.width); - assertEquals(20, proportionalDim.height); - assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); - assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); - } - - @Test - public void testProportionalWiderSmaller() { - Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(5, 10, 100); - assertEquals(5, proportionalDim.width); - assertEquals(10, proportionalDim.height); - assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); - assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); - } - - @Test - public void testResize() throws MagickException { - for (String image : images) { - assertTrue(ImageUtilsDefault.scaleImage(IMG_PATH + image, imageDest, 100, 100)); - Dimension dimension = ImageUtilsDefault.getDimension(imageDest); - assertEquals(100, (int) dimension.getHeight()); - assertEquals(100, (int) dimension.getWidth()); - } - } - - @Test - public void testSize() throws MagickException { - for (String image : images) { - Dimension dimension = ImageUtilsDefault.getDimension(IMG_PATH + image); - assertEquals(400, (int) dimension.getHeight()); - assertEquals(300, (int) dimension.getWidth()); - } - } - - @Test(expected = IndexOutOfBoundsException.class) - public void thumbSmallerThanCropMustFail() throws MagickException { - ImageUtilsDefault.createThumb(IMG_PATH + images[0], imageDest, 100, 200); - } -} 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -35,329 +35,329 @@ @Test public void acceptJoinGroup() throws Exception { - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.acceptJoinGroup(admin, userGroup, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.acceptJoinGroup(admin, userGroup, group); - assertFalse(group.getSocialNetwork().getPendingCollaborators().getList().contains(userGroup)); - assertTrue(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); - assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getList().size(), 1); - assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getMode(), GroupListMode.NORMAL); - assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); - closeTransaction(); + assertFalse(group.getSocialNetwork().getPendingCollaborators().getList().contains(userGroup)); + assertTrue(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); + assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getList().size(), 1); + assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getMode(), GroupListMode.NORMAL); + assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); + closeTransaction(); } @Test(expected = Exception.class) public void acceptJoinNotPendingGroupFails() throws Exception { - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.acceptJoinGroup(admin, userGroup, group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.acceptJoinGroup(admin, userGroup, group); } @Test(expected = AlreadyGroupMemberException.class) public void addAdminAsAdminFails() throws Exception { - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.addGroupToAdmins(admin, admin.getUserGroup(), group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.addGroupToAdmins(admin, admin.getUserGroup(), group); } @Test(expected = AlreadyGroupMemberException.class) public void addAdminAsCollabFails() throws Exception { - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.addGroupToCollabs(admin, admin.getUserGroup(), group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.addGroupToCollabs(admin, admin.getUserGroup(), group); } @Test(expected = AlreadyGroupMemberException.class) public void addAdminAsViewerFails() throws Exception { - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.addGroupToViewers(admin, admin.getUserGroup(), group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.addGroupToViewers(admin, admin.getUserGroup(), group); } @Test(expected = Exception.class) public void addAdminNotAdminFails() throws Exception { - socialNetworkManager.addGroupToAdmins(otherUser, userGroup, group); + socialNetworkManager.addGroupToAdmins(otherUser, userGroup, group); } @Test(expected = Exception.class) public void addCollabNotAdminFails() throws Exception { - socialNetworkManager.addGroupToCollabs(otherUser, userGroup, group); + socialNetworkManager.addGroupToCollabs(otherUser, userGroup, group); } @Test public void addPendingAsCollabDirectly() throws Exception { - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.addGroupToCollabs(admin, userGroup, group); - assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); - closeTransaction(); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.addGroupToCollabs(admin, userGroup, group); + assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); + closeTransaction(); } @Test public void addPendingAsCollabDirectlyAsAdmin() throws Exception { - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.addGroupToAdmins(admin, userGroup, group); - assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); - closeTransaction(); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.addGroupToAdmins(admin, userGroup, group); + assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); + closeTransaction(); } @Test(expected = Exception.class) public void addViewerNotAdminFails() throws Exception { - socialNetworkManager.addGroupToViewers(otherUser, userGroup, group); + socialNetworkManager.addGroupToViewers(otherUser, userGroup, group); } @After public void close() { - if (getTransaction().isActive()) { - rollbackTransaction(); - } + if (getTransaction().isActive()) { + rollbackTransaction(); + } } @Test public void deleteMember() throws Exception { - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.acceptJoinGroup(admin, userGroup, group); - assertTrue(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); - socialNetworkManager.deleteMember(admin, userGroup, group); - assertFalse(group.getSocialNetwork().getPendingCollaborators().getList().contains(userGroup)); - assertFalse(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); - assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getMode(), GroupListMode.NOBODY); - assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getList().size(), 0); - assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); - closeTransaction(); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.acceptJoinGroup(admin, userGroup, group); + assertTrue(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); + socialNetworkManager.deleteMember(admin, userGroup, group); + assertFalse(group.getSocialNetwork().getPendingCollaborators().getList().contains(userGroup)); + assertFalse(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); + assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getMode(), GroupListMode.NOBODY); + assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getList().size(), 0); + assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); + closeTransaction(); } @Test(expected = Exception.class) public void deleteNotMemberFails() throws Exception { - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.deleteMember(admin, userGroup, group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.deleteMember(admin, userGroup, group); } @Test public void denyJoinGroup() throws Exception { - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.denyJoinGroup(admin, userGroup, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.denyJoinGroup(admin, userGroup, group); - assertFalse(group.getSocialNetwork().getPendingCollaborators().getList().contains(userGroup)); - assertFalse(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); - assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getList().size(), 0); - assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); - closeTransaction(); + assertFalse(group.getSocialNetwork().getPendingCollaborators().getList().contains(userGroup)); + assertFalse(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); + assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getList().size(), 0); + assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); + closeTransaction(); } @Test(expected = AccessViolationException.class) public void denyJoinGroupNotAdminFails() throws Exception { - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.denyJoinGroup(otherUser, userGroup, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.denyJoinGroup(otherUser, userGroup, group); } @Test(expected = Exception.class) public void denyNotPendingFails() throws Exception { - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.denyJoinGroup(admin, userGroup, group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.denyJoinGroup(admin, userGroup, group); } @Test(expected = RuntimeException.class) public void ilegalAdmissionType() throws Exception { - group.setAdmissionType(null); - socialNetworkManager.requestToJoin(user, group); + group.setAdmissionType(null); + socialNetworkManager.requestToJoin(user, group); } @Before public void init() { - openTransaction(); - ctx = new DomainContext(); - ctx.createUsers("user1"); - ctx.createUsers("admin"); - ctx.createUsers("otheruser"); - ctx.createGroups("group1"); - ctx.createOrphanGroup("grouporph"); - user = ctx.getUser("user1"); - group = ctx.getGroup("group1"); - orphanedGroup = ctx.getGroup("grouporph"); - userGroup = user.getUserGroup(); - admin = ctx.getUser("admin"); - otherUser = ctx.getUser("otheruser"); - assertSocialNetworkIsEmpty(); + openTransaction(); + ctx = new DomainContext(); + ctx.createUsers("user1"); + ctx.createUsers("admin"); + ctx.createUsers("otheruser"); + ctx.createGroups("group1"); + ctx.createOrphanGroup("grouporph"); + user = ctx.getUser("user1"); + group = ctx.getGroup("group1"); + orphanedGroup = ctx.getGroup("grouporph"); + userGroup = user.getUserGroup(); + admin = ctx.getUser("admin"); + otherUser = ctx.getUser("otheruser"); + assertSocialNetworkIsEmpty(); } @Test(expected = LastAdminInGroupException.class) public void lastAdminUnjoinGroupWithCollabsFails() throws Exception { - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.acceptJoinGroup(admin, userGroup, group); - socialNetworkManager.unJoinGroup(admin.getUserGroup(), group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.acceptJoinGroup(admin, userGroup, group); + socialNetworkManager.unJoinGroup(admin.getUserGroup(), group); } @Test public void lastAdminUnjoinGroupWithoutCollabsOrphaned() throws Exception { - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.unJoinGroup(admin.getUserGroup(), group); - assertEquals(GroupType.ORPHANED_PROJECT, group.getType()); - assertEquals(0, group.getSocialNetwork().getAccessLists().getAdmins().getList().size()); - assertEquals(0, group.getSocialNetwork().getAccessLists().getEditors().getList().size()); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.unJoinGroup(admin.getUserGroup(), group); + assertEquals(GroupType.ORPHANED_PROJECT, group.getGroupType()); + assertEquals(0, group.getSocialNetwork().getAccessLists().getAdmins().getList().size()); + assertEquals(0, group.getSocialNetwork().getAccessLists().getEditors().getList().size()); } @Test(expected = AccessViolationException.class) public void notAdminTryDeleteMember() throws Exception { - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.acceptJoinGroup(admin, userGroup, group); - socialNetworkManager.deleteMember(otherUser, userGroup, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.acceptJoinGroup(admin, userGroup, group); + socialNetworkManager.deleteMember(otherUser, userGroup, group); } @Test public void participationDontShowSelfGroup() { - group.getSocialNetwork().getAccessLists().getViewers().setMode(GroupListMode.EVERYONE); - user.getUserGroup().getSocialNetwork().getAccessLists().getViewers().setMode(GroupListMode.EVERYONE); - assertEquals(GroupListMode.EVERYONE, group.getSocialNetwork().getAccessLists().getViewers().getMode()); - ParticipationData part = socialNetworkManager.findParticipation(User.UNKNOWN_USER, group); - assertFalse(part.getGroupsIsAdmin().contains(group)); - assertFalse(part.getGroupsIsCollab().contains(group)); + group.getSocialNetwork().getAccessLists().getViewers().setMode(GroupListMode.EVERYONE); + user.getUserGroup().getSocialNetwork().getAccessLists().getViewers().setMode(GroupListMode.EVERYONE); + assertEquals(GroupListMode.EVERYONE, group.getSocialNetwork().getAccessLists().getViewers().getMode()); + ParticipationData part = socialNetworkManager.findParticipation(User.UNKNOWN_USER, group); + assertFalse(part.getGroupsIsAdmin().contains(group)); + assertFalse(part.getGroupsIsCollab().contains(group)); - socialNetworkManager.addAdmin(admin, group); - part = socialNetworkManager.findParticipation(admin, group); - assertFalse(part.getGroupsIsAdmin().contains(group)); - assertFalse(part.getGroupsIsCollab().contains(group)); + socialNetworkManager.addAdmin(admin, group); + part = socialNetworkManager.findParticipation(admin, group); + assertFalse(part.getGroupsIsAdmin().contains(group)); + assertFalse(part.getGroupsIsCollab().contains(group)); - socialNetworkManager.addAdmin(user, user.getUserGroup()); - part = socialNetworkManager.findParticipation(User.UNKNOWN_USER, user.getUserGroup()); - assertFalse(part.getGroupsIsAdmin().contains(user.getUserGroup())); - assertFalse(part.getGroupsIsCollab().contains(user.getUserGroup())); + socialNetworkManager.addAdmin(user, user.getUserGroup()); + part = socialNetworkManager.findParticipation(User.UNKNOWN_USER, user.getUserGroup()); + assertFalse(part.getGroupsIsAdmin().contains(user.getUserGroup())); + assertFalse(part.getGroupsIsCollab().contains(user.getUserGroup())); } @Test public void requestJoinAClosedGroupDeny() throws Exception { - group.setAdmissionType(AdmissionType.Closed); + group.setAdmissionType(AdmissionType.Closed); - final SocialNetworkRequestResult result = socialNetworkManager.requestToJoin(user, group); - assertEquals(result, SocialNetworkRequestResult.denied); - closeTransaction(); + final SocialNetworkRequestResult result = socialNetworkManager.requestToJoin(user, group); + assertEquals(result, SocialNetworkRequestResult.denied); + closeTransaction(); } @Test public void requestJoinAModeratedGroupAddUserGroupToPending() throws Exception { - group.setAdmissionType(AdmissionType.Moderated); + group.setAdmissionType(AdmissionType.Moderated); - final SocialNetworkRequestResult result = socialNetworkManager.requestToJoin(user, group); - assertEquals(result, SocialNetworkRequestResult.moderated); - assertTrue(group.getSocialNetwork().getPendingCollaborators().getList().contains(userGroup)); - closeTransaction(); + final SocialNetworkRequestResult result = socialNetworkManager.requestToJoin(user, group); + assertEquals(result, SocialNetworkRequestResult.moderated); + assertTrue(group.getSocialNetwork().getPendingCollaborators().getList().contains(userGroup)); + closeTransaction(); } @Test public void requestJoinAOpenGroupAddUserGroupToEditors() throws Exception { - group.setAdmissionType(AdmissionType.Open); + group.setAdmissionType(AdmissionType.Open); - final SocialNetworkRequestResult result = socialNetworkManager.requestToJoin(user, group); - assertEquals(result, SocialNetworkRequestResult.accepted); - assertTrue(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); - assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getMode(), GroupListMode.NORMAL); - closeTransaction(); + final SocialNetworkRequestResult result = socialNetworkManager.requestToJoin(user, group); + assertEquals(result, SocialNetworkRequestResult.accepted); + assertTrue(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); + assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getMode(), GroupListMode.NORMAL); + closeTransaction(); } @Test public void requestJoinAOrphanedGroupAddUserGroupToAdmins() throws Exception { - orphanedGroup.setAdmissionType(AdmissionType.Open); + orphanedGroup.setAdmissionType(AdmissionType.Open); - final SocialNetworkRequestResult result = socialNetworkManager.requestToJoin(user, orphanedGroup); - assertEquals(result, SocialNetworkRequestResult.accepted); - assertTrue(orphanedGroup.getSocialNetwork().getAccessLists().getAdmins().getList().contains(userGroup)); - assertEquals(orphanedGroup.getSocialNetwork().getAccessLists().getAdmins().getMode(), GroupListMode.NORMAL); + final SocialNetworkRequestResult result = socialNetworkManager.requestToJoin(user, orphanedGroup); + assertEquals(result, SocialNetworkRequestResult.accepted); + assertTrue(orphanedGroup.getSocialNetwork().getAccessLists().getAdmins().getList().contains(userGroup)); + assertEquals(orphanedGroup.getSocialNetwork().getAccessLists().getAdmins().getMode(), GroupListMode.NORMAL); - // FIXME Check change group type to PROJECT - closeTransaction(); + // FIXME Check change group type to PROJECT + closeTransaction(); } @Test(expected = AlreadyGroupMemberException.class) public void requestJoinTwiceAOrphanedGroupAddUserGroupToAdmins() throws Exception { - orphanedGroup.setAdmissionType(AdmissionType.Open); + orphanedGroup.setAdmissionType(AdmissionType.Open); - final SocialNetworkRequestResult result = socialNetworkManager.requestToJoin(user, orphanedGroup); - assertEquals(SocialNetworkRequestResult.accepted, result); - socialNetworkManager.requestToJoin(user, orphanedGroup); + final SocialNetworkRequestResult result = socialNetworkManager.requestToJoin(user, orphanedGroup); + assertEquals(SocialNetworkRequestResult.accepted, result); + socialNetworkManager.requestToJoin(user, orphanedGroup); } @Test public void requestToJoinTwiceDontDuplicatePending() throws Exception { - group.setAdmissionType(AdmissionType.Moderated); + group.setAdmissionType(AdmissionType.Moderated); - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.requestToJoin(user, group); - assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 1); - closeTransaction(); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.requestToJoin(user, group); + assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 1); + closeTransaction(); } @Test(expected = Exception.class) public void setAdminAnonMemberFails() throws Exception { - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.setAdminAsCollab(admin, userGroup, group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.setAdminAsCollab(admin, userGroup, group); } @Test public void setAdminAsCollab() throws Exception { - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.acceptJoinGroup(admin, userGroup, group); - socialNetworkManager.setCollabAsAdmin(admin, userGroup, group); - socialNetworkManager.setAdminAsCollab(admin, userGroup, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.acceptJoinGroup(admin, userGroup, group); + socialNetworkManager.setCollabAsAdmin(admin, userGroup, group); + socialNetworkManager.setAdminAsCollab(admin, userGroup, group); - assertFalse(group.getSocialNetwork().getPendingCollaborators().getList().contains(userGroup)); - assertTrue(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); - assertFalse(group.getSocialNetwork().getAccessLists().getAdmins().getList().contains(userGroup)); - assertEquals(group.getSocialNetwork().getAccessLists().getAdmins().getList().size(), 1); - assertEquals(group.getSocialNetwork().getAccessLists().getAdmins().getMode(), GroupListMode.NORMAL); - assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getList().size(), 1); - assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getMode(), GroupListMode.NORMAL); - assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); - closeTransaction(); + assertFalse(group.getSocialNetwork().getPendingCollaborators().getList().contains(userGroup)); + assertTrue(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); + assertFalse(group.getSocialNetwork().getAccessLists().getAdmins().getList().contains(userGroup)); + assertEquals(group.getSocialNetwork().getAccessLists().getAdmins().getList().size(), 1); + assertEquals(group.getSocialNetwork().getAccessLists().getAdmins().getMode(), GroupListMode.NORMAL); + assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getList().size(), 1); + assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getMode(), GroupListMode.NORMAL); + assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); + closeTransaction(); } @Test(expected = AccessViolationException.class) public void setAdminAsCollabNotAdminFails() throws Exception { - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.acceptJoinGroup(admin, userGroup, group); - socialNetworkManager.setCollabAsAdmin(otherUser, userGroup, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.acceptJoinGroup(admin, userGroup, group); + socialNetworkManager.setCollabAsAdmin(otherUser, userGroup, group); } @Test(expected = Exception.class) public void setAdminNotCollabFails() throws Exception { - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.setCollabAsAdmin(admin, userGroup, group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.setCollabAsAdmin(admin, userGroup, group); } @Test public void setCollabAsAdmin() throws Exception { - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.acceptJoinGroup(admin, userGroup, group); - socialNetworkManager.setCollabAsAdmin(admin, userGroup, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.acceptJoinGroup(admin, userGroup, group); + socialNetworkManager.setCollabAsAdmin(admin, userGroup, group); - assertFalse(group.getSocialNetwork().getPendingCollaborators().getList().contains(userGroup)); - assertFalse(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); - assertTrue(group.getSocialNetwork().getAccessLists().getAdmins().getList().contains(userGroup)); - assertEquals(group.getSocialNetwork().getAccessLists().getAdmins().getList().size(), 2); - assertEquals(group.getSocialNetwork().getAccessLists().getAdmins().getMode(), GroupListMode.NORMAL); - assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getList().size(), 0); - assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getMode(), GroupListMode.NOBODY); - assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); - closeTransaction(); + assertFalse(group.getSocialNetwork().getPendingCollaborators().getList().contains(userGroup)); + assertFalse(group.getSocialNetwork().getAccessLists().getEditors().getList().contains(userGroup)); + assertTrue(group.getSocialNetwork().getAccessLists().getAdmins().getList().contains(userGroup)); + assertEquals(group.getSocialNetwork().getAccessLists().getAdmins().getList().size(), 2); + assertEquals(group.getSocialNetwork().getAccessLists().getAdmins().getMode(), GroupListMode.NORMAL); + assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getList().size(), 0); + assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getMode(), GroupListMode.NOBODY); + assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); + closeTransaction(); } @Test(expected = AccessViolationException.class) public void setCollabAsAdminNotAdminFails() throws Exception { - socialNetworkManager.requestToJoin(user, group); - socialNetworkManager.addAdmin(admin, group); - socialNetworkManager.acceptJoinGroup(admin, userGroup, group); - socialNetworkManager.setCollabAsAdmin(otherUser, userGroup, group); + socialNetworkManager.requestToJoin(user, group); + socialNetworkManager.addAdmin(admin, group); + socialNetworkManager.acceptJoinGroup(admin, userGroup, group); + socialNetworkManager.setCollabAsAdmin(otherUser, userGroup, group); } private void assertSocialNetworkIsEmpty() { - assertEquals(group.getSocialNetwork().getAccessLists().getAdmins().getList().size(), 0); - assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getList().size(), 0); - assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); + assertEquals(group.getSocialNetwork().getAccessLists().getAdmins().getList().size(), 0); + assertEquals(group.getSocialNetwork().getAccessLists().getEditors().getList().size(), 0); + assertEquals(group.getSocialNetwork().getPendingCollaborators().getList().size(), 0); } } Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.gif =================================================================== (Binary files differ) Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.jpg =================================================================== (Binary files differ) Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.png =================================================================== (Binary files differ) Deleted: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.tiff =================================================================== (Binary files differ) 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -46,246 +46,259 @@ @Inject GroupManager groupManager; + @Test + public void groupHasLogo() { + Group group = new Group("test", "this is a test"); + GroupDTO groupDTO = mapper.map(group, GroupDTO.class); + assertFalse(group.hasLogo()); + assertFalse(groupDTO.hasLogo()); + group.setLogo(new byte[2]); + group.setLogoMime(new BasicMimeType("image/png")); + groupDTO = mapper.map(group, GroupDTO.class); + assertTrue(group.hasLogo()); + assertTrue(groupDTO.hasLogo()); + } + @Before public void inject() { - TestHelper.inject(this); + TestHelper.inject(this); } @Test public void testCommentMapper() { - final Content d = createDefContent(); - final Comment comment = new Comment(); - comment.setContent(d); - comment.setText("Some text"); - final User user = new User(); - comment.addPositiveVoter(user); - comment.addPositiveVoter(user); - CommentDTO commentDTO = mapper.map(comment, CommentDTO.class); - assertEquals(0, commentDTO.getNegativeVotersCount()); - assertEquals(0, commentDTO.getAbuseInformersCount()); - assertEquals(1, commentDTO.getPositiveVotersCount()); - comment.addNegativeVoter(user); - comment.addNegativeVoter(user); - commentDTO = mapper.map(comment, CommentDTO.class); - assertEquals(1, commentDTO.getNegativeVotersCount()); - assertEquals(0, commentDTO.getAbuseInformersCount()); - assertEquals(0, commentDTO.getPositiveVotersCount()); - comment.addAbuseInformer(user); - comment.addAbuseInformer(user); - commentDTO = mapper.map(comment, CommentDTO.class); - assertEquals(1, commentDTO.getNegativeVotersCount()); - assertEquals(1, commentDTO.getAbuseInformersCount()); - assertEquals(0, commentDTO.getPositiveVotersCount()); - final Comment childComment = new Comment(); - childComment.setContent(d); - childComment.setParent(comment); - comment.getChilds().add(childComment); - commentDTO = mapper.map(comment, CommentDTO.class); - final CommentDTO childCommentDTO = mapper.map(childComment, CommentDTO.class); - assertEquals(1, comment.getChilds().size()); - assertEquals(commentDTO, childCommentDTO.getParent()); + final Content d = createDefContent(); + final Comment comment = new Comment(); + comment.setContent(d); + comment.setText("Some text"); + final User user = new User(); + comment.addPositiveVoter(user); + comment.addPositiveVoter(user); + CommentDTO commentDTO = mapper.map(comment, CommentDTO.class); + assertEquals(0, commentDTO.getNegativeVotersCount()); + assertEquals(0, commentDTO.getAbuseInformersCount()); + assertEquals(1, commentDTO.getPositiveVotersCount()); + comment.addNegativeVoter(user); + comment.addNegativeVoter(user); + commentDTO = mapper.map(comment, CommentDTO.class); + assertEquals(1, commentDTO.getNegativeVotersCount()); + assertEquals(0, commentDTO.getAbuseInformersCount()); + assertEquals(0, commentDTO.getPositiveVotersCount()); + comment.addAbuseInformer(user); + comment.addAbuseInformer(user); + commentDTO = mapper.map(comment, CommentDTO.class); + assertEquals(1, commentDTO.getNegativeVotersCount()); + assertEquals(1, commentDTO.getAbuseInformersCount()); + assertEquals(0, commentDTO.getPositiveVotersCount()); + final Comment childComment = new Comment(); + childComment.setContent(d); + childComment.setParent(comment); + comment.getChilds().add(childComment); + commentDTO = mapper.map(comment, CommentDTO.class); + final CommentDTO childCommentDTO = mapper.map(childComment, CommentDTO.class); + assertEquals(1, comment.getChilds().size()); + assertEquals(commentDTO, childCommentDTO.getParent()); } @Test public void testContentDescriptorMapping() { - final Content d = createDefContent(); - final StateToken expectedToken = new StateToken(TESTGROUPSHORTNAME, TESTTOOL, "1", "1"); - assertEquals(expectedToken, d.getStateToken()); + final Content d = createDefContent(); + final StateToken expectedToken = new StateToken(TESTGROUPSHORTNAME, TESTTOOL, "1", "1"); + assertEquals(expectedToken, d.getStateToken()); - final ContentSimpleDTO dto = mapper.map(d, ContentSimpleDTO.class); - assertEquals(1, (long) dto.getId()); - assertEquals("title", dto.getTitle()); - assertEquals(expectedToken, dto.getStateToken()); + final ContentSimpleDTO dto = mapper.map(d, ContentSimpleDTO.class); + assertEquals(1, (long) dto.getId()); + assertEquals("title", dto.getTitle()); + assertEquals(expectedToken, dto.getStateToken()); } @Test public void testContentDescriptorToLinkMapping() { - final Content d = createDefContent(); + final Content d = createDefContent(); - final LinkDTO dto = mapper.map(d, LinkDTO.class); - assertEquals("title", dto.getLongName()); - assertEquals(TESTGROUPSHORTNAME, dto.getShortName()); - assertEquals("grouptest.docs.1.1", dto.getLink()); + final LinkDTO dto = mapper.map(d, LinkDTO.class); + assertEquals("title", dto.getLongName()); + assertEquals(TESTGROUPSHORTNAME, dto.getShortName()); + assertEquals("grouptest.docs.1.1", dto.getLink()); } @Test public void testContentMapping() { - final State c = new State(); - c.setContentRights(new AccessRights(true, true, true)); - final Group groupAdmins = TestDomainHelper.createGroup(1); - final Group groupEdit = TestDomainHelper.createGroup(2); - final Group groupView = TestDomainHelper.createGroup(3); - c.setAccessLists(TestDomainHelper.createAccessLists(groupAdmins, groupEdit, groupView)); - c.setRate(10.2d); - c.setRateByUsers(3l); - c.setCurrentUserRate(null); + final State c = new State(); + c.setContentRights(new AccessRights(true, true, true)); + final Group groupAdmins = TestDomainHelper.createGroup(1); + final Group groupEdit = TestDomainHelper.createGroup(2); + final Group groupView = TestDomainHelper.createGroup(3); + c.setAccessLists(TestDomainHelper.createAccessLists(groupAdmins, groupEdit, groupView)); + c.setRate(10.2D); + c.setRateByUsers(3L); + c.setCurrentUserRate(null); - final StateDTO dto = mapper.map(c, StateDTO.class); - assertEquals(c.getContentRights().isAdministrable(), dto.getContentRights().isAdministrable()); + final StateDTO dto = mapper.map(c, StateDTO.class); + assertEquals(c.getContentRights().isAdministrable(), dto.getContentRights().isAdministrable()); - assertValidAccessListsMapping(c.getAccessLists().getAdmins(), dto.getAccessLists().getAdmins()); - assertValidAccessListsMapping(c.getAccessLists().getEditors(), dto.getAccessLists().getEditors()); - assertValidAccessListsMapping(c.getAccessLists().getViewers(), dto.getAccessLists().getViewers()); + assertValidAccessListsMapping(c.getAccessLists().getAdmins(), dto.getAccessLists().getAdmins()); + assertValidAccessListsMapping(c.getAccessLists().getEditors(), dto.getAccessLists().getEditors()); + assertValidAccessListsMapping(c.getAccessLists().getViewers(), dto.getAccessLists().getViewers()); - assertEquals(dto.getRate(), c.getRate()); - assertEquals(dto.getRateByUsers(), c.getRateByUsers()); - assertEquals(dto.getCurrentUserRate(), c.getCurrentUserRate()); + assertEquals(dto.getRate(), c.getRate()); + assertEquals(dto.getRateByUsers(), c.getRateByUsers()); + assertEquals(dto.getCurrentUserRate(), c.getCurrentUserRate()); } @Test public void testFolderMapping() { - final Container container = createDefContainer(); - final StateToken expectedToken = new StateToken(TESTGROUPSHORTNAME, TESTTOOL, 1l); - assertEquals(expectedToken, container.getStateToken()); - container.addChild(createDefContainer()); - container.addChild(createDefContainer()); - container.addContent(createDefContent()); - container.addContent(createDefContent()); - container.addContent(createDefContent()); - final Container containerChild = createDefContainer(); - container.addChild(containerChild); - final List<Container> absolutePathChild = new ArrayList<Container>(); - absolutePathChild.add(container); - containerChild.setAbsolutePath(absolutePathChild); + final Container container = createDefContainer(); + final StateToken expectedToken = new StateToken(TESTGROUPSHORTNAME, TESTTOOL, 1L); + assertEquals(expectedToken, container.getStateToken()); + container.addChild(createDefContainer()); + container.addChild(createDefContainer()); + container.addContent(createDefContent()); + container.addContent(createDefContent()); + container.addContent(createDefContent()); + final Container containerChild = createDefContainer(); + container.addChild(containerChild); + final List<Container> absolutePathChild = new ArrayList<Container>(); + absolutePathChild.add(container); + containerChild.setAbsolutePath(absolutePathChild); - final ContainerDTO dto = mapper.map(container, ContainerDTO.class); - assertEquals(3, dto.getChilds().size()); - assertEquals(3, dto.getContents().size()); - assertTrue(dto.getContents().get(0) instanceof ContentSimpleDTO); - assertTrue(dto.getChilds().get(0) instanceof ContainerSimpleDTO); - assertEquals(new StateToken(TESTGROUPSHORTNAME, TESTTOOL), dto.getChilds().get(0).getStateToken().clone() - .clearFolder()); - assertEquals(expectedToken, dto.getContents().get(0).getStateToken().clone().clearDocument()); - assertEquals(expectedToken, dto.getStateToken()); + final ContainerDTO dto = mapper.map(container, ContainerDTO.class); + assertEquals(3, dto.getChilds().size()); + assertEquals(3, dto.getContents().size()); + assertTrue(dto.getContents().get(0) instanceof ContentSimpleDTO); + assertTrue(dto.getChilds().get(0) instanceof ContainerSimpleDTO); + assertEquals(new StateToken(TESTGROUPSHORTNAME, TESTTOOL), + dto.getChilds().get(0).getStateToken().clone().clearFolder()); + assertEquals(expectedToken, dto.getContents().get(0).getStateToken().clone().clearDocument()); + assertEquals(expectedToken, dto.getStateToken()); - final ContainerDTO dtoChild = mapper.map(containerChild, ContainerDTO.class); - assertTrue(dtoChild.getAbsolutePath()[0] instanceof ContainerSimpleDTO); + final ContainerDTO dtoChild = mapper.map(containerChild, ContainerDTO.class); + assertTrue(dtoChild.getAbsolutePath()[0] instanceof ContainerSimpleDTO); } @Test public void testGroupListMapping() { - assertMapping(GroupListMode.EVERYONE, GroupListDTO.EVERYONE); - assertMapping(GroupListMode.NOBODY, GroupListDTO.NOBODY); - assertMapping(GroupListMode.NORMAL, GroupListDTO.NORMAL); + assertMapping(GroupListMode.EVERYONE, GroupListDTO.EVERYONE); + assertMapping(GroupListMode.NOBODY, GroupListDTO.NOBODY); + assertMapping(GroupListMode.NORMAL, GroupListDTO.NORMAL); } @Test public void testGroupMapping() { - final Group group = new Group("shortName", "name"); - final GroupDTO dto = mapper.map(group, GroupDTO.class); - assertEquals(group.getLongName(), dto.getLongName()); - assertEquals(group.getShortName(), dto.getShortName()); + final Group group = new Group("shortName", "name"); + final GroupDTO dto = mapper.map(group, GroupDTO.class); + assertEquals(group.getLongName(), dto.getLongName()); + assertEquals(group.getShortName(), dto.getShortName()); } @Test public void testLicenseMapping() { - final License licenseCC = new License("by-nc-nd", "Creative Commons Attribution-NonCommercial-NoDerivs", "cc1", - "http://creativecommons.org/licenses/by-nc-nd/3.0/", true, false, false, "cc2", "cc3"); + final License licenseCC = new License("by-nc-nd", "Creative Commons Attribution-NonCommercial-NoDerivs", "cc1", + "http://creativecommons.org/licenses/by-nc-nd/3.0/", true, false, false, "cc2", "cc3"); - final License licenseNotCC = new License("gfdl", "GNU Free Documentation License", "nocc1", - "http://www.gnu.org/copyleft/fdl.html", false, true, false, "nocc2", "nocc3"); + final License licenseNotCC = new License("gfdl", "GNU Free Documentation License", "nocc1", + "http://www.gnu.org/copyleft/fdl.html", false, true, false, "nocc2", "nocc3"); - final LicenseDTO dtoCC = mapper.map(licenseCC, LicenseDTO.class); - final LicenseDTO dtoNotCC = mapper.map(licenseNotCC, LicenseDTO.class); + final LicenseDTO dtoCC = mapper.map(licenseCC, LicenseDTO.class); + final LicenseDTO dtoNotCC = mapper.map(licenseNotCC, LicenseDTO.class); - assertEquals("by-nc-nd", dtoCC.getShortName()); - assertEquals("gfdl", dtoNotCC.getShortName()); - assertEquals("Creative Commons Attribution-NonCommercial-NoDerivs", dtoCC.getLongName()); - assertEquals("GNU Free Documentation License", dtoNotCC.getLongName()); - assertEquals("http://creativecommons.org/licenses/by-nc-nd/3.0/", dtoCC.getUrl()); - assertEquals("http://www.gnu.org/copyleft/fdl.html", dtoNotCC.getUrl()); - assertTrue(dtoCC.isCC()); - assertFalse(dtoNotCC.isCC()); - assertFalse(dtoCC.isCopyleft()); - assertTrue(dtoNotCC.isCopyleft()); - assertFalse(dtoCC.isDeprecated()); - assertFalse(dtoNotCC.isDeprecated()); - assertEquals("cc1", dtoCC.getDescription()); - assertEquals("cc2", dtoCC.getRdf()); - assertEquals("cc3", dtoCC.getImageUrl()); - assertEquals("nocc1", dtoNotCC.getDescription()); - assertEquals("nocc2", dtoNotCC.getRdf()); - assertEquals("nocc3", dtoNotCC.getImageUrl()); + assertEquals("by-nc-nd", dtoCC.getShortName()); + assertEquals("gfdl", dtoNotCC.getShortName()); + assertEquals("Creative Commons Attribution-NonCommercial-NoDerivs", dtoCC.getLongName()); + assertEquals("GNU Free Documentation License", dtoNotCC.getLongName()); + assertEquals("http://creativecommons.org/licenses/by-nc-nd/3.0/", dtoCC.getUrl()); + assertEquals("http://www.gnu.org/copyleft/fdl.html", dtoNotCC.getUrl()); + assertTrue(dtoCC.isCC()); + assertFalse(dtoNotCC.isCC()); + assertFalse(dtoCC.isCopyleft()); + assertTrue(dtoNotCC.isCopyleft()); + assertFalse(dtoCC.isDeprecated()); + assertFalse(dtoNotCC.isDeprecated()); + assertEquals("cc1", dtoCC.getDescription()); + assertEquals("cc2", dtoCC.getRdf()); + assertEquals("cc3", dtoCC.getImageUrl()); + assertEquals("nocc1", dtoNotCC.getDescription()); + assertEquals("nocc2", dtoNotCC.getRdf()); + assertEquals("nocc3", dtoNotCC.getImageUrl()); } @Test public void testMimeMapping() { - final Content d = createDefContent(); - d.setMimeType(new BasicMimeType("application/pdf")); - final ContentSimpleDTO contentSimpleDTO = mapper.map(d, ContentSimpleDTO.class); - assertEquals("application/pdf", contentSimpleDTO.getMimeType().toString()); + final Content d = createDefContent(); + d.setMimeType(new BasicMimeType("application/pdf")); + final ContentSimpleDTO contentSimpleDTO = mapper.map(d, ContentSimpleDTO.class); + assertEquals("application/pdf", contentSimpleDTO.getMimeType().toString()); } @Test public void testStateTokenInStateMap() { - final StateToken stateToken = new StateToken(TESTGROUPSHORTNAME, TESTTOOL, "1", "2"); - final StateToken stateTokenMapped = mapper.map(stateToken, StateToken.class); - assertEquals(stateToken, stateTokenMapped); - final State state = new State(); - state.setStateToken(stateToken); - final StateDTO stateDTO = mapper.map(state, StateDTO.class); - assertEquals(stateToken, stateDTO.getStateToken()); + final StateToken stateToken = new StateToken(TESTGROUPSHORTNAME, TESTTOOL, "1", "2"); + final StateToken stateTokenMapped = mapper.map(stateToken, StateToken.class); + assertEquals(stateToken, stateTokenMapped); + final State state = new State(); + state.setStateToken(stateToken); + final StateDTO stateDTO = mapper.map(state, StateDTO.class); + assertEquals(stateToken, stateDTO.getStateToken()); } @Test public void testUserToLinkMappping() { - final User user = new User("shortName", "longName", "", "", null, null, null); - final LinkDTO dto = mapper.map(user, LinkDTO.class); - assertEquals("shortName", dto.getShortName()); - assertEquals("longName", dto.getLongName()); + final User user = new User("shortName", "longName", "", "", null, null, null); + final LinkDTO dto = mapper.map(user, LinkDTO.class); + assertEquals("shortName", dto.getShortName()); + assertEquals("longName", dto.getLongName()); } private void assertMapping(final GroupListMode mode, final String modeName) { - final GroupList list = new GroupList(); - list.setMode(mode); - final GroupListDTO dto = mapper.map(list, GroupListDTO.class); - assertEquals(modeName, dto.getMode()); - final GroupList listBack = mapper.map(dto, GroupList.class); - assertEquals(mode, listBack.getMode()); + final GroupList list = new GroupList(); + list.setMode(mode); + final GroupListDTO dto = mapper.map(list, GroupListDTO.class); + assertEquals(modeName, dto.getMode()); + final GroupList listBack = mapper.map(dto, GroupList.class); + assertEquals(mode, listBack.getMode()); } private void assertValidAccessListsMapping(final GroupList groupList, final GroupListDTO groupListDTO) { - final List<Group> listOrig = groupList.getList(); - final List<GroupDTO> listDto = groupListDTO.getList(); - assertEquals(listDto.size(), listOrig.size()); - for (int i = 0; i < listDto.size(); i++) { - final Object object = listDto.get(i); - assertEquals(GroupDTO.class, object.getClass()); - final GroupDTO d = (GroupDTO) object; - final Group g = listOrig.get(i); - assertNotNull(d); - assertNotNull(g); - final GroupDTO map = mapper.map(g, GroupDTO.class); - assertEquals(map, d); - } + final List<Group> listOrig = groupList.getList(); + final List<GroupDTO> listDto = groupListDTO.getList(); + assertEquals(listDto.size(), listOrig.size()); + for (int i = 0; i < listDto.size(); i++) { + final Object object = listDto.get(i); + assertEquals(GroupDTO.class, object.getClass()); + final GroupDTO d = (GroupDTO) object; + final Group g = listOrig.get(i); + assertNotNull(d); + assertNotNull(g); + final GroupDTO map = mapper.map(g, GroupDTO.class); + assertEquals(map, d); + } } private Container createDefContainer() { - return createDefContainer(createDeGroup()); + return createDefContainer(createDeGroup()); } private Container createDefContainer(final Group group) { - final Container container = new Container(); - container.setId(1l); - container.setToolName(TESTTOOL); - container.setOwner(group); - container.setName("folder"); - return container; + final Container container = new Container(); + container.setId(1L); + container.setToolName(TESTTOOL); + container.setOwner(group); + container.setName("folder"); + return container; } private Content createDefContent() { - final Container container = createDefContainer(createDeGroup()); - final Content d = new Content(); - d.setId(1l); - final Revision revision = new Revision(d); - revision.setTitle("title"); - d.addRevision(revision); - d.setContainer(container); - return d; + final Container container = createDefContainer(createDeGroup()); + final Content d = new Content(); + d.setId(1L); + final Revision revision = new Revision(d); + revision.setTitle("title"); + d.addRevision(revision); + d.setContainer(container); + return d; } private Group createDeGroup() { - final Group group = new Group(TESTGROUPSHORTNAME, "This is a group Test"); - return group; + final Group group = new Group(TESTGROUPSHORTNAME, "This is a group Test"); + return group; } } Modified: trunk/src/test/java/org/ourproject/kune/platf/server/properties/KunePropertiesTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/properties/KunePropertiesTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/platf/server/properties/KunePropertiesTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -8,8 +8,8 @@ @Test public void testLoading() { - KunePropertiesDefault properties = new KunePropertiesDefault("test.file.properties"); - assertEquals("value", properties.get("key")); + KunePropertiesDefault properties = new KunePropertiesDefault("test.file.properties"); + assertEquals("value", properties.get("key")); } } Modified: trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTMethodFinder.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTMethodFinder.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTMethodFinder.java 2008-10-21 19:26:47 UTC (rev 917) @@ -29,7 +29,7 @@ @Test public void simpleTest() { RESTMethod method = finder.findMethod("simpleMethod", new TestParameters("name", "theName"), - MyTestService.class); + MyTestService.class); assertNotNull(method); assertTrue(method.invoke(service)); assertEquals("the name: theName", method.getResponse().toString()); @@ -38,7 +38,8 @@ @Test public void shouldTakeMoreParamsMethod() { RESTMethod method = finder.findMethod("simpleMethod", - new TestParameters("name", "theName", "value", "theValue"), MyTestService.class); + new TestParameters("name", "theName", "value", "theValue"), + MyTestService.class); assertNotNull(method); assertTrue(method.invoke(service)); assertEquals("more params: theName: theValue", method.getResponse().toString()); @@ -47,7 +48,7 @@ @Test public void conversionTest() { RESTMethod method = finder.findMethod("convertIntMethod", new TestParameters("length", "12", "stamp", "13"), - MyTestService.class); + MyTestService.class); assertNotNull(method); assertTrue(method.invoke(service)); assertEquals("the data: 12 13", method.getResponse().toString()); Modified: trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java 2008-10-21 19:26:47 UTC (rev 917) @@ -20,16 +20,6 @@ this.groups = new HashMap<String, Group>(); } - public void createUsers(final String... userNames) { - User user; - for (String name : userNames) { - user = new User(name, "long" + name, name + "@email.com", "password" + name, new I18nLanguage(), - new I18nCountry(), TimeZone.getDefault()); - user.setUserGroup(new Group(name, "groupLong" + name)); - users.put(name, user); - } - } - public void createGroups(final String... groupNames) { Group group; for (String name : groupNames) { @@ -42,37 +32,47 @@ Group group; for (String name : groupNames) { group = new Group("name", "Some group: " + name); - group.setType(GroupType.ORPHANED_PROJECT); + group.setGroupType(GroupType.ORPHANED_PROJECT); groups.put(name, group); } } - public SocialNetworkOperator inSocialNetworkOf(final String userName) { - return new SocialNetworkOperator(this, getSocialNetworkOf(userName)); + public void createUsers(final String... userNames) { + User user; + for (String name : userNames) { + user = new User(name, "long" + name, name + "@email.com", "password" + name, new I18nLanguage(), + new I18nCountry(), TimeZone.getDefault()); + user.setUserGroup(new Group(name, "groupLong" + name)); + users.put(name, user); + } } - private SocialNetwork getSocialNetworkOf(final String userName) { - Group userGroup = getGroupOf(userName); - SocialNetwork socialNetwork = userGroup.getSocialNetwork(); - return socialNetwork; + public AccessLists getDefaultAccessListOf(final String userName) { + return getSocialNetworkOf(userName).getAccessLists(); } - public User getUser(final String userName) { - return users.get(userName); + public Group getGroup(final String groupName) { + return groups.get(groupName); } - public AccessLists getDefaultAccessListOf(final String userName) { - return getSocialNetworkOf(userName).getAccessLists(); - } - public Group getGroupOf(final String userName) { User user = getUser(userName); Group userGroup = user.getUserGroup(); return userGroup; } - public Group getGroup(final String groupName) { - return groups.get(groupName); + public User getUser(final String userName) { + return users.get(userName); } + public SocialNetworkOperator inSocialNetworkOf(final String userName) { + return new SocialNetworkOperator(this, getSocialNetworkOf(userName)); + } + + private SocialNetwork getSocialNetworkOf(final String userName) { + Group userGroup = getGroupOf(userName); + SocialNetwork socialNetwork = userGroup.getSocialNetwork(); + return socialNetwork; + } + } Modified: trunk/src/test/java/org/ourproject/kune/testhelper/ctx/SocialNetworkOperator.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/testhelper/ctx/SocialNetworkOperator.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/testhelper/ctx/SocialNetworkOperator.java 2008-10-21 19:26:47 UTC (rev 917) @@ -7,16 +7,16 @@ private final SocialNetwork socialNetwork; public SocialNetworkOperator(final DomainContext ctx, final SocialNetwork socialNetwork) { - this.ctx = ctx; - this.socialNetwork = socialNetwork; + this.ctx = ctx; + this.socialNetwork = socialNetwork; } - public void addAsCollaborator(final String userName) { - socialNetwork.addCollaborator(ctx.getGroupOf(userName)); + public void addAsAdministrator(final String userName) { + socialNetwork.addAdmin(ctx.getGroupOf(userName)); } - public void addAsAdministrator(final String userName) { - socialNetwork.addAdmin(ctx.getGroupOf(userName)); + public void addAsCollaborator(final String userName) { + socialNetwork.addCollaborator(ctx.getGroupOf(userName)); } } Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/sitebar/msg/SiteMessagePresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/sitebar/msg/SiteMessagePresenterTest.java 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/sitebar/msg/SiteMessagePresenterTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -14,55 +14,55 @@ @Before public void createObjects() { - view = EasyMock.createStrictMock(SiteMessageView.class); - presenter = new SiteMessagePresenter(); + view = EasyMock.createStrictMock(SiteMessageView.class); + presenter = new SiteMessagePresenter(); } @Test public void testMessage() { - view.hide(); - view.setMessage("test 1", SiteErrorType.info, SiteErrorType.error); - view.show(); - EasyMock.replay(view); - presenter.init(view); - presenter.setMessage("test 1", SiteErrorType.error); - EasyMock.verify(view); + view.hide(); + view.setMessage("test 1", SiteErrorType.info, SiteErrorType.error); + view.show(); + EasyMock.replay(view); + presenter.init(view); + presenter.setMessage("test 1", SiteErrorType.error); + EasyMock.verify(view); } @Test public void testTwoMessagesDifTypes() { - view.hide(); - view.setMessage("test 1", SiteErrorType.info, SiteErrorType.veryimp); - view.show(); - view.setMessage("test 1<br>test 2", SiteErrorType.veryimp, SiteErrorType.error); - view.show(); - EasyMock.replay(view); - presenter.init(view); - presenter.setMessage("test 1", SiteErrorType.veryimp); - presenter.setMessage("test 2", SiteErrorType.error); - EasyMock.verify(view); + view.hide(); + view.setMessage("test 1", SiteErrorType.info, SiteErrorType.veryimp); + view.show(); + view.setMessage("test 1<br>test 2", SiteErrorType.veryimp, SiteErrorType.error); + view.show(); + EasyMock.replay(view); + presenter.init(view); + presenter.setMessage("test 1", SiteErrorType.veryimp); + presenter.setMessage("test 2", SiteErrorType.error); + EasyMock.verify(view); } @Test public void testTwoMessagesSameType() { - view.hide(); - view.setMessage("test 1", SiteErrorType.info, SiteErrorType.error); - view.show(); - view.setMessage("test 1<br>test 2"); - view.show(); - EasyMock.replay(view); - presenter.init(view); - presenter.setMessage("test 1", SiteErrorType.error); - presenter.setMessage("test 2", SiteErrorType.error); - EasyMock.verify(view); + view.hide(); + view.setMessage("test 1", SiteErrorType.info, SiteErrorType.error); + view.show(); + view.setMessage("test 1<br>test 2"); + view.show(); + EasyMock.replay(view); + presenter.init(view); + presenter.setMessage("test 1", SiteErrorType.error); + presenter.setMessage("test 2", SiteErrorType.error); + EasyMock.verify(view); } @Test public void testViewInitialization() { - view.hide(); - EasyMock.replay(view); - presenter.init(view); - EasyMock.verify(view); + view.hide(); + EasyMock.replay(view); + presenter.init(view); + EasyMock.verify(view); } } 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 2008-10-17 02:27:46 UTC (rev 916) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java 2008-10-21 19:26:47 UTC (rev 917) @@ -19,29 +19,29 @@ @SuppressWarnings("unchecked") @Before public void before() { - final Session session = Mockito.mock(Session.class); - final StateManager stateManager = Mockito.mock(StateManager.class); - final WsThemePresenter theme = Mockito.mock(WsThemePresenter.class); - final SiteSearcher searcher = Mockito.mock(SiteSearcher.class); - final Provider searcherProvider = Mockito.mock(Provider.class); - Mockito.stub(searcherProvider.get()).toReturn(searcher); - view = Mockito.mock(TagsSummaryView.class); - tagsSummaryPresenter = new TagsSummaryPresenter(session, searcherProvider, stateManager, theme); - tagsSummaryPresenter.init(view); + final Session session = Mockito.mock(Session.class); + final StateManager stateManager = Mockito.mock(StateManager.class); + final WsThemePresenter theme = Mockito.mock(WsThemePresenter.class); + final SiteSearcher searcher = Mockito.mock(SiteSearcher.class); + final Provider searcherProvider = Mockito.mock(Provider.class); + Mockito.stub(searcherProvider.get()).toReturn(searcher); + view = Mockito.mock(TagsSummaryView.class); + tagsSummaryPresenter = new TagsSummaryPresenter(session, searcherProvider, stateManager, theme); + tagsSummaryPresenter.init(view); } @Test public void noTagsViewNotVisible() { - final StateDTO state = new StateDTO(); - tagsSummaryPresenter.setState(state); - Mockito.verify(view).setVisible(false); + final StateDTO state = new StateDTO(); + tagsSummaryPresenter.setState(state); + Mockito.verify(view).setVisible(false); } @Test public void withTagsViewVisible() { - final StateDTO state = new StateDTO(); - state.setTags("test test1"); - tagsSummaryPresenter.setState(state); - Mockito.verify(view).setVisible(true); + final StateDTO state = new StateDTO(); + state.setTags("test test1"); + tagsSummaryPresenter.setState(state); + Mockito.verify(view).setVisible(true); } }

1 0

r916 - in trunk/src/main/java/org/ourproject/kune: app/public/css chat/client platf/client/actions platf/client/dto platf/client/services platf/server/sn workspace/client/ctxnav workspace/client/socialnet
by vjrj 17 Oct '08

17 Oct '08

Author: vjrj Date: 2008-10-17 04:27:46 +0200 (Fri, 17 Oct 2008) New Revision: 916 Added: trunk/src/main/java/org/ourproject/kune/platf/client/actions/GroupActionRegistry.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/UserActionRegistry.java Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngine.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserBuddiesDataDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.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 Log: Complete - task User buddies SocialNetwork part Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-17 02:27:46 UTC (rev 916) @@ -35,4 +35,4 @@ } */.kune-NavigationBar .topBar .gwt-Image{margin:0 2px 0 5px;}.kune-NavigationBar .Items{margin:2px 0;}.kune-NavigationBar .Items .gwt-Image{margin:2px 0;vertical-align:middle;}.kune-NavigationBar .Items .gwt-Hyperlink a{color:green;/* FIXME: other color */}.kune-NavigationBar .topBar .topBar-margin{margin-left:5px;}.kune-NavigationBar .pathMenu{vertical-align:middle;}.kune-NavigationBar .pathMenu .gwt-MenuItem{background:transparent url(img/button-bg-hard.gif) repeat-x 0 0;border-left:1px solid #AAA;border-right:1px solid #AAA;color:#999;cursor:pointer;white-space:nowrap;padding:3px 6px;}.kune-NavigationBar .pathMenu .gwt-MenuItem-selected{background:transparent url(img/button-bg-soft.gif) repeat-x 0 0;color:#000;}.kune-NavigationBar .kune-IconHyperlink{vertical-align:middle;margin-left:5px;}.kune-NavigationBar .kune-IconHyperlink a{color:green;text-decoration:none;}.kune-NavigationBar .kune-IconHyperlink .gwt-Image{margin-right:3px;vertical-align:middle;}/* Social Network */.kune-StackedDropDownPanel{}.kune-StackedDropDownPanel .gwt-StackPanelItem{border-top:1px solid #CCC;border-bottom:1px solid #CCC;background-color:#EFA;cursor:pointer;padding:1px 3px 0 6px;overflow:hidden;}.kune-StackedDropDownPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-StackedDropDownPanel .kune-DropDownInner table{width:100%;}.kune-StackedDropDownPanel .gwt-StackPanelItem-selected{}.kune-StackedDropDownPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-StackedDropDownPanel .kune-DropDownInner{padding:0;}/* StackedDropDownPanel Members */.kune-StackSubItemLabel{overflow:hidden;}.kune-StackSubItemLabel .gwt-MenuItem{white-space:nowrap;cursor:pointer;border-bottom:1px solid #F2F2F2;}.kune-StackSubItemLabel table{width:100%;}.kune-StackSubItemLabel .gwt-MenuItem img{vertical-align:middle;margin-top:1px;margin-bottom:1px;margin-left:5px;margin-right:3px;}.kune-StackSubItemLabel .gwt-MenuItem-selected{background-color:#FFE6D5;}.kune-StackSubItemActions{background-color:#F2F2F2;border:1px solid #999;vertical-align:middle;padding:5px 0;margin-left:-120px;margin-top:-2px;}.kune-StackSubItemActions .gwt-MenuItem{cursor:pointer;padding:1px 10px;white-space:nowrap;}.kune-StackSubItemActions .gwt-MenuItem img{vertical-align:middle;margin-right:3px;}.kune-StackSubItemActions .gwt-MenuItem-selected{background-color:#FFB958;}/* AccessList */.kune-AccessListSubLabel{font-style:italic;}.kune-AccessList{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel-open{width:100%;}.kune-AccessList .gwt-DisclosurePanel-closed{width:100%;}.kune-AccessList .header{margin:0 0 3px;text-decoration:none;width:100%;background-color:#8DD35F;}.kune-AccessList .header table{margin:0 5px 0 0;width:100%;color:#FFF;}.kune-AccessList .header img{margin:0 3px 0 0;}.kune-AccessList .content{margin:0 0 0 7px;width:100%;}.kune-AccessList .content table{margin-bottom:5px;width:100%;}/* Rate */.kune-RatePanel-Label{white-space:nowrap;vertical-align:middle;}.kune-RatePanel-Stars{margin-left:5px;vertical-align:middle;}.kune-RatePanel-Stars-RateIt{cursor:pointer;}/* Licenses */.kune-License-CC-Header{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}.kune-License-CC-Header .gwt-Label{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}/* Theme */.kune-IconBottomPanel .gwt-MenuItem{cursor:pointer;background-color:#FFF;margin:2px 2px 2px 5px;}.kune-IconBottomPanel .gwt-MenuItem-selected{background-color:#F2F2F2;}.gwt-MenuBar-bottomMenu{margin-left:-60px;margin-top:-120px;}/* i18n */.kune-I18nTranslatorCell{white-space:normal;}.kune-i18nTranslator-recommend{margin:10px;}.kune-i18nTranslator-recommend h1{font-size:131%;font-weight:700;}.kune-i18nTranslator-recommend h2{font-size:116%;font-weight:700;}.kune-i18nTranslator-recommend h3{font-size:108%;font-weight:700;font-style:italic;}.kune-i18nTranslator-recommend em{font-weight:700;}.kune-i18nTranslator-recommend strong{font-weight:700;}/* Admin Context */.kune-AdminContextPanel{margin:6px;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem{background:transparent url(img/arrow-right-white.gif) no-repeat scroll 3px 2px;cursor:pointer;padding:3px 10px 1px 20px;overflow:hidden;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-AdminContextPanel .gwt-StackPanelItem-selected{background:transparent url(img/arrow-down-white.gif) no-repeat scroll 3px 2px;background-color:#DEE3DB;}.kune-AdminContextPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-AdminContextPanel-inner{background-color:#FFF;}.kune-AdminContextPanel-inner-wrap{margin:5px;}.kune-EditableLabel{}.kune-EditableLabel .kune-EditableLabel-editable{}.kune-EditableLabel-high{background-color:#FFFBC1;cursor:pointer;}.kune-EditableLabel-high span{background-color:#FFFBC1;}.kune-EditableLabel a{margin-left:5px;}.kune-EditableLabel a:link{color:green;}.kune-EditableLabel a:hover{text-decoration:underline;}.kune-EditableLabel a:visited{color:olive;}.kune-EditableLabel img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable span{margin:3px;}.kune-EditableLabel span{margin:3px;}.kune-BottomIconsTrayPanel{width:165px;height:21px;vertical-align:middle;background-color:#EFEFEF;}.kune-TagsPanel-tag{float:left;margin-right:5px;cursor:pointer;}.kune-Content-Main{margin:5px;}/* Yahoo ui base.css */.kune-Content-Main h1{font-size:138.5%;}.kune-Content-Main h2{font-size:123.099998%;}.kune-Content-Main h3{font-size:108%;}.kune-Content-Main h1{margin:1em 0;}.kune-Content-Main h2{margin:1em 0;}.kune-Content-Main h3{margin:1em 0;}.kune-Content-Main h1{font-weight:700;}.kune-Content-Main h2{font-weight:700;}.kune-Content-Main h3{font-weight:700;}.kune-Content-Main h4{font-weight:700;}.kune-Content-Main h5{font-weight:700;}.kune-Content-Main h6{font-weight:700;}.kune-Content-Main strong{font-weight:700;}.kune-Content-Main abbr{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main acronym{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main em{font-style:italic;}.kune-Content-Main blockquote{margin:1em;}.kune-Content-Main ul{margin:1em;}.kune-Content-Main ol{margin:1em;}.kune-Content-Main dl{margin:1em;}.kune-Content-Main ol{margin-left:2em;}.kune-Content-Main ul{margin-left:2em;}.kune-Content-Main dl{margin-left:2em;}.kune-Content-Main ol{list-style:decimal outside;}.kune-Content-Main li{list-style:decimal outside;}.kune-Content-Main li{list-style:disc outside;}.kune-Content-Main ul{list-style:disc outside;}.kune-Content-Main dl{margin-left:1em;}.kune-Content-Main dd{margin-left:1em;}.kune-Content-Main th{border:1px solid #000;padding:.5em;font-weight:700;text-align:center;}.kune-Content-Main td{border:1px solid #000;padding:.5em;}.kune-Content-Main caption{margin-bottom:.5em;text-align:center;}.kune-Content-Main p{margin-bottom:1em;}.kune-Content-Main fieldset{margin-bottom:1em;}.kune-Content-Main table{margin-bottom:1em;}.kune-Content-Main pre{margin-bottom:1em;}.kune-Content-Main input[type=text]{width:12.25em;width:11.9em;}.kune-Content-Main input[type=password]{width:12.25em;width:11.9em;}.kune-Content-Main textarea{width:12.25em;width:11.9em;}.search-icon{background-image:url(img/search.gif)!important;}.i18n-icon{background-image:url(img/language.gif)!important;}/* RTE Text editor */.kune-TexEditorPanel-TextArea{margin:3px;}.gwt-RichTextArea{/* border: 1px solid #000; background-color: #FFF; */border:1px solid #4D4D4D;background-color:#FFF;margin:5px 0 5px 10px;}.gwt-RichTextToolbar{/* background-color: #F2F2F2; - padding: 5px; */height:24px;vertical-align:middle;}.gwt-RichTextToolbar table{vertical-align:middle;}.gwt-RichTextToolbar .gwt-ToggleButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-PushButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-PushButton-down{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-PushButton-down-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-ToggleButton-down{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .x-btn{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lSpace{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lrSpace{float:left;}.RichTextToolbar-menu{float:left;margin-top:2px;z-index:4;}.RichTextToolbar-menu table{border-collapse:collapse;border-spacing:0;margin:0;z-index:4;}.RichTextToolbar-menu .gwt-MenuItem{margin-right:2px;border:1px solid #F2F2F2;}.RichTextToolbar-menu .gwt-MenuItem-selected{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.RichTextToolbar-submenu{background-color:#FFFCD5;border:1px solid #D38D5F;cursor:default;z-index:4;}.RichTextToolbar-submenu .gwt-MenuItem{cursor:default;white-space:nowrap;border:1px solid #FFFCD5;padding:0 4px;}.RichTextToolbar-submenu .gwt-MenuItem-selected{background-color:#FFB958;border:1px solid #C83737;}.kune-WebSafePalette{background-color:#FFF;border:1px solid #AAA;margin:1px;}.kune-WebSafePalette td{width:12px;height:10px;}.k-site-traybar{background:#FFF none repeat scroll 0 50%;}.k-blank-toolbar{background:#FFF none repeat scroll 0 50%;}.k-sitebar .kune-IconHyperlink{white-space:nowrap;}.k-sitebar .kune-IconHyperlink a:link{cursor:pointer;text-decoration:underline;color:#B3B3B3;}.k-sitebar .kune-IconHyperlink a:hover{text-decoration:underline;}.k-sitebar .kune-IconHyperlink a:visited{color:#B3B3B3;}.k-sitebar-labellink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-sitebar{margin-right:10px;height:16px;background:#FFF;}.k-sitebar .gwt-TextBox{border:1px solid #E4A374;margin:0 15px 0 3px;padding-left:3px;color:#B3B3B3;}.k-sitebar .gwt-Hyperlink a{white-space:nowrap;color:#B3B3B3;text-decoration:underline;cursor:pointer;}.k-sitebar .gwt-PushButton{cursor:pointer;}.k-sitebar-LabelLink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-entity-summary{border-left-color:#FFF;border-left-width:5px;border-down-width:5px;}.k-entitytextlogo{border:2px solid #F2F2F2;height:60px;margin:0 0 4px -1px;overflow:hidden;width:468px;}.k-entitytextlogo .gwt-Label{font-size:167%;font-weight:700;margin:5px;height:27px;}.k-entitytextlogo-default .gwt-Label{color:#69312F;}.k-entitytextlogo-green .gwt-Label{color:#250;}.k-entitytextlogo-blue .gwt-Label{color:navy;}.k-entitytextlogo-grey .gwt-Label{color:#1A1A1A;}.k-entitytextlogo-purple .gwt-Label{color:#405;}.k-entitytextlogo-red .gwt-Label{color:maroon;}.k-entitytextlogo .gwt-Hyperlink a{color:#CCC;font-size:85%;margin:5px;text-decoration:underline;white-space:nowrap;background-color:#FFF;}.k-entity-default .x-layout-split{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-green .x-layout-split{background:#5FD35F none repeat scroll 0 50%;}.k-entity-blue .x-layout-split{background:#06F none repeat scroll 0 50%;}.k-entity-grey .x-layout-split{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-purple .x-layout-split{background:#660080 none repeat scroll 0 50%;}.k-entity-red .x-layout-split{background:#D40000 none repeat scroll 0 50%;}.k-entityworkspace .x-layout-split{background:transparent none repeat scroll 0 50%;}.k-entityworkspace-default .x-layout-split{background:#DEAA87 none repeat scroll 0 50%;}.k-entityworkspace-green .x-layout-split{background:#DCE8AB none repeat scroll 0 50%;}.k-entityworkspace-blue .x-layout-split{background:#D5D5FF none repeat scroll 0 50%;}.k-entityworkspace-grey .x-layout-split{background:#999 none repeat scroll 0 50%;}.k-entityworkspace-purple .x-layout-split{background:#A793AC none repeat scroll 0 50%;}.k-entityworkspace-red .x-layout-split{background:#F55 none repeat scroll 0 50%;}.k-entity-title{border-left-style:solid;border-left-width:2px;}.k-entity-title div{line-height:22px;white-space:nowrap;}.k-entity-subtitle{}.k-entity-subtitle div{line-height:22px;white-space:nowrap;}.k-entity-title-rd-default{background:#DD8A3D;}.k-entity-title-rd-green{background:#5FD35F;}.k-entity-title-rd-blue{background:#06F;}.k-entity-title-rd-grey{background:#4D4D4D;}.k-entity-title-rd-purple{background:#660080;}.k-entity-title-rd-red{background:#D40000;}.k-entity-title-default{background:#F1BB59 none repeat scroll 0 50%;border-left-color:#DD8A3D;}.k-entity-title-green{background:#AFA none repeat scroll 0 50%;border-left-color:#5FD35F;}.k-entity-title-blue{background:#AFDDE9 none repeat scroll 0 50%;border-left-color:#06F;}.k-entity-title-grey{background:#CCC none repeat scroll 0 50%;border-left-color:#4D4D4D;}.k-entity-title-purple{background:#DDAFE9 none repeat scroll 0 50%;border-left-color:#660080;}.k-entity-title-red{background:#FF8080 none repeat scroll 0 50%;border-left-color:#D40000;}.k-entity-title-default div{color:#69312F;}.k-entity-title-green div{color:#250;}.k-entity-title-blue div{color:navy;}.k-entity-title-grey div{color:#1A1A1A;}.k-entity-title-purple div{color:#405;}.k-entity-title-red div{color:maroon;}.k-entity-subtitle-default{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-subtitle-green{background:#5FD35F none repeat scroll 0 50%;}.k-entity-subtitle-blue{background:#06F none repeat scroll 0 50%;}.k-entity-subtitle-grey{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-subtitle-purple{background:#660080 none repeat scroll 0 50%;}.k-entity-subtitle-red{background:#D40000 none repeat scroll 0 50%;}.k-entity-subtitle-default div{color:#FFF;}.k-entity-subtitle-green div{color:#FFF;}.k-entity-subtitle-blue div{color:#FFF;}.k-entity-subtitle-grey div{color:#FFF;}.k-entity-subtitle-purple div{color:#FFF;}.k-entity-subtitle-red div{color:#FFF;}.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default{background:#DD8A3D;}.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green{background:#5FD35F;}.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue{background:#06F;}.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey{background:#4D4D4D;}.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple{background:#660080;}.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red{background:#D40000;}.k-entitylicensepanel-licensetext{cursor:pointer;margin-left:5px;text-decoration:underline;}.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body{background:#FFD09D none repeat scroll 0 50%;}.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body{background:#CFA none repeat scroll 0 50%;}.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body{background:#ACF none repeat scroll 0 50%;}.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body{background:#B3B3B3 none repeat scroll 0 50%;}.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body{background:#FAA none repeat scroll 0 50%;}.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-bottom div{line-height:2em;color:#FFF;}.k-toolbar-top-line{border-top-color:#d0d0d0;border-top-style:solid;border-top-width:1px;}.k-toolbar-bottom-line{border-bottom-color:#d0d0d0;border-bottom-style:solid;border-bottom-width:1px;}.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{white-space:nowrap;font:normal 100% arial, sans;line-height:19px;}.k-toolbar-sep{padding-top:4px;padding-left:5px;}/* Custom gwt-ext styles */.ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);background-position:center;background-repeat:no-repeat;display:block;font-size:1px;height:16px;width:4px;overflow:hidden;cursor:default;margin:0 2px;border:0;}.ytb-spacer{width:2px;}.x-grid-group-hd{border-bottom:2px solid grey;cursor:pointer;padding-top:3px;}/* Drop down */.k-dropdownouter{background-color:grey;}.k-dropdownouter-members{}.k-dropdownouter-members-default{background-color:#DF5244;}.k-dropdownouter-members-green{background-color:green;}.k-dropdownouter-members-blue{background-color:#5500D4;}.k-dropdownouter-members-grey{background-color:#4D4D4D;}.k-dropdownouter-members-purple{background-color:#672178;}.k-dropdownouter-members-red{background-color:#A02C2C;}.k-dropdownouter-part{}.k-dropdownouter-part-default{background-color:#CA5842;}.k-dropdownouter-part-green{background-color:#0A0;}.k-dropdownouter-part-blue{background-color:#60F;}.k-dropdownouter-part-grey{background-color:#666;}.k-dropdownouter-part-purple{background-color:#892CA0;}.k-dropdownouter-part-red{background-color:#C83737;}.k-dropdownouter-tags{}.k-dropdownouter-tags-default{background-color:#87501E;}.k-dropdownouter-tags-green{background-color:#00D400;}.k-dropdownouter-tags-blue{background-color:#95F;}.k-dropdownouter-tags-grey{background-color:gray;}.k-dropdownouter-tags-purple{background-color:#AB37C8;}.k-dropdownouter-tags-red{background-color:#D35F5F;}.k-dropdownouter-summary{}.k-dropdownouter-summary-default{background-color:#9F734B;}.k-dropdownouter-summary-green{background-color:#4CE14C;}.k-dropdownouter-summary-blue{background-color:#69A5FF;}.k-dropdownouter-summary-grey{background-color:#A6A6A6;}.k-dropdownouter-summary-purple{background-color:#C473D8;}.k-dropdownouter-summary-red{background-color:#E08F8F;}.k-dropdowninner{margin:0 3px 1px;background:green;background-color:#FFF;/* padding: 3px; */}.k-dropdownlabel{color:#FFF;cursor:pointer;}.k-dropdownlabel .gwt-Label{margin:0 5px 0 0;width:100%;}.k-dropdownlabel img{margin:0 3px 0 1px;}/* WsTheme */.k-wstheme-icon-default{background:#FF8C00;}.k-wstheme-icon-green{background:green;}.k-wstheme-icon-blue{background:blue;}.k-wstheme-icon-grey{background:grey;}.k-wstheme-icon-purple{background:purple;}.k-wstheme-icon-red{background:red;}/* Tool selector items */.k-toolselectoritem{width:auto;margin-bottom:5px;cursor:pointer;}.k-toolselectoritem-sel{}.k-toolselectoritem-notsel-default{background:#FFE9A5;}.k-toolselectoritem-notsel-green{background:#D6F4D6;}.k-toolselectoritem-notsel-blue{background:#D7D7F4;}.k-toolselectoritem-notsel-grey{background:#E6E6E6;}.k-toolselectoritem-notsel-purple{background:#EED7F4;}.k-toolselectoritem-notsel-red{background:#FFD5D5;}.k-toolselectoritem-sel a{color:#FFF;padding:0 9px;text-decoration:none;}.k-toolselectoritem-sel a:hover{text-decoration:none;}.k-toolselectoritem-notsel{}.k-toolselectoritem-notsel a{color:#00F;padding:0 9px;text-decoration:none;}.k-toolselectoritem-notsel a:hover{text-decoration:underline;}/* others */.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;color:gray;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;} \ No newline at end of file + padding: 5px; */height:24px;vertical-align:middle;}.gwt-RichTextToolbar table{vertical-align:middle;}.gwt-RichTextToolbar .gwt-ToggleButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-PushButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-PushButton-down{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-PushButton-down-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-ToggleButton-down{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .x-btn{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lSpace{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lrSpace{float:left;}.RichTextToolbar-menu{float:left;margin-top:2px;z-index:4;}.RichTextToolbar-menu table{border-collapse:collapse;border-spacing:0;margin:0;z-index:4;}.RichTextToolbar-menu .gwt-MenuItem{margin-right:2px;border:1px solid #F2F2F2;}.RichTextToolbar-menu .gwt-MenuItem-selected{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.RichTextToolbar-submenu{background-color:#FFFCD5;border:1px solid #D38D5F;cursor:default;z-index:4;}.RichTextToolbar-submenu .gwt-MenuItem{cursor:default;white-space:nowrap;border:1px solid #FFFCD5;padding:0 4px;}.RichTextToolbar-submenu .gwt-MenuItem-selected{background-color:#FFB958;border:1px solid #C83737;}.kune-WebSafePalette{background-color:#FFF;border:1px solid #AAA;margin:1px;}.kune-WebSafePalette td{width:12px;height:10px;}.k-site-traybar{background:#FFF none repeat scroll 0 50%;}.k-blank-toolbar{background:#FFF none repeat scroll 0 50%;}.k-sitebar .kune-IconHyperlink{white-space:nowrap;}.k-sitebar .kune-IconHyperlink a:link{cursor:pointer;text-decoration:underline;color:#B3B3B3;}.k-sitebar .kune-IconHyperlink a:hover{text-decoration:underline;}.k-sitebar .kune-IconHyperlink a:visited{color:#B3B3B3;}.k-sitebar-labellink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-sitebar{margin-right:10px;height:16px;background:#FFF;}.k-sitebar .gwt-TextBox{border:1px solid #E4A374;margin:0 15px 0 3px;padding-left:3px;color:#B3B3B3;}.k-sitebar .gwt-Hyperlink a{white-space:nowrap;color:#B3B3B3;text-decoration:underline;cursor:pointer;}.k-sitebar .gwt-PushButton{cursor:pointer;}.k-sitebar-LabelLink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-entity-summary{border-left-color:#FFF;border-left-width:5px;border-down-width:5px;}.k-entitytextlogo{border:2px solid #F2F2F2;height:60px;margin:0 0 4px -1px;overflow:hidden;width:468px;}.k-entitytextlogo .gwt-Label{font-size:167%;font-weight:700;margin:5px;height:27px;}.k-entitytextlogo-default .gwt-Label{color:#69312F;}.k-entitytextlogo-green .gwt-Label{color:#250;}.k-entitytextlogo-blue .gwt-Label{color:navy;}.k-entitytextlogo-grey .gwt-Label{color:#1A1A1A;}.k-entitytextlogo-purple .gwt-Label{color:#405;}.k-entitytextlogo-red .gwt-Label{color:maroon;}.k-entitytextlogo .gwt-Hyperlink a{color:#CCC;font-size:85%;margin:5px;text-decoration:underline;white-space:nowrap;background-color:#FFF;}.k-entity-default .x-layout-split,.k-entity-default .x-layout-collapsed{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-green .x-layout-split,.k-entity-green .x-layout-collapsed{background:#5FD35F none repeat scroll 0 50%;}.k-entity-blue .x-layout-split,.k-entity-blue .x-layout-collapsed{background:#06F none repeat scroll 0 50%;}.k-entity-grey .x-layout-split,.k-entity-grey .x-layout-collapsed{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-purple .x-layout-split,.k-entity-purple .x-layout-collapsed{background:#660080 none repeat scroll 0 50%;}.k-entity-red .x-layout-split,.k-entity-red .x-layout-collapsed{background:#D40000 none repeat scroll 0 50%;}.k-entityworkspace .x-layout-split,.k-entityworkspace .x-layout-collapsed{background:transparent none repeat scroll 0 50%;}.k-entityworkspace-default .x-layout-split,.k-entityworkspace-default .x-layout-collapsed{background:#DEAA87 none repeat scroll 0 50%;}.k-entityworkspace-green .x-layout-split,.k-entityworkspace-green .x-layout-collapsed{background:#DCE8AB none repeat scroll 0 50%;}.k-entityworkspace-blue .x-layout-split,.k-entityworkspace-blue .x-layout-collapsed{background:#D5D5FF none repeat scroll 0 50%;}.k-entityworkspace-grey .x-layout-split,.k-entityworkspace-grey .x-layout-collapsed{background:#999 none repeat scroll 0 50%;}.k-entityworkspace-purple .x-layout-split,.k-entityworkspace-purple .x-layout-collapsed{background:#A793AC none repeat scroll 0 50%;}.k-entityworkspace-red .x-layout-split,.k-entityworkspace-red .x-layout-collapsed{background:#F55 none repeat scroll 0 50%;}.k-entity-title{border-left-style:solid;border-left-width:2px;}.k-entity-title div{line-height:22px;white-space:nowrap;}.k-entity-subtitle{}.k-entity-subtitle div{line-height:22px;white-space:nowrap;}.k-entity-title-rd-default{background:#DD8A3D;}.k-entity-title-rd-green{background:#5FD35F;}.k-entity-title-rd-blue{background:#06F;}.k-entity-title-rd-grey{background:#4D4D4D;}.k-entity-title-rd-purple{background:#660080;}.k-entity-title-rd-red{background:#D40000;}.k-entity-title-default{background:#F1BB59 none repeat scroll 0 50%;border-left-color:#DD8A3D;}.k-entity-title-green{background:#AFA none repeat scroll 0 50%;border-left-color:#5FD35F;}.k-entity-title-blue{background:#AFDDE9 none repeat scroll 0 50%;border-left-color:#06F;}.k-entity-title-grey{background:#CCC none repeat scroll 0 50%;border-left-color:#4D4D4D;}.k-entity-title-purple{background:#DDAFE9 none repeat scroll 0 50%;border-left-color:#660080;}.k-entity-title-red{background:#FF8080 none repeat scroll 0 50%;border-left-color:#D40000;}.k-entity-title-default div{color:#69312F;}.k-entity-title-green div{color:#250;}.k-entity-title-blue div{color:navy;}.k-entity-title-grey div{color:#1A1A1A;}.k-entity-title-purple div{color:#405;}.k-entity-title-red div{color:maroon;}.k-entity-subtitle-default{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-subtitle-green{background:#5FD35F none repeat scroll 0 50%;}.k-entity-subtitle-blue{background:#06F none repeat scroll 0 50%;}.k-entity-subtitle-grey{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-subtitle-purple{background:#660080 none repeat scroll 0 50%;}.k-entity-subtitle-red{background:#D40000 none repeat scroll 0 50%;}.k-entity-subtitle-default div{color:#FFF;}.k-entity-subtitle-green div{color:#FFF;}.k-entity-subtitle-blue div{color:#FFF;}.k-entity-subtitle-grey div{color:#FFF;}.k-entity-subtitle-purple div{color:#FFF;}.k-entity-subtitle-red div{color:#FFF;}.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default{background:#DD8A3D;}.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green{background:#5FD35F;}.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue{background:#06F;}.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey{background:#4D4D4D;}.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple{background:#660080;}.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red{background:#D40000;}.k-entitylicensepanel-licensetext{cursor:pointer;margin-left:5px;text-decoration:underline;}.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body{background:#FFD09D none repeat scroll 0 50%;}.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body{background:#CFA none repeat scroll 0 50%;}.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body{background:#ACF none repeat scroll 0 50%;}.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body{background:#B3B3B3 none repeat scroll 0 50%;}.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body{background:#FAA none repeat scroll 0 50%;}.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-bottom div{line-height:2em;color:#FFF;}.k-toolbar-top-line{border-top-color:#d0d0d0;border-top-style:solid;border-top-width:1px;}.k-toolbar-bottom-line{border-bottom-color:#d0d0d0;border-bottom-style:solid;border-bottom-width:1px;}.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{white-space:nowrap;font:normal 100% arial, sans;line-height:19px;}.k-toolbar-sep{padding-top:4px;padding-left:5px;}/* Custom gwt-ext styles */.ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);background-position:center;background-repeat:no-repeat;display:block;font-size:1px;height:16px;width:4px;overflow:hidden;cursor:default;margin:0 2px;border:0;}.ytb-spacer{width:2px;}.x-grid-group-hd{border-bottom:2px solid grey;cursor:pointer;padding-top:3px;}/* Drop down */.k-dropdownouter{background-color:grey;}.k-dropdownouter-members{}.k-dropdownouter-members-default{background-color:#DF5244;}.k-dropdownouter-members-green{background-color:green;}.k-dropdownouter-members-blue{background-color:#5500D4;}.k-dropdownouter-members-grey{background-color:#4D4D4D;}.k-dropdownouter-members-purple{background-color:#672178;}.k-dropdownouter-members-red{background-color:#A02C2C;}.k-dropdownouter-part{}.k-dropdownouter-part-default{background-color:#CA5842;}.k-dropdownouter-part-green{background-color:#0A0;}.k-dropdownouter-part-blue{background-color:#60F;}.k-dropdownouter-part-grey{background-color:#666;}.k-dropdownouter-part-purple{background-color:#892CA0;}.k-dropdownouter-part-red{background-color:#C83737;}.k-dropdownouter-tags{}.k-dropdownouter-tags-default{background-color:#87501E;}.k-dropdownouter-tags-green{background-color:#00D400;}.k-dropdownouter-tags-blue{background-color:#95F;}.k-dropdownouter-tags-grey{background-color:gray;}.k-dropdownouter-tags-purple{background-color:#AB37C8;}.k-dropdownouter-tags-red{background-color:#D35F5F;}.k-dropdownouter-summary{}.k-dropdownouter-summary-default{background-color:#9F734B;}.k-dropdownouter-summary-green{background-color:#4CE14C;}.k-dropdownouter-summary-blue{background-color:#69A5FF;}.k-dropdownouter-summary-grey{background-color:#A6A6A6;}.k-dropdownouter-summary-purple{background-color:#C473D8;}.k-dropdownouter-summary-red{background-color:#E08F8F;}.k-dropdowninner{margin:0 3px 1px;background:green;background-color:#FFF;/* padding: 3px; */}.k-dropdownlabel{color:#FFF;cursor:pointer;}.k-dropdownlabel .gwt-Label{margin:0 5px 0 0;width:100%;}.k-dropdownlabel img{margin:0 3px 0 1px;}/* WsTheme */.k-wstheme-icon-default{background:#FF8C00;}.k-wstheme-icon-green{background:green;}.k-wstheme-icon-blue{background:blue;}.k-wstheme-icon-grey{background:grey;}.k-wstheme-icon-purple{background:purple;}.k-wstheme-icon-red{background:red;}/* Tool selector items */.k-toolselectoritem{width:auto;margin-bottom:5px;cursor:pointer;}.k-toolselectoritem-sel{}.k-toolselectoritem-notsel-default{background:#FFE9A5;}.k-toolselectoritem-notsel-green{background:#D6F4D6;}.k-toolselectoritem-notsel-blue{background:#D7D7F4;}.k-toolselectoritem-notsel-grey{background:#E6E6E6;}.k-toolselectoritem-notsel-purple{background:#EED7F4;}.k-toolselectoritem-notsel-red{background:#FFD5D5;}.k-toolselectoritem-sel a{color:#FFF;padding:0 9px;text-decoration:none;}.k-toolselectoritem-sel a:hover{text-decoration:none;}.k-toolselectoritem-notsel{}.k-toolselectoritem-notsel a{color:#00F;padding:0 9px;text-decoration:none;}.k-toolselectoritem-notsel a:hover{text-decoration:underline;}/* others */.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;color:gray;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2008-10-17 02:27:46 UTC (rev 916) @@ -116,55 +116,55 @@ background-color: #FFF; } -.k-entity-default .x-layout-split { +.k-entity-default .x-layout-split, .k-entity-default .x-layout-collapsed { background: #DD8A3D none repeat scroll 0% 50%; } -.k-entity-green .x-layout-split { +.k-entity-green .x-layout-split, .k-entity-green .x-layout-collapsed { background: #5FD35F none repeat scroll 0% 50%; } -.k-entity-blue .x-layout-split { +.k-entity-blue .x-layout-split, .k-entity-blue .x-layout-collapsed { background: #0066FF none repeat scroll 0% 50%; } -.k-entity-grey .x-layout-split { +.k-entity-grey .x-layout-split, .k-entity-grey .x-layout-collapsed { background: #4D4D4D none repeat scroll 0% 50%; } -.k-entity-purple .x-layout-split { +.k-entity-purple .x-layout-split, .k-entity-purple .x-layout-collapsed { background: #660080 none repeat scroll 0% 50%; } -.k-entity-red .x-layout-split { +.k-entity-red .x-layout-split, .k-entity-red .x-layout-collapsed { background: #D40000 none repeat scroll 0% 50%; } -.k-entityworkspace .x-layout-split { +.k-entityworkspace .x-layout-split, .k-entityworkspace .x-layout-collapsed { background: transparent none repeat scroll 0% 50%; } -.k-entityworkspace-default .x-layout-split { +.k-entityworkspace-default .x-layout-split, .k-entityworkspace-default .x-layout-collapsed { background: #DEAA87 none repeat scroll 0% 50%; } -.k-entityworkspace-green .x-layout-split { +.k-entityworkspace-green .x-layout-split, .k-entityworkspace-green .x-layout-collapsed { background: #DCE8AB none repeat scroll 0% 50%; } -.k-entityworkspace-blue .x-layout-split { +.k-entityworkspace-blue .x-layout-split, .k-entityworkspace-blue .x-layout-collapsed { background: #D5D5FF none repeat scroll 0% 50%; } -.k-entityworkspace-grey .x-layout-split { +.k-entityworkspace-grey .x-layout-split, .k-entityworkspace-grey .x-layout-collapsed { background: #999999 none repeat scroll 0% 50%; } -.k-entityworkspace-purple .x-layout-split { +.k-entityworkspace-purple .x-layout-split, .k-entityworkspace-purple .x-layout-collapsed { background: #A793AC none repeat scroll 0% 50%; } -.k-entityworkspace-red .x-layout-split { +.k-entityworkspace-red .x-layout-split, .k-entityworkspace-red .x-layout-collapsed { background: #FF5555 none repeat scroll 0% 50%; } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngine.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngine.java 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngine.java 2008-10-17 02:27:46 UTC (rev 916) @@ -20,6 +20,8 @@ package org.ourproject.kune.chat.client; public interface ChatEngine { + void addNewBuddie(String shortName); + ChatOptions getChatOptions(); void joinRoom(String roomName, String userAlias); Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java 2008-10-17 02:27:46 UTC (rev 916) @@ -22,6 +22,7 @@ import java.util.Date; import org.ourproject.kune.platf.client.services.I18nTranslationService; +import org.ourproject.kune.workspace.client.site.Site; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; @@ -52,6 +53,10 @@ this.ws = ws; } + public void addNewBuddie(String shortName) { + Site.important("In development (emite)"); + } + public ChatOptions getChatOptions() { return chatOptions; } 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 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java 2008-10-17 02:27:46 UTC (rev 916) @@ -9,66 +9,66 @@ private final HashMap<String, ActionCollection<T>> actions; public ActionRegistry() { - actions = new HashMap<String, ActionCollection<T>>(); + actions = new HashMap<String, ActionCollection<T>>(); } - public void addAction(final ActionDescriptor<T> action, final String... contentTypeIds) { - for (final String contentTypeId : contentTypeIds) { - final ActionCollection<T> actionColl = getActions(contentTypeId); - actionColl.add(action); - } + public void addAction(final ActionDescriptor<T> action, final String... typeIds) { + for (final String contentTypeId : typeIds) { + final ActionCollection<T> actionColl = getActions(contentTypeId); + actionColl.add(action); + } } - public ActionItemCollection<T> getCurrentActions(final T item, final String contentTypeId, final boolean isLogged, - final AccessRightsDTO rights, final boolean toolbarItems) { - final ActionItemCollection<T> collection = new ActionItemCollection<T>(); + public ActionItemCollection<T> getCurrentActions(final T item, final String typeId, final boolean isLogged, + final AccessRightsDTO rights, final boolean toolbarItems) { + final ActionItemCollection<T> collection = new ActionItemCollection<T>(); - for (final ActionDescriptor<T> action : getActions(contentTypeId)) { - if (mustAdd(isLogged, rights, action)) { - if (toolbarItems) { - if (action instanceof ActionToolbarButtonDescriptor<?> - || action instanceof ActionToolbarMenuDescriptor<?>) { - collection.add(new ActionItem<T>(action, item)); - } - } else { - if (action instanceof ActionMenuItemDescriptor<?> - || action instanceof ActionToolbarMenuAndItemDescriptor<?> - || action instanceof ActionToolbarButtonAndItemDescriptor<?>) { - collection.add(new ActionItem<T>(action, item)); - } - } - } - } - return collection; + for (final ActionDescriptor<T> action : getActions(typeId)) { + if (mustAdd(isLogged, rights, action)) { + if (toolbarItems) { + if (action instanceof ActionToolbarButtonDescriptor<?> + || action instanceof ActionToolbarMenuDescriptor<?>) { + collection.add(new ActionItem<T>(action, item)); + } + } else { + if (action instanceof ActionMenuItemDescriptor<?> + || action instanceof ActionToolbarMenuAndItemDescriptor<?> + || action instanceof ActionToolbarButtonAndItemDescriptor<?>) { + collection.add(new ActionItem<T>(action, item)); + } + } + } + } + return collection; } - public void removeAction(final String contentTypeId, final ActionDescriptor<T> action) { - actions.get(contentTypeId).remove(action); + public void removeAction(final String typeId, final ActionDescriptor<T> action) { + actions.get(typeId).remove(action); } - private ActionCollection<T> getActions(final String contentTypeId) { - ActionCollection<T> actionColl = actions.get(contentTypeId); - if (actionColl == null) { - actionColl = new ActionCollection<T>(); - actions.put(contentTypeId, actionColl); - } - return actionColl; + private ActionCollection<T> getActions(final String typeId) { + ActionCollection<T> actionColl = actions.get(typeId); + if (actionColl == null) { + actionColl = new ActionCollection<T>(); + actions.put(typeId, actionColl); + } + return actionColl; } private boolean mustAdd(final boolean isLogged, final AccessRightsDTO rights, final ActionDescriptor<T> action) { - if (action.mustBeAuthenticated()) { - if (!isLogged) { - return false; - } - } - switch (action.getAccessRol()) { - case Administrator: - return rights.isAdministrable(); - case Editor: - return rights.isEditable(); - case Viewer: - default: - return rights.isVisible(); - } + if (action.mustBeAuthenticated()) { + if (!isLogged) { + return false; + } + } + switch (action.getAccessRol()) { + case Administrator: + return rights.isAdministrable(); + case Editor: + return rights.isEditable(); + case Viewer: + default: + return rights.isVisible(); + } } } Added: trunk/src/main/java/org/ourproject/kune/platf/client/actions/GroupActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/GroupActionRegistry.java 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/GroupActionRegistry.java 2008-10-17 02:27:46 UTC (rev 916) @@ -0,0 +1,6 @@ +package org.ourproject.kune.platf.client.actions; + +import org.ourproject.kune.platf.client.dto.GroupDTO; + +public class GroupActionRegistry extends ActionRegistry<GroupDTO> { +} Added: trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java 2008-10-17 02:27:46 UTC (rev 916) @@ -0,0 +1,56 @@ +package org.ourproject.kune.platf.client.actions; + +import java.util.HashMap; + +import com.calclab.suco.client.listener.Listener; +import com.google.gwt.user.client.Command; +import com.google.gwt.user.client.DeferredCommand; +import com.gwtext.client.core.EventObject; +import com.gwtext.client.widgets.menu.BaseItem; +import com.gwtext.client.widgets.menu.Item; +import com.gwtext.client.widgets.menu.Menu; +import com.gwtext.client.widgets.menu.event.BaseItemListenerAdapter; + +public class MenuItemsContainer<T> { + private final HashMap<String, Menu> contextMenus; + + public MenuItemsContainer() { + contextMenus = new HashMap<String, Menu>(); + } + + public void clear() { + contextMenus.clear(); + } + + public void createItemMenu(final String id, final ActionItemCollection<T> actionCollection, + final Listener<ActionItem<T>> listener) { + DeferredCommand.addCommand(new Command() { + public void execute() { + Menu menu = null; + if (actionCollection != null) { + menu = new Menu(); + // Remove if when retrieved rights of siblings + for (final ActionItem<T> actionItem : actionCollection) { + final ActionDescriptor<T> action = actionItem.getAction(); + if (actionItem.checkEnabling()) { + final Item item = new Item(action.getText()); + item.setIcon(action.getIconUrl()); + menu.addItem(item); + item.addListener(new BaseItemListenerAdapter() { + @Override + public void onClick(final BaseItem item, final EventObject e) { + listener.onEvent(actionItem); + } + }); + } + } + } + contextMenus.put(id, menu); + } + }); + } + + public Menu get(String id) { + return contextMenus.get(id); + } +} Added: trunk/src/main/java/org/ourproject/kune/platf/client/actions/UserActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/UserActionRegistry.java 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/UserActionRegistry.java 2008-10-17 02:27:46 UTC (rev 916) @@ -0,0 +1,9 @@ +package org.ourproject.kune.platf.client.actions; + +import org.ourproject.kune.platf.client.dto.UserSimpleDTO; + +public class UserActionRegistry extends ActionRegistry<UserSimpleDTO> { + + public static final String GENERAL = "genActions"; + +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserBuddiesDataDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserBuddiesDataDTO.java 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserBuddiesDataDTO.java 2008-10-17 02:27:46 UTC (rev 916) @@ -27,4 +27,9 @@ public void setOtherExternalBuddies(int otherExternalBuddies) { this.otherExternalBuddies = otherExternalBuddies; } + + @Override + public String toString() { + return "UserBuddiesDataDTO[ext: " + otherExternalBuddies + " / int: " + buddies + "]"; + } } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-17 02:27:46 UTC (rev 916) @@ -5,6 +5,8 @@ import org.ourproject.kune.platf.client.actions.ContentIconsRegistry; import org.ourproject.kune.platf.client.actions.ContextActionRegistry; import org.ourproject.kune.platf.client.actions.DragDropContentRegistry; +import org.ourproject.kune.platf.client.actions.GroupActionRegistry; +import org.ourproject.kune.platf.client.actions.UserActionRegistry; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; @@ -352,6 +354,20 @@ } }); + register(Singleton.class, new Factory<GroupActionRegistry>(GroupActionRegistry.class) { + @Override + public GroupActionRegistry create() { + return new GroupActionRegistry(); + } + }); + + register(Singleton.class, new Factory<UserActionRegistry>(UserActionRegistry.class) { + @Override + public UserActionRegistry create() { + return new UserActionRegistry(); + } + }); + register(Singleton.class, new Factory<DragDropContentRegistry>(DragDropContentRegistry.class) { @Override public DragDropContentRegistry create() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java 2008-10-17 02:27:46 UTC (rev 916) @@ -1,6 +1,9 @@ package org.ourproject.kune.platf.client.services; +import org.ourproject.kune.chat.client.ChatClientTool; +import org.ourproject.kune.platf.client.actions.ActionManager; import org.ourproject.kune.platf.client.actions.ContentIconsRegistry; +import org.ourproject.kune.platf.client.actions.UserActionRegistry; import org.ourproject.kune.platf.client.app.ApplicationComponentGroup; import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; @@ -334,9 +337,10 @@ @Override public BuddiesSummary create() { final BuddiesSummaryPresenter presenter = new BuddiesSummaryPresenter($(StateManager.class), - $(Session.class)); + $(Session.class), $(UserActionRegistry.class), $(I18nTranslationService.class), + $$(ChatClientTool.class)); final BuddiesSummaryPanel panel = new BuddiesSummaryPanel(presenter, $(WorkspaceSkeleton.class), - $(I18nTranslationService.class)); + $(I18nTranslationService.class), $(ActionManager.class)); presenter.init(panel); return presenter; } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java 2008-10-17 02:27:46 UTC (rev 916) @@ -30,4 +30,9 @@ public void setOtherExternalBuddies(int otherExternalBuddies) { this.otherExternalBuddies = otherExternalBuddies; } + + @Override + public String toString() { + return "UserBuddiesData[ext: " + otherExternalBuddies + " / int: " + buddies + "]"; + } } 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 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2008-10-17 02:27:46 UTC (rev 916) @@ -20,20 +20,16 @@ package org.ourproject.kune.workspace.client.ctxnav; -import java.util.HashMap; - -import org.ourproject.kune.platf.client.actions.ActionDescriptor; import org.ourproject.kune.platf.client.actions.ActionItem; -import org.ourproject.kune.platf.client.actions.ActionItemCollection; import org.ourproject.kune.platf.client.actions.ActionManager; +import org.ourproject.kune.platf.client.actions.MenuItemsContainer; import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.services.I18nTranslationService; import org.ourproject.kune.workspace.client.site.Site; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.calclab.suco.client.listener.Listener; import com.gwtext.client.core.EventObject; import com.gwtext.client.core.ExtElement; import com.gwtext.client.data.Node; @@ -44,10 +40,7 @@ import com.gwtext.client.widgets.event.ContainerListenerAdapter; import com.gwtext.client.widgets.event.EditorListenerAdapter; import com.gwtext.client.widgets.form.TextField; -import com.gwtext.client.widgets.menu.BaseItem; -import com.gwtext.client.widgets.menu.Item; import com.gwtext.client.widgets.menu.Menu; -import com.gwtext.client.widgets.menu.event.BaseItemListenerAdapter; import com.gwtext.client.widgets.tree.DropNodeCallback; import com.gwtext.client.widgets.tree.MultiSelectionModel; import com.gwtext.client.widgets.tree.TreeEditor; @@ -60,12 +53,12 @@ private TreePanel treePanel; private TreeEditor treeEditor; - private final HashMap<String, Menu> contextMenus; private final WorkspaceSkeleton ws; private boolean fireOnTextChange; private boolean isEditable; private final ActionManager actionManager; private final ContextNavigatorPresenter presenter; + private final MenuItemsContainer<StateToken> menuItemsContainer; public ContextNavigatorPanel(final ContextNavigatorPresenter presenter, final I18nTranslationService i18n, final WorkspaceSkeleton ws, final ActionManager actionManager) { @@ -73,9 +66,9 @@ this.ws = ws; this.actionManager = actionManager; - contextMenus = new HashMap<String, Menu>(); fireOnTextChange = true; isEditable = false; + menuItemsContainer = new MenuItemsContainer<StateToken>(); } public void addItem(final ContextNavigatorItem item) { @@ -94,7 +87,12 @@ if (tooltip != null) { child.setTooltip(tooltip); } - createItemMenu(nodeId, item.getActionCollection()); + menuItemsContainer.createItemMenu(nodeId, item.getActionCollection(), + new Listener<ActionItem<StateToken>>() { + public void onEvent(ActionItem<StateToken> actionItem) { + doAction(actionItem); + } + }); final TreeNode parent = treePanel.getNodeById(item.getParentId()); if (parent != null) { child.addListener(new TreeNodeListenerAdapter() { @@ -154,7 +152,7 @@ treePanel.clear(); treePanel = null; } - contextMenus.clear(); + menuItemsContainer.clear(); } public void editItem(final String id) { @@ -205,31 +203,6 @@ } } - private void createItemMenu(final String nodeId, final ActionItemCollection<StateToken> actionCollection) { - DeferredCommand.addCommand(new Command() { - public void execute() { - Menu menu = null; - if (actionCollection != null) { - menu = new Menu(); - // Remove if when retrieved rights of siblings - for (final ActionItem<StateToken> actionItem : actionCollection) { - final ActionDescriptor<StateToken> action = actionItem.getAction(); - final Item item = new Item(action.getText()); - item.setIcon(action.getIconUrl()); - menu.addItem(item); - item.addListener(new BaseItemListenerAdapter() { - @Override - public void onClick(final BaseItem item, final EventObject e) { - doAction(actionItem); - } - }); - } - } - contextMenus.put(nodeId, menu); - } - }); - } - private void createTreePanel(final String rootId, final String text, final StateToken stateToken) { if (treePanel != null) { clear(); @@ -263,7 +236,7 @@ @Override public void onContextMenu(final TreeNode node, final EventObject e) { - final Menu menu = contextMenus.get(node.getId()); + final Menu menu = menuItemsContainer.get(node.getId()); if (menu != null && menu.getItems().length > 0) { menu.showAt(e.getXY()); } else { 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 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2008-10-17 02:27:46 UTC (rev 916) @@ -1,10 +1,15 @@ package org.ourproject.kune.workspace.client.socialnet; +import org.ourproject.kune.platf.client.actions.ActionItem; +import org.ourproject.kune.platf.client.actions.ActionItemCollection; +import org.ourproject.kune.platf.client.actions.ActionManager; +import org.ourproject.kune.platf.client.actions.MenuItemsContainer; import org.ourproject.kune.platf.client.dto.UserSimpleDTO; import org.ourproject.kune.platf.client.services.I18nTranslationService; import org.ourproject.kune.workspace.client.skel.SummaryPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import com.calclab.suco.client.listener.Listener; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; @@ -12,6 +17,7 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; +import com.gwtext.client.widgets.menu.Menu; public class BuddiesSummaryPanel extends SummaryPanel implements BuddiesSummaryView { @@ -27,6 +33,7 @@ vp.add(nick); vp.addStyleName("kune-Margin-Small-trbl"); vp.addStyleName("kune-pointer"); + vp.addStyleName("kune-floatleft"); nick.addClickListener(clickListener); icon.addClickListener(clickListener); initWidget(vp); @@ -40,19 +47,22 @@ nick.setText(nickName); } } + private final MenuItemsContainer<UserSimpleDTO> menuItemsContainer; private final FlowPanel flowPanel; private final Label otherBuddiesLabel; private final I18nTranslationService i18n; - private final BuddiesSummaryPresenter presenter; + private final ActionManager actionManager; public BuddiesSummaryPanel(final BuddiesSummaryPresenter presenter, final WorkspaceSkeleton ws, - I18nTranslationService i18n) { + I18nTranslationService i18n, ActionManager actionManager) { super(i18n.t("Buddies"), i18n.t("Buddies of this user"), ws); - this.presenter = presenter; + this.actionManager = actionManager; + menuItemsContainer = new MenuItemsContainer<UserSimpleDTO>(); this.i18n = i18n; VerticalPanel vp = new VerticalPanel(); flowPanel = new FlowPanel(); otherBuddiesLabel = new Label(); + otherBuddiesLabel.addStyleName("kune-Margin-Small-trbl"); vp.add(flowPanel); vp.add(otherBuddiesLabel); super.add(vp); @@ -60,27 +70,45 @@ clear(); } - public void addBuddie(final UserSimpleDTO user) { + public void addBuddie(final UserSimpleDTO user, ActionItemCollection<UserSimpleDTO> actionCollection) { ClickListener listener = new ClickListener() { public void onClick(Widget sender) { - presenter.onClick(user); + Menu menu = menuItemsContainer.get(user.getShortName()); + if (menu.getItems().length > 0) { + menu.showAt(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 5); + } } }; + menuItemsContainer.createItemMenu(user.getShortName(), actionCollection, + new Listener<ActionItem<UserSimpleDTO>>() { + public void onEvent(ActionItem<UserSimpleDTO> actionItem) { + doAction(actionItem); + } + }); flowPanel.add(new BuddieWidget(user.getShortName(), listener)); } @Override public void clear() { flowPanel.clear(); - otherBuddiesLabel.setText(i18n.t("This user has no buddies")); + clearOtherUsers(); + menuItemsContainer.clear(); super.doLayoutIfNeeded(); } - public void setOtherUsers(int otherExternalBuddies) { - if (otherExternalBuddies > 0) { - otherBuddiesLabel.setText(i18n.t("and [%d] external users", otherExternalBuddies)); - } else { - otherBuddiesLabel.setText(""); - } + public void clearOtherUsers() { + otherBuddiesLabel.setText(""); } + + public void setNoBuddies() { + otherBuddiesLabel.setText(i18n.t("This user has no buddies")); + } + + public void setOtherUsers(String text) { + otherBuddiesLabel.setText(text); + } + + private void doAction(final ActionItem<UserSimpleDTO> actionItem) { + actionManager.doAction(actionItem); + } } 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 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2008-10-17 02:27:46 UTC (rev 916) @@ -1,28 +1,49 @@ package org.ourproject.kune.workspace.client.socialnet; +import java.util.List; + +import org.ourproject.kune.chat.client.ChatClientTool; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.GroupDTO; +import org.ourproject.kune.platf.client.actions.ActionEnableCondition; +import org.ourproject.kune.platf.client.actions.ActionMenuItemDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarButtonAndItemDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; +import org.ourproject.kune.platf.client.actions.UserActionRegistry; +import org.ourproject.kune.platf.client.dto.AccessRightsDTO; +import org.ourproject.kune.platf.client.dto.AccessRolDTO; import org.ourproject.kune.platf.client.dto.GroupType; import org.ourproject.kune.platf.client.dto.StateDTO; import org.ourproject.kune.platf.client.dto.UserBuddiesDataDTO; import org.ourproject.kune.platf.client.dto.UserSimpleDTO; +import org.ourproject.kune.platf.client.services.I18nTranslationService; import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.ioc.Provider; +import com.calclab.suco.client.listener.Listener; public class BuddiesSummaryPresenter implements BuddiesSummary { private BuddiesSummaryView view; private final StateManager stateManager; + private final UserActionRegistry actionRegistry; + private final I18nTranslationService i18n; + private final Provider<ChatClientTool> chatClientToolProvider; + private final Session session; - public BuddiesSummaryPresenter(StateManager stateManager, final Session session) { + public BuddiesSummaryPresenter(StateManager stateManager, final Session session, UserActionRegistry actionRegistry, + I18nTranslationService i18n, final Provider<ChatClientTool> chatClientToolProvider) { this.stateManager = stateManager; - stateManager.onGroupChanged(new Listener2<GroupDTO, GroupDTO>() { - public void onEvent(GroupDTO param1, GroupDTO param2) { - setState(session.getCurrentState()); + this.session = session; + this.actionRegistry = actionRegistry; + this.i18n = i18n; + this.chatClientToolProvider = chatClientToolProvider; + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(StateDTO state) { + setState(state); } }); + registerActions(); } public View getView() { @@ -33,22 +54,66 @@ this.view = view; } - public void onClick(UserSimpleDTO user) { - stateManager.gotoToken(user.getShortName()); - } - protected void setState(StateDTO state) { if (state.getGroup().getType().equals(GroupType.PERSONAL)) { view.clear(); UserBuddiesDataDTO userBuddies = state.getUserBuddies(); - for (UserSimpleDTO user : userBuddies.getBuddies()) { - view.addBuddie(user); + List<UserSimpleDTO> buddies = userBuddies.getBuddies(); + for (UserSimpleDTO user : buddies) { + view.addBuddie(user, actionRegistry.getCurrentActions(user, UserActionRegistry.GENERAL, session + .isLogged(), new AccessRightsDTO(true, true, true), false)); } - view.setOtherUsers(userBuddies.getOtherExternalBuddies()); + boolean hasLocalBuddies = buddies.size() > 0; + int numExtBuddies = userBuddies.getOtherExternalBuddies(); + if (numExtBuddies > 0) { + if (hasLocalBuddies) { + // i18n: plural + view.setOtherUsers(i18n.t( + numExtBuddies == 1 ? "and [%d] external user" : "and [%d] external users", numExtBuddies)); + } else { + view.setOtherUsers(i18n.t(numExtBuddies == 1 ? "[%d] external user" : "[%d] external users", + numExtBuddies)); + } + } else { + if (hasLocalBuddies) { + view.clearOtherUsers(); + } else { + view.setNoBuddies(); + } + } view.show(); } else { view.hide(); } } + private void registerActions() { + final ActionToolbarButtonAndItemDescriptor<UserSimpleDTO> addAsBuddie = new ActionToolbarButtonAndItemDescriptor<UserSimpleDTO>( + AccessRolDTO.Viewer, ActionToolbarPosition.bottombar, new Listener<UserSimpleDTO>() { + public void onEvent(final UserSimpleDTO group) { + chatClientToolProvider.get().getChat().addNewBuddie(group.getShortName()); + } + }); + addAsBuddie.setMustBeAuthenticated(true); + addAsBuddie.setTextDescription(i18n.t("Add as buddie")); + addAsBuddie.setIconUrl("images/add-green.png"); + addAsBuddie.setEnableCondition(new ActionEnableCondition<UserSimpleDTO>() { + public boolean mustBeEnabled(UserSimpleDTO item) { + return !session.getCurrentUserInfo().getShortName().equals(item.getShortName()); + } + }); + actionRegistry.addAction(addAsBuddie, UserActionRegistry.GENERAL); + + final ActionMenuItemDescriptor<UserSimpleDTO> go = new ActionMenuItemDescriptor<UserSimpleDTO>( + AccessRolDTO.Viewer, new Listener<UserSimpleDTO>() { + public void onEvent(final UserSimpleDTO user) { + stateManager.gotoToken(user.getShortName()); + } + }); + go.setMustBeAuthenticated(false); + go.setTextDescription(i18n.t("Visit this user homepage")); + go.setIconUrl("images/group-home.gif"); + actionRegistry.addAction(go, UserActionRegistry.GENERAL); + } + } 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 2008-10-16 21:41:42 UTC (rev 915) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java 2008-10-17 02:27:46 UTC (rev 916) @@ -1,17 +1,22 @@ package org.ourproject.kune.workspace.client.socialnet; import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.actions.ActionItemCollection; import org.ourproject.kune.platf.client.dto.UserSimpleDTO; public interface BuddiesSummaryView extends View { - void addBuddie(UserSimpleDTO user); + void addBuddie(UserSimpleDTO user, ActionItemCollection<UserSimpleDTO> actionCollection); void clear(); + void clearOtherUsers(); + void hide(); - void setOtherUsers(int otherExternalBuddies); + void setNoBuddies(); + void setOtherUsers(String text); + void show(); }

1 0

16 Oct '08

Author: vjrj Date: 2008-10-16 23:41:42 +0200 (Thu, 16 Oct 2008) New Revision: 915 Modified: trunk/INSTALL trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/MenuItem.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.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/themes/WsThemePresenter.java Log: Incomplete - task User buddies SocialNetwork part Complete - task emite and suco updated Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/INSTALL 2008-10-16 21:41:42 UTC (rev 915) @@ -110,6 +110,10 @@ See emite (our xmpp software) Server Compatibility: http://code.google.com/p/emite/wiki/ServerCompatibility - Configure the 'Server Name' (during installation of openfire, or after editing 'Server Settings') with "localhost" initially (See kune.chat.roomHost in kune.properties if you want to use other values). - Configure the 'Group chat service' (in Group chat tab) with "rooms" instead of "conference". +- Change in 'System Properties': + provider.auth.className to org.jivesoftware.openfire.auth.JDBCAuthProvider + provider.user.className to org.jivesoftware.openfire.user.JDBCUserProvider + - Enable "HTTP Bind Settings" and check the port is not used by other service in your machine. - Edit the openfire.xml In debian (with a .deb installation) you can to edit the configuration in /etc/openfire... Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-10-16 21:41:42 UTC (rev 915) @@ -217,7 +217,6 @@ final ActionToolbarMenuDescriptor<StateToken> refreshCtx = new ActionToolbarMenuDescriptor<StateToken>( AccessRolDTO.Viewer, ActionToolbarPosition.topbar, new Listener<StateToken>() { public void onEvent(final StateToken stateToken) { - Site.important("Refresh with state token: " + stateToken); stateManager.reload(); contextNavigator.selectItem(stateToken); } 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 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2008-10-16 21:41:42 UTC (rev 915) @@ -28,6 +28,7 @@ import org.ourproject.kune.workspace.client.site.Site; import com.allen_sauer.gwt.log.client.Log; +import com.calclab.suco.client.event.Events; import com.calclab.suco.client.listener.Event0; import com.calclab.suco.client.listener.Listener0; import com.google.gwt.user.client.Command; @@ -44,62 +45,63 @@ private final Event0 onApplicationStop; public ApplicationDefault(final Session session) { - this.session = session; - this.onApplicationStart = new Event0("onApplicationStart"); - this.onApplicationStop = new Event0("onApplicationStop"); - Window.addWindowCloseListener(new WindowCloseListener() { - public void onWindowClosed() { - } + this.session = session; + this.onApplicationStart = Events.create("onApplicationStart"); + this.onApplicationStop = Events.create("onApplicationStop"); + Window.addWindowCloseListener(new WindowCloseListener() { + public void onWindowClosed() { + } - public String onWindowClosing() { - stop(); - return null; - } - }); + public String onWindowClosing() { + stop(); + return null; + } + }); } public void onApplicationStart(final Listener0 listener) { - onApplicationStart.add(listener); + onApplicationStart.add(listener); } public void onApplicationStop(final Listener0 listener) { - onApplicationStop.add(listener); + onApplicationStop.add(listener); } public void start() { - onApplicationStart.fire(); - PrefetchUtilities.preFetchImpImages(); - getInitData(); - final Timer prefetchTimer = new Timer() { - public void run() { - PrefetchUtilities.doTasksDeferred(); - } - }; - prefetchTimer.schedule(20000); + onApplicationStart.fire(); + PrefetchUtilities.preFetchImpImages(); + getInitData(); + final Timer prefetchTimer = new Timer() { + @Override + public void run() { + PrefetchUtilities.doTasksDeferred(); + } + }; + prefetchTimer.schedule(20000); } private void getInitData() { - final SiteServiceAsync server = SiteService.App.getInstance(); - server.getInitData(session.getUserHash(), new AsyncCallback<InitDataDTO>() { - public void onFailure(final Throwable error) { - RootPanel.get("kuneinitialcurtain").setVisible(false); - Site.error("Error fetching initial data"); - Log.debug(error.getMessage()); - } + final SiteServiceAsync server = SiteService.App.getInstance(); + server.getInitData(session.getUserHash(), new AsyncCallback<InitDataDTO>() { + public void onFailure(final Throwable error) { + RootPanel.get("kuneinitialcurtain").setVisible(false); + Site.error("Error fetching initial data"); + Log.debug(error.getMessage()); + } - public void onSuccess(final InitDataDTO initData) { - session.setInitData(initData); - session.setCurrentUserInfo(initData.getUserInfo()); - DeferredCommand.addCommand(new Command() { - public void execute() { - RootPanel.get("kuneinitialcurtain").setVisible(false); - } - }); - } - }); + public void onSuccess(final InitDataDTO initData) { + session.setInitData(initData); + session.setCurrentUserInfo(initData.getUserInfo()); + DeferredCommand.addCommand(new Command() { + public void execute() { + RootPanel.get("kuneinitialcurtain").setVisible(false); + } + }); + } + }); } private void stop() { - onApplicationStop.fire(); + onApplicationStop.fire(); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java 2008-10-16 21:41:42 UTC (rev 915) @@ -35,6 +35,7 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.allen_sauer.gwt.log.client.Log; +import com.calclab.suco.client.event.Events; import com.calclab.suco.client.ioc.Provider; import com.calclab.suco.client.listener.Event0; import com.calclab.suco.client.listener.Listener0; @@ -54,7 +55,7 @@ this.i18n = i18n; this.wsProvider = wsProvider; this.stateManagerProvider = stateManagerProvider; - this.onSessionExpired = new Event0("onSessionExpired"); + this.onSessionExpired = Events.create("onSessionExpired"); } public void doSessionExpired() { @@ -82,6 +83,7 @@ logException(e); doSessionExpired(); } catch (final NoDefaultContentException e) { + Site.info("This user don't have a homepage"); stateManagerProvider.get().restorePreviousState(); } catch (final UserMustBeLoggedException e) { logException(e); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-16 21:41:42 UTC (rev 915) @@ -77,6 +77,8 @@ import org.ourproject.kune.workspace.client.themes.WsThemePresenter; import org.ourproject.kune.workspace.client.title.EntityTitle; +import com.calclab.suco.client.event.DirectEventFactory; +import com.calclab.suco.client.event.Events; import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.AbstractModule; import com.calclab.suco.client.ioc.module.Factory; @@ -91,7 +93,7 @@ @Override public void onInstall() { - + Events.setEventFactory(new DirectEventFactory()); register(Singleton.class, new Factory<Session>(Session.class) { @Override public Session create() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2008-10-16 21:41:42 UTC (rev 915) @@ -60,8 +60,8 @@ this.userServiceProvider = userServiceProvider; languagesArray = null; this.onInitDataReceived = Events.create(InitDataDTO.class, "initDataReceived"); - this.onUserSignIn = new Event<UserInfoDTO>("onUserSignIn"); - this.onUserSignOut = new Event0("onUserSignOut"); + this.onUserSignIn = Events.create(UserInfoDTO.class, "onUserSignIn"); + this.onUserSignOut = Events.create("onUserSignOut"); } public void check(final AsyncCallbackSimple<?> callback) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2008-10-16 21:41:42 UTC (rev 915) @@ -34,6 +34,7 @@ import org.ourproject.kune.workspace.client.site.Site; import com.allen_sauer.gwt.log.client.Log; +import com.calclab.suco.client.event.Events; import com.calclab.suco.client.listener.Event; import com.calclab.suco.client.listener.Event2; import com.calclab.suco.client.listener.Listener; @@ -57,10 +58,10 @@ this.session = session; this.history = history; this.oldState = null; - this.onStateChanged = new Event<StateDTO>("onStateChanged"); - this.onGroupChanged = new Event2<GroupDTO, GroupDTO>("onGroupChanged"); - this.onToolChanged = new Event2<String, String>("onToolChanged"); - this.onSocialNetworkChanged = new Event<StateDTO>("onSocialNetworkChanged"); + this.onStateChanged = Events.create(StateDTO.class, "onStateChanged"); + this.onGroupChanged = Events.create(GroupDTO.class, GroupDTO.class, "onGroupChanged"); + this.onToolChanged = Events.create(String.class, String.class, "onToolChanged"); + this.onSocialNetworkChanged = Events.create(StateDTO.class, "onSocialNetworkChanged"); session.onUserSignIn(new Listener<UserInfoDTO>() { public void onEvent(final UserInfoDTO parameter) { if (oldState != null) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/MenuItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/MenuItem.java 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/MenuItem.java 2008-10-16 21:41:42 UTC (rev 915) @@ -1,34 +1,29 @@ package org.ourproject.kune.platf.client.ui; -import com.calclab.suco.client.listener.Event; import com.calclab.suco.client.listener.Listener; public class MenuItem<T> { final String icon; final String title; - private final Event<T> onClick; + private final Listener<T> listener; public MenuItem(final String icon, final String title, final Listener<T> listener) { - this.icon = icon; - this.title = title; - this.onClick = new Event<T>("onClick"); - onClick(listener); + this.icon = icon; + this.title = title; + this.listener = listener; + } public void fire(final T id) { - onClick.fire(id); + listener.onEvent(id); } public String getIcon() { - return icon; + return icon; } public String getTitle() { - return title; + return title; } - - public void onClick(final Listener<T> listener) { - onClick.add(listener); - } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java 2008-10-16 21:41:42 UTC (rev 915) @@ -21,6 +21,7 @@ */ package org.ourproject.kune.platf.client.ui.gridmenu; +import com.calclab.suco.client.event.Events; import com.calclab.suco.client.listener.Event; import com.calclab.suco.client.listener.Listener; @@ -31,7 +32,7 @@ public GridDropConfiguration(final String ddGroupId, final Listener<String> listener) { this.ddGroupId = ddGroupId; - this.onDrop = new Event<String>("onDrop"); + this.onDrop = Events.create(String.class, "onDrop"); this.onDrop(listener); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java 2008-10-16 21:41:42 UTC (rev 915) @@ -4,6 +4,7 @@ import java.util.HashMap; import com.allen_sauer.gwt.log.client.Log; +import com.calclab.suco.client.event.Events; import com.calclab.suco.client.listener.Event; import com.calclab.suco.client.listener.Listener; import com.gwtext.client.core.EventObject; @@ -92,8 +93,8 @@ public GridMenuPanel(final String emptyText, final GridDragConfiguration gridDragConfiguration, final GridDropConfiguration gridDropConfiguration, final boolean grouped, final boolean withCounters, final boolean withTopBar, final boolean withBottomBar, final boolean withEndIcon) { - this.onClick = new Event<String>("onClick"); - this.onDoubleClick = new Event<String>("onDoubleClick"); + this.onClick = Events.create(String.class, "onClick"); + this.onDoubleClick = Events.create(String.class, "onDoubleClick"); this.grouped = grouped; this.withCounters = withCounters; this.withEndIcon = withEndIcon; 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 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2008-10-16 21:41:42 UTC (rev 915) @@ -103,8 +103,9 @@ String domain = "@" + properties.getDomain(); UserBuddiesData buddiesData = new UserBuddiesData(); User user = finder.getByShortName(shortName); - ChatConnection connection = xmppManager.login(user.getShortName(), user.getPassword(), "kserver"); + ChatConnection connection = xmppManager.login(user.getShortName() + domain, user.getPassword(), "kserver"); Collection<RosterEntry> roster = xmppManager.getRoster(connection); + xmppManager.disconnect(connection); for (RosterEntry entry : roster) { switch (entry.getType()) { case both: Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-16 21:41:42 UTC (rev 915) @@ -45,6 +45,7 @@ // accordionLayout.setAnimate(true); // accordionLayout.setActiveOnTop(false); accordionLayout.setFill(true); + accordionLayout.setRenderHidden(true); // entitySummary.setAutoScroll(true); entitySummary.setLayout(accordionLayout); entitySummary.setCls(ENTITY_SUMMARY); 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 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2008-10-16 21:41:42 UTC (rev 915) @@ -5,11 +5,13 @@ import org.ourproject.kune.workspace.client.skel.SummaryPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; public class BuddiesSummaryPanel extends SummaryPanel implements BuddiesSummaryView { @@ -17,12 +19,16 @@ private final Image icon; private final Label nick; - public BuddieWidget(String nickName) { + public BuddieWidget(String nickName, ClickListener clickListener) { VerticalPanel vp = new VerticalPanel(); icon = new Image("images/persons/person2-32.png"); nick = new Label(nickName); vp.add(icon); vp.add(nick); + vp.addStyleName("kune-Margin-Small-trbl"); + vp.addStyleName("kune-pointer"); + nick.addClickListener(clickListener); + icon.addClickListener(clickListener); initWidget(vp); } @@ -37,10 +43,12 @@ private final FlowPanel flowPanel; private final Label otherBuddiesLabel; private final I18nTranslationService i18n; + private final BuddiesSummaryPresenter presenter; public BuddiesSummaryPanel(final BuddiesSummaryPresenter presenter, final WorkspaceSkeleton ws, I18nTranslationService i18n) { super(i18n.t("Buddies"), i18n.t("Buddies of this user"), ws); + this.presenter = presenter; this.i18n = i18n; VerticalPanel vp = new VerticalPanel(); flowPanel = new FlowPanel(); @@ -48,16 +56,24 @@ vp.add(flowPanel); vp.add(otherBuddiesLabel); super.add(vp); + ws.addInSummary(this); + clear(); } - public void addBuddie(UserSimpleDTO user) { - flowPanel.add(new BuddieWidget(user.getShortName())); + public void addBuddie(final UserSimpleDTO user) { + ClickListener listener = new ClickListener() { + public void onClick(Widget sender) { + presenter.onClick(user); + } + }; + flowPanel.add(new BuddieWidget(user.getShortName(), listener)); } @Override public void clear() { flowPanel.clear(); otherBuddiesLabel.setText(i18n.t("This user has no buddies")); + super.doLayoutIfNeeded(); } public void setOtherUsers(int otherExternalBuddies) { 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 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2008-10-16 21:41:42 UTC (rev 915) @@ -14,8 +14,10 @@ public class BuddiesSummaryPresenter implements BuddiesSummary { private BuddiesSummaryView view; + private final StateManager stateManager; public BuddiesSummaryPresenter(StateManager stateManager, final Session session) { + this.stateManager = stateManager; stateManager.onGroupChanged(new Listener2<GroupDTO, GroupDTO>() { public void onEvent(GroupDTO param1, GroupDTO param2) { setState(session.getCurrentState()); @@ -31,6 +33,10 @@ this.view = view; } + public void onClick(UserSimpleDTO user) { + stateManager.gotoToken(user.getShortName()); + } + protected void setState(StateDTO state) { if (state.getGroup().getType().equals(GroupType.PERSONAL)) { view.clear(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java 2008-10-16 19:57:50 UTC (rev 914) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java 2008-10-16 21:41:42 UTC (rev 915) @@ -8,6 +8,7 @@ import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.site.Site; +import com.calclab.suco.client.event.Events; import com.calclab.suco.client.ioc.Provider; import com.calclab.suco.client.listener.Event2; import com.calclab.suco.client.listener.Listener; @@ -22,56 +23,56 @@ private final Session session; public WsThemePresenter(final Session session, final Provider<GroupServiceAsync> groupServiceProvider, - final StateManager stateManager) { - this.session = session; - this.groupServiceProvider = groupServiceProvider; - this.onThemeChanged = new Event2<WsTheme, WsTheme>("onThemeChanged"); - session.onInitDataReceived(new Listener<InitDataDTO>() { - public void onEvent(final InitDataDTO initData) { - view.setThemes(initData.getWsThemes()); - setTheme(new WsTheme(initData.getWsThemes()[0])); - } - }); - stateManager.onStateChanged(new Listener<StateDTO>() { - public void onEvent(final StateDTO state) { - setState(state); - } - }); + final StateManager stateManager) { + this.session = session; + this.groupServiceProvider = groupServiceProvider; + this.onThemeChanged = Events.create(WsTheme.class, WsTheme.class, "onThemeChanged"); + session.onInitDataReceived(new Listener<InitDataDTO>() { + public void onEvent(final InitDataDTO initData) { + view.setThemes(initData.getWsThemes()); + setTheme(new WsTheme(initData.getWsThemes()[0])); + } + }); + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(final StateDTO state) { + setState(state); + } + }); } public void init(final WsThemeView view) { - this.view = view; + this.view = view; } public void onThemeChanged(final Listener2<WsTheme, WsTheme> listener) { - onThemeChanged.add(listener); + onThemeChanged.add(listener); } protected void onChangeGroupWsTheme(final WsTheme newTheme) { - Site.showProgressProcessing(); - groupServiceProvider.get().changeGroupWsTheme(session.getUserHash(), session.getCurrentState().getStateToken(), - newTheme.getName(), new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - setTheme(newTheme); - Site.hideProgress(); - } - }); + Site.showProgressProcessing(); + groupServiceProvider.get().changeGroupWsTheme(session.getUserHash(), session.getCurrentState().getStateToken(), + newTheme.getName(), new AsyncCallbackSimple<Object>() { + public void onSuccess(final Object result) { + setTheme(newTheme); + Site.hideProgress(); + } + }); } private void setState(final StateDTO state) { - setTheme(new WsTheme(state.getGroup().getWorkspaceTheme())); - if (state.getGroupRights().isAdministrable()) { - view.setVisible(true); - } else { - view.setVisible(false); - } + setTheme(new WsTheme(state.getGroup().getWorkspaceTheme())); + if (state.getGroupRights().isAdministrable()) { + view.setVisible(true); + } else { + view.setVisible(false); + } } private void setTheme(final WsTheme newTheme) { - if (previousTheme == null || !previousTheme.equals(newTheme)) { - onThemeChanged.fire(previousTheme, newTheme); - } - previousTheme = newTheme; + if (previousTheme == null || !previousTheme.equals(newTheme)) { + onThemeChanged.fire(previousTheme, newTheme); + } + previousTheme = newTheme; } }

1 0

16 Oct '08

Author: vjrj Date: 2008-10-16 21:57:50 +0200 (Thu, 16 Oct 2008) New Revision: 914 Added: trunk/img/icons/person.svg trunk/img/icons/persons/ trunk/img/icons/persons/person1-16.png trunk/img/icons/persons/person1-32.png trunk/img/icons/persons/person1-85.png trunk/img/icons/persons/person2-16.png trunk/img/icons/persons/person2-32.png trunk/img/icons/persons/person2-85.png trunk/img/icons/persons/person3-16.png trunk/img/icons/persons/person3-32.png trunk/img/icons/persons/person3-85.png trunk/img/icons/persons/person4-16.png trunk/img/icons/persons/person4-32.png trunk/img/icons/persons/person4-85.png trunk/img/icons/persons/person5-16.png trunk/img/icons/persons/person5-32.png trunk/img/icons/persons/person5-85.png trunk/img/icons/persons/person6-16.png trunk/img/icons/persons/person6-32.png trunk/img/icons/persons/person6-85.png trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserBuddiesDataDTO.java trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/ trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person1-16.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person1-32.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person1-85.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person2-16.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person2-32.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person2-85.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person3-16.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person3-32.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person3-85.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person4-16.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person4-32.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person4-85.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person5-16.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person5-32.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person5-85.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person6-16.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person6-32.png trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person6-85.png trunk/src/main/java/org/ourproject/kune/platf/server/sn/ trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummary.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 Removed: trunk/src/main/java/org/ourproject/kune/platf/server/ParticipationData.java Modified: trunk/pom.xml trunk/script/generateBasicUIElements.sh trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManager.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManagerDefault.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneCoreModule.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java trunk/src/main/java/org/ourproject/kune/platf/public/images/person-def.png trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.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/rpc/ContentRPC.java trunk/src/main/java/org/ourproject/kune/platf/server/state/State.java trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java trunk/src/main/resources/dozerBeanMapping.xml trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java Log: Incomplete - task User buddies SocialNetwork part Incomplete - task Tools must me optional and User/Group creation must reflesh this Added: trunk/img/icons/person.svg =================================================================== --- trunk/img/icons/person.svg 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/img/icons/person.svg 2008-10-16 19:57:50 UTC (rev 914) @@ -0,0 +1,662 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="210mm" + height="297mm" + id="svg3567" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="person.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <defs + id="defs3569"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 526.18109 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective3575" /> + <inkscape:perspective + id="perspective4643" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 526.18109 : 1" + sodipodi:type="inkscape:persp3d" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="380.83857" + inkscape:cy="884.33083" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1280" + inkscape:window-height="951" + inkscape:window-x="1280" + inkscape:window-y="25" /> + <metadata + id="metadata3572"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Capa 1" + inkscape:groupmode="layer" + id="layer1"> + <g + id="g4515" + transform="translate(20.757622,-1.719218)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person1-85.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + sodipodi:type="arc" + style="opacity:1;fill:#eeaaff;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path17249" + sodipodi:cx="-55.5" + sodipodi:cy="242.36218" + sodipodi:rx="12.5" + sodipodi:ry="12" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + transform="matrix(3.1844753,0,0,3.3202165,480.51643,-696.54479)" /> + <path + id="path17234" + d="M 303.77805,68.375596 C 293.58885,68.375596 283.35081,72.22062 275.58218,79.996355 C 260.15886,95.433877 260.05324,120.36456 275.25046,135.94201 C 273.08783,126.46484 275.84182,116.09285 283.21165,108.71623 C 294.60729,97.310092 312.94881,97.310092 324.34445,108.71623 C 331.71423,116.09285 334.46827,126.46484 332.30564,135.94201 C 347.50291,120.36451 347.39735,95.433877 331.97393,79.996355 C 324.20535,72.22062 313.96726,68.375596 303.77805,68.375596 z" + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,627.39292,-109.63872)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path17236" + style="opacity:1;fill:#ff9955;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + </g> + <g + id="g4530" + transform="translate(-3.267982,-5.502468)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person6-85.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + transform="matrix(3.1844753,0,0,3.3202165,614.65933,-434.25909)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path3603" + style="fill:#abc837;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 437.92095,330.6613 C 427.73175,330.6613 417.49371,334.50632 409.72508,342.28206 C 394.30176,357.71958 394.19614,382.65026 409.39336,398.22771 C 407.23073,388.75054 409.98472,378.37855 417.35455,371.00193 C 428.75019,359.59579 447.09171,359.59579 458.48735,371.00193 C 465.85713,378.37855 468.61117,388.75054 466.44854,398.22771 C 481.64581,382.65021 481.54025,357.71958 466.11683,342.28206 C 458.34825,334.50632 448.11016,330.6613 437.92095,330.6613 z" + id="path3605" /> + <path + sodipodi:nodetypes="csssc" + id="path3607" + d="M 460.05116,364.96552 C 455.38897,371.83641 432.14686,380.28156 424.78848,372.95567 C 417.51844,365.71771 417.5378,353.91825 424.78848,346.6609 C 432.03916,339.40354 443.80837,339.40354 451.05905,346.6609 C 458.30973,353.91826 455.3126,357.26255 460.05116,364.96552 z" + style="fill:#ffe680;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:5.30990171;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + <g + id="g4510" + transform="translate(0.243294,-5.502458)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person2-85.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + sodipodi:type="arc" + style="opacity:1;fill:#eeaaff;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3628" + sodipodi:cx="-55.5" + sodipodi:cy="242.36218" + sodipodi:rx="12.5" + sodipodi:ry="12" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + transform="matrix(3.1844753,0,0,3.3202165,608.65933,-692.76155)" /> + <path + id="path3630" + d="M 431.92095,72.158845 C 421.73175,72.158845 411.49371,76.003865 403.72508,83.779605 C 388.30176,99.217125 388.19614,124.14781 403.39336,139.72526 C 401.23073,130.24809 403.98472,119.87609 411.35455,112.49948 C 422.75019,101.09333 441.09171,101.09333 452.48735,112.49948 C 459.85713,119.87609 462.61117,130.24809 460.44854,139.72526 C 475.64581,124.14776 475.54025,99.217125 460.11683,83.779605 C 452.34825,76.003865 442.11016,72.158845 431.92095,72.158845 z" + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + style="fill:#ff9955;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:5.30990171;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 454.05116,106.46307 C 449.38897,113.33396 426.14686,121.7791 418.78848,114.45323 C 411.51844,107.21527 411.5378,95.415805 418.78848,88.158448 C 426.03916,80.901092 437.80837,80.901094 445.05905,88.158453 C 452.30973,95.415815 449.3126,98.760105 454.05116,106.46307 z" + id="path3632" + sodipodi:nodetypes="csssc" /> + </g> + <g + id="g4525" + transform="translate(-2.467941,-5.502459)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person4-85.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + transform="matrix(3.1844753,0,0,3.3202165,613.65933,-561.26401)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path3660" + style="opacity:1;fill:#ff5555;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 436.92095,203.65638 C 426.73175,203.65638 416.49371,207.5014 408.72508,215.27714 C 393.30176,230.71466 393.19614,255.64534 408.39336,271.22279 C 406.23073,261.74562 408.98472,251.37363 416.35455,243.99701 C 427.75019,232.59087 446.09171,232.59087 457.48735,243.99701 C 464.85713,251.37363 467.61117,261.74562 465.44854,271.22279 C 480.64581,255.64529 480.54025,230.71466 465.11683,215.27714 C 457.34825,207.5014 447.11016,203.65638 436.92095,203.65638 z" + id="path3662" /> + <path + sodipodi:nodetypes="csssc" + id="path3664" + d="M 459.05116,237.9606 C 454.38897,244.83149 431.14686,253.27664 423.78848,245.95076 C 416.51844,238.7128 416.5378,226.91334 423.78848,219.65598 C 431.03916,212.39863 442.80837,212.39863 450.05905,219.65599 C 457.30973,226.91335 454.3126,230.25764 459.05116,237.9606 z" + style="fill:#da5f0e;fill-opacity:1;fill-rule:nonzero;stroke:#673030;stroke-width:5.30990171;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + <g + id="g4520" + transform="translate(23.468872,-2.433779)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person3-85.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + sodipodi:type="arc" + style="opacity:1;fill:#ff5555;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4476" + sodipodi:cx="-55.5" + sodipodi:cy="242.36218" + sodipodi:rx="12.5" + sodipodi:ry="12" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + transform="matrix(3.1844753,0,0,3.3202165,478.73833,-564.33269)" /> + <path + id="path4478" + d="M 301.99995,200.5877 C 291.81075,200.5877 281.57271,204.43272 273.80408,212.20846 C 258.38076,227.64598 258.27514,252.57666 273.47236,268.15411 C 271.30973,258.67694 274.06372,248.30495 281.43355,240.92833 C 292.82919,229.52219 311.17071,229.52219 322.56635,240.92833 C 329.93613,248.30495 332.69017,258.67694 330.52754,268.15411 C 345.72481,252.57661 345.61925,227.64598 330.19583,212.20846 C 322.42725,204.43272 312.18916,200.5877 301.99995,200.5877 z" + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,625.61482,22.573385)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path4480" + style="opacity:1;fill:#da5f0e;fill-opacity:1;fill-rule:nonzero;stroke:#673030;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + </g> + <g + id="g4535" + transform="translate(24.268845,-12.428838)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person5-85.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + sodipodi:type="arc" + style="opacity:1;fill:#abc837;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4484" + sodipodi:cx="-55.5" + sodipodi:cy="242.36218" + sodipodi:rx="12.5" + sodipodi:ry="12" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + transform="matrix(3.1844753,0,0,3.3202165,477.73833,-427.33272)" /> + <path + id="path4486" + d="M 300.99995,337.58767 C 290.81075,337.58767 280.57271,341.43269 272.80408,349.20843 C 257.38076,364.64595 257.27514,389.57663 272.47236,405.15408 C 270.30973,395.67691 273.06372,385.30492 280.43355,377.9283 C 291.82919,366.52216 310.17071,366.52216 321.56635,377.9283 C 328.93613,385.30492 331.69017,395.67691 329.52754,405.15408 C 344.72481,389.57658 344.61925,364.64595 329.19583,349.20843 C 321.42725,341.43269 311.18916,337.58767 300.99995,337.58767 z" + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,624.61482,159.57335)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path4488" + style="fill:#ffe680;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + </g> + <g + id="g4540" + transform="matrix(0.3764923,0,0,0.3764923,102.537,65.71322)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person1-32.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + transform="matrix(3.1844753,0,0,3.3202165,480.51643,-696.54479)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path4542" + style="opacity:1;fill:#eeaaff;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 303.77805,68.375596 C 293.58885,68.375596 283.35081,72.22062 275.58218,79.996355 C 260.15886,95.433877 260.05324,120.36456 275.25046,135.94201 C 273.08783,126.46484 275.84182,116.09285 283.21165,108.71623 C 294.60729,97.310092 312.94881,97.310092 324.34445,108.71623 C 331.71423,116.09285 334.46827,126.46484 332.30564,135.94201 C 347.50291,120.36451 347.39735,95.433877 331.97393,79.996355 C 324.20535,72.22062 313.96726,68.375596 303.77805,68.375596 z" + id="path4544" /> + <path + sodipodi:type="arc" + style="opacity:1;fill:#ff9955;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4546" + sodipodi:cx="-55.5" + sodipodi:cy="242.36218" + sodipodi:rx="12.5" + sodipodi:ry="12" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,627.39292,-109.63872)" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + </g> + <g + id="g4548" + transform="matrix(0.3764923,0,0,0.3764923,102.78397,147.43392)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person3-32.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + transform="matrix(3.1844753,0,0,3.3202165,478.73833,-564.33269)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path4550" + style="opacity:1;fill:#ff5555;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 301.99995,200.5877 C 291.81075,200.5877 281.57271,204.43272 273.80408,212.20846 C 258.38076,227.64598 258.27514,252.57666 273.47236,268.15411 C 271.30973,258.67694 274.06372,248.30495 281.43355,240.92833 C 292.82919,229.52219 311.17071,229.52219 322.56635,240.92833 C 329.93613,248.30495 332.69017,258.67694 330.52754,268.15411 C 345.72481,252.57661 345.61925,227.64598 330.19583,212.20846 C 322.42725,204.43272 312.18916,200.5877 301.99995,200.5877 z" + id="path4552" /> + <path + sodipodi:type="arc" + style="opacity:1;fill:#da5f0e;fill-opacity:1;fill-rule:nonzero;stroke:#673030;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4554" + sodipodi:cx="-55.5" + sodipodi:cy="242.36218" + sodipodi:rx="12.5" + sodipodi:ry="12" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,625.61482,22.573385)" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + </g> + <g + id="g4556" + transform="matrix(0.3764923,0,0,0.3764923,102.56045,222.8594)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person5-32.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + transform="matrix(3.1844753,0,0,3.3202165,477.73833,-427.33272)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path4558" + style="opacity:1;fill:#abc837;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 300.99995,337.58767 C 290.81075,337.58767 280.57271,341.43269 272.80408,349.20843 C 257.38076,364.64595 257.27514,389.57663 272.47236,405.15408 C 270.30973,395.67691 273.06372,385.30492 280.43355,377.9283 C 291.82919,366.52216 310.17071,366.52216 321.56635,377.9283 C 328.93613,385.30492 331.69017,395.67691 329.52754,405.15408 C 344.72481,389.57658 344.61925,364.64595 329.19583,349.20843 C 321.42725,341.43269 311.18916,337.58767 300.99995,337.58767 z" + id="path4560" /> + <path + sodipodi:type="arc" + style="fill:#ffe680;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4562" + sodipodi:cx="-55.5" + sodipodi:cy="242.36218" + sodipodi:rx="12.5" + sodipodi:ry="12" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,624.61482,159.57335)" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + </g> + <g + transform="matrix(0.1882461,0,0,0.1882461,52.093488,86.07207)" + id="g4564" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person1-16.png" + inkscape:export-xdpi="89.99485" + inkscape:export-ydpi="89.99485"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + sodipodi:type="arc" + style="opacity:1;fill:#eeaaff;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4566" + sodipodi:cx="-55.5" + sodipodi:cy="242.36218" + sodipodi:rx="12.5" + sodipodi:ry="12" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + transform="matrix(3.1844753,0,0,3.3202165,480.51643,-696.54479)" /> + <path + id="path4568" + d="M 303.77805,68.375596 C 293.58885,68.375596 283.35081,72.22062 275.58218,79.996355 C 260.15886,95.433877 260.05324,120.36456 275.25046,135.94201 C 273.08783,126.46484 275.84182,116.09285 283.21165,108.71623 C 294.60729,97.310092 312.94881,97.310092 324.34445,108.71623 C 331.71423,116.09285 334.46827,126.46484 332.30564,135.94201 C 347.50291,120.36451 347.39735,95.433877 331.97393,79.996355 C 324.20535,72.22062 313.96726,68.375596 303.77805,68.375596 z" + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,627.39292,-109.63872)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path4570" + style="opacity:1;fill:#ff9955;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + </g> + <g + transform="matrix(0.1882461,0,0,0.1882461,50.650108,192.6812)" + id="g4572" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person3-16.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + sodipodi:type="arc" + style="opacity:1;fill:#ff5555;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4574" + sodipodi:cx="-55.5" + sodipodi:cy="242.36218" + sodipodi:rx="12.5" + sodipodi:ry="12" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + transform="matrix(3.1844753,0,0,3.3202165,478.73833,-564.33269)" /> + <path + id="path4576" + d="M 301.99995,200.5877 C 291.81075,200.5877 281.57271,204.43272 273.80408,212.20846 C 258.38076,227.64598 258.27514,252.57666 273.47236,268.15411 C 271.30973,258.67694 274.06372,248.30495 281.43355,240.92833 C 292.82919,229.52219 311.17071,229.52219 322.56635,240.92833 C 329.93613,248.30495 332.69017,258.67694 330.52754,268.15411 C 345.72481,252.57661 345.61925,227.64598 330.19583,212.20846 C 322.42725,204.43272 312.18916,200.5877 301.99995,200.5877 z" + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,625.61482,22.573385)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path4578" + style="opacity:1;fill:#da5f0e;fill-opacity:1;fill-rule:nonzero;stroke:#673030;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + </g> + <g + transform="matrix(0.1882461,0,0,0.1882461,49.838354,293.8964)" + id="g4580" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person5-16.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + sodipodi:type="arc" + style="opacity:1;fill:#abc837;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4582" + sodipodi:cx="-55.5" + sodipodi:cy="242.36218" + sodipodi:rx="12.5" + sodipodi:ry="12" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + transform="matrix(3.1844753,0,0,3.3202165,477.73833,-427.33272)" /> + <path + id="path4584" + d="M 300.99995,337.58767 C 290.81075,337.58767 280.57271,341.43269 272.80408,349.20843 C 257.38076,364.64595 257.27514,389.57663 272.47236,405.15408 C 270.30973,395.67691 273.06372,385.30492 280.43355,377.9283 C 291.82919,366.52216 310.17071,366.52216 321.56635,377.9283 C 328.93613,385.30492 331.69017,395.67691 329.52754,405.15408 C 344.72481,389.57658 344.61925,364.64595 329.19583,349.20843 C 321.42725,341.43269 311.18916,337.58767 300.99995,337.58767 z" + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + transform="matrix(1.0508232,1.0517911,-1.0946071,1.0956153,624.61482,159.57335)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path4586" + style="fill:#ffe680;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + </g> + <g + id="g4588" + transform="matrix(0.3764923,0,0,0.3764923,379.16333,225.46712)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person6-32.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + sodipodi:type="arc" + style="fill:#abc837;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4590" + sodipodi:cx="-55.5" + sodipodi:cy="242.36218" + sodipodi:rx="12.5" + sodipodi:ry="12" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + transform="matrix(3.1844753,0,0,3.3202165,614.65933,-434.25909)" /> + <path + id="path4592" + d="M 437.92095,330.6613 C 427.73175,330.6613 417.49371,334.50632 409.72508,342.28206 C 394.30176,357.71958 394.19614,382.65026 409.39336,398.22771 C 407.23073,388.75054 409.98472,378.37855 417.35455,371.00193 C 428.75019,359.59579 447.09171,359.59579 458.48735,371.00193 C 465.85713,378.37855 468.61117,388.75054 466.44854,398.22771 C 481.64581,382.65021 481.54025,357.71958 466.11683,342.28206 C 458.34825,334.50632 448.11016,330.6613 437.92095,330.6613 z" + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + style="fill:#ffe680;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:5.30990171;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 460.05116,364.96552 C 455.38897,371.83641 432.14686,380.28156 424.78848,372.95567 C 417.51844,365.71771 417.5378,353.91825 424.78848,346.6609 C 432.03916,339.40354 443.80837,339.40354 451.05905,346.6609 C 458.30973,353.91826 455.3126,357.26255 460.05116,364.96552 z" + id="path4594" + sodipodi:nodetypes="csssc" /> + </g> + <g + id="g4596" + transform="matrix(0.3764923,0,0,0.3764923,377.17794,64.28886)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person2-32.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + transform="matrix(3.1844753,0,0,3.3202165,608.65933,-692.76155)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path4598" + style="opacity:1;fill:#eeaaff;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 431.92095,72.158845 C 421.73175,72.158845 411.49371,76.003865 403.72508,83.779605 C 388.30176,99.217125 388.19614,124.14781 403.39336,139.72526 C 401.23073,130.24809 403.98472,119.87609 411.35455,112.49948 C 422.75019,101.09333 441.09171,101.09333 452.48735,112.49948 C 459.85713,119.87609 462.61117,130.24809 460.44854,139.72526 C 475.64581,124.14776 475.54025,99.217125 460.11683,83.779605 C 452.34825,76.003865 442.11016,72.158845 431.92095,72.158845 z" + id="path4600" /> + <path + sodipodi:nodetypes="csssc" + id="path4602" + d="M 454.05116,106.46307 C 449.38897,113.33396 426.14686,121.7791 418.78848,114.45323 C 411.51844,107.21527 411.5378,95.415805 418.78848,88.158448 C 426.03916,80.901092 437.80837,80.901094 445.05905,88.158453 C 452.30973,95.415815 449.3126,98.760105 454.05116,106.46307 z" + style="fill:#ff9955;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:5.30990171;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + <g + id="g4604" + transform="matrix(0.3764923,0,0,0.3764923,378.93987,146.27859)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person4-32.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + sodipodi:type="arc" + style="opacity:1;fill:#ff5555;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4606" + sodipodi:cx="-55.5" + sodipodi:cy="242.36218" + sodipodi:rx="12.5" + sodipodi:ry="12" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + transform="matrix(3.1844753,0,0,3.3202165,613.65933,-561.26401)" /> + <path + id="path4608" + d="M 436.92095,203.65638 C 426.73175,203.65638 416.49371,207.5014 408.72508,215.27714 C 393.30176,230.71466 393.19614,255.64534 408.39336,271.22279 C 406.23073,261.74562 408.98472,251.37363 416.35455,243.99701 C 427.75019,232.59087 446.09171,232.59087 457.48735,243.99701 C 464.85713,251.37363 467.61117,261.74562 465.44854,271.22279 C 480.64581,255.64529 480.54025,230.71466 465.11683,215.27714 C 457.34825,207.5014 447.11016,203.65638 436.92095,203.65638 z" + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + style="fill:#da5f0e;fill-opacity:1;fill-rule:nonzero;stroke:#673030;stroke-width:5.30990171;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 459.05116,237.9606 C 454.38897,244.83149 431.14686,253.27664 423.78848,245.95076 C 416.51844,238.7128 416.5378,226.91334 423.78848,219.65598 C 431.03916,212.39863 442.80837,212.39863 450.05905,219.65599 C 457.30973,226.91335 454.3126,230.25764 459.05116,237.9606 z" + id="path4610" + sodipodi:nodetypes="csssc" /> + </g> + <g + transform="matrix(0.1882461,0,0,0.1882461,570.98451,295.20026)" + id="g4612" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person6-16.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + transform="matrix(3.1844753,0,0,3.3202165,614.65933,-434.25909)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path4614" + style="fill:#abc837;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 437.92095,330.6613 C 427.73175,330.6613 417.49371,334.50632 409.72508,342.28206 C 394.30176,357.71958 394.19614,382.65026 409.39336,398.22771 C 407.23073,388.75054 409.98472,378.37855 417.35455,371.00193 C 428.75019,359.59579 447.09171,359.59579 458.48735,371.00193 C 465.85713,378.37855 468.61117,388.75054 466.44854,398.22771 C 481.64581,382.65021 481.54025,357.71958 466.11683,342.28206 C 458.34825,334.50632 448.11016,330.6613 437.92095,330.6613 z" + id="path4616" /> + <path + sodipodi:nodetypes="csssc" + id="path4618" + d="M 460.05116,364.96552 C 455.38897,371.83641 432.14686,380.28156 424.78848,372.95567 C 417.51844,365.71771 417.5378,353.91825 424.78848,346.6609 C 432.03916,339.40354 443.80837,339.40354 451.05905,346.6609 C 458.30973,353.91826 455.3126,357.26255 460.05116,364.96552 z" + style="fill:#ffe680;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:5.30990171;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + <g + transform="matrix(0.1882461,0,0,0.1882461,566.11399,85.35989)" + id="g4620" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person2-16.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + sodipodi:type="arc" + style="opacity:1;fill:#eeaaff;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4622" + sodipodi:cx="-55.5" + sodipodi:cy="242.36218" + sodipodi:rx="12.5" + sodipodi:ry="12" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + transform="matrix(3.1844753,0,0,3.3202165,608.65933,-692.76155)" /> + <path + id="path4624" + d="M 431.92095,72.158845 C 421.73175,72.158845 411.49371,76.003865 403.72508,83.779605 C 388.30176,99.217125 388.19614,124.14781 403.39336,139.72526 C 401.23073,130.24809 403.98472,119.87609 411.35455,112.49948 C 422.75019,101.09333 441.09171,101.09333 452.48735,112.49948 C 459.85713,119.87609 462.61117,130.24809 460.44854,139.72526 C 475.64581,124.14776 475.54025,99.217125 460.11683,83.779605 C 452.34825,76.003865 442.11016,72.158845 431.92095,72.158845 z" + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + style="fill:#ff9955;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:5.30990171;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 454.05116,106.46307 C 449.38897,113.33396 426.14686,121.7791 418.78848,114.45323 C 411.51844,107.21527 411.5378,95.415805 418.78848,88.158448 C 426.03916,80.901092 437.80837,80.901094 445.05905,88.158453 C 452.30973,95.415815 449.3126,98.760105 454.05116,106.46307 z" + id="path4626" + sodipodi:nodetypes="csssc" /> + </g> + <g + transform="matrix(0.1882461,0,0,0.1882461,570.17277,192.10353)" + id="g4628" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/persons/person4-16.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + transform="matrix(3.1844753,0,0,3.3202165,613.65933,-561.26401)" + d="M -43,242.36218 A 12.5,12 0 1 1 -68,242.36218 A 12.5,12 0 1 1 -43,242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path4630" + style="opacity:1;fill:#ff5555;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:5.30990267;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 436.92095,203.65638 C 426.73175,203.65638 416.49371,207.5014 408.72508,215.27714 C 393.30176,230.71466 393.19614,255.64534 408.39336,271.22279 C 406.23073,261.74562 408.98472,251.37363 416.35455,243.99701 C 427.75019,232.59087 446.09171,232.59087 457.48735,243.99701 C 464.85713,251.37363 467.61117,261.74562 465.44854,271.22279 C 480.64581,255.64529 480.54025,230.71466 465.11683,215.27714 C 457.34825,207.5014 447.11016,203.65638 436.92095,203.65638 z" + id="path4632" /> + <path + sodipodi:nodetypes="csssc" + id="path4634" + d="M 459.05116,237.9606 C 454.38897,244.83149 431.14686,253.27664 423.78848,245.95076 C 416.51844,238.7128 416.5378,226.91334 423.78848,219.65598 C 431.03916,212.39863 442.80837,212.39863 450.05905,219.65599 C 457.30973,226.91335 454.3126,230.25764 459.05116,237.9606 z" + style="fill:#da5f0e;fill-opacity:1;fill-rule:nonzero;stroke:#673030;stroke-width:5.30990171;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + </g> +</svg> Added: trunk/img/icons/persons/person1-16.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person1-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person1-32.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person1-32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person1-85.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person1-85.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person2-16.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person2-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person2-32.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person2-32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person2-85.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person2-85.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person3-16.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person3-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person3-32.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person3-32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person3-85.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person3-85.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person4-16.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person4-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person4-32.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person4-32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person4-85.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person4-85.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person5-16.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person5-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person5-32.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person5-32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person5-85.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person5-85.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person6-16.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person6-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person6-32.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person6-32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/persons/person6-85.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/persons/person6-85.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/pom.xml 2008-10-16 19:57:50 UTC (rev 914) @@ -82,7 +82,7 @@ <dependency> <groupId>com.calclab</groupId> <artifactId>suco</artifactId> - <version>0.5.06</version> + <version>0.5.11</version> </dependency> <dependency> <groupId>jmagick</groupId> @@ -94,7 +94,7 @@ <dependency> <groupId>com.calclab.emite</groupId> <artifactId>emite</artifactId> - <version>0.4.1</version> + <version>0.4.3</version> </dependency> <dependency> <groupId>org.jivesoftware.smack</groupId> Modified: trunk/script/generateBasicUIElements.sh =================================================================== --- trunk/script/generateBasicUIElements.sh 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/script/generateBasicUIElements.sh 2008-10-16 19:57:50 UTC (rev 914) @@ -67,7 +67,7 @@ cat <<EOF > $DIR/${NAME}Panel.java package $PACKAGE; -import org.ourproject.kune.workspace.client.ui.newtmp.skel.WorkspaceSkeleton; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; public class ${NAME}Panel implements ${NAME}View { @@ -88,7 +88,7 @@ register(Singleton.class, new Factory<${NAME}>(${NAME}.class) { public ${NAME} create() { final ${NAME}Presenter presenter = new ${NAME}Presenter(); - final ${NAME}Panel panel = new ${NAME}Panel(presenter, ws); + final ${NAME}Panel panel = new ${NAME}Panel(presenter, $(WorkspaceSkeleton.class)); presenter.init(panel); return presenter; } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2008-10-16 19:57:50 UTC (rev 914) @@ -40,71 +40,79 @@ } @Override - public void onLoad() { + public void onInstall() { - register(Singleton.class, new Factory<ChatInfo>(ChatInfo.class) { - public ChatInfo create() { - return new ChatInfoPanel(); - } - }); + register(Singleton.class, new Factory<ChatInfo>(ChatInfo.class) { + @Override + public ChatInfo create() { + return new ChatInfoPanel(); + } + }); - register(ToolGroup.class, new Factory<ChatClientActions>(ChatClientActions.class) { - public ChatClientActions create() { - return new ChatClientActions($(I18nUITranslationService.class), $(Session.class), - $(ContentActionRegistry.class), $(ContextActionRegistry.class), $$(ChatClientTool.class)); - } - }); + register(ToolGroup.class, new Factory<ChatClientActions>(ChatClientActions.class) { + @Override + public ChatClientActions create() { + return new ChatClientActions($(I18nUITranslationService.class), $(Session.class), + $(ContentActionRegistry.class), $(ContextActionRegistry.class), $$(ChatClientTool.class)); + } + }); - register(Singleton.class, new Factory<ChatContent>(ChatContent.class) { - public ChatContent create() { - final WorkspaceDeckPanel panel = new WorkspaceDeckPanel(); - final ChatContentPresenter presenter = new ChatContentPresenter($(EmiteUIDialog.class), panel, - $$(ChatInfo.class), $$(ChatRoom.class)); - return presenter; - } - }); + register(Singleton.class, new Factory<ChatContent>(ChatContent.class) { + @Override + public ChatContent create() { + final WorkspaceDeckPanel panel = new WorkspaceDeckPanel(); + final ChatContentPresenter presenter = new ChatContentPresenter($(EmiteUIDialog.class), panel, + $$(ChatInfo.class), $$(ChatRoom.class)); + return presenter; + } + }); - register(Singleton.class, new Factory<ChatContext>(ChatContext.class) { - public ChatContext create() { - final WorkspaceDeckPanel panel = new WorkspaceDeckPanel(); - final ChatContextPresenter presenter = new ChatContextPresenter(panel, $$(RoomsAdmin.class)); - return presenter; - } - }); + register(Singleton.class, new Factory<ChatContext>(ChatContext.class) { + @Override + public ChatContext create() { + final WorkspaceDeckPanel panel = new WorkspaceDeckPanel(); + final ChatContextPresenter presenter = new ChatContextPresenter(panel, $$(RoomsAdmin.class)); + return presenter; + } + }); - register(Singleton.class, new Factory<ChatRoomControl>(ChatRoomControl.class) { - public ChatRoomControl create() { - final ChatRoomControlPresenter presenter = new ChatRoomControlPresenter(); - final ChatRoomControlPanel panel = new ChatRoomControlPanel($(I18nUITranslationService.class), - presenter); - presenter.init(panel); - return presenter; - } - }); + register(Singleton.class, new Factory<ChatRoomControl>(ChatRoomControl.class) { + @Override + public ChatRoomControl create() { + final ChatRoomControlPresenter presenter = new ChatRoomControlPresenter(); + final ChatRoomControlPanel panel = new ChatRoomControlPanel($(I18nUITranslationService.class), + presenter); + presenter.init(panel); + return presenter; + } + }); - register(Singleton.class, new Factory<ChatRoom>(ChatRoom.class) { - public ChatRoom create() { - final ChatRoomPanel panel = new ChatRoomPanel($(WorkspaceSkeleton.class)); - final ChatRoomPresenter presenter = new ChatRoomPresenter(panel); - return presenter; - } - }); - register(Singleton.class, new Factory<RoomsAdmin>(RoomsAdmin.class) { - public RoomsAdmin create() { - final RoomsAdminPresenter presenter = new RoomsAdminPresenter($(ContextNavigator.class), - $(I18nUITranslationService.class), $$(StateManager.class), $(Session.class), - $$(ContentServiceAsync.class)); - return presenter; - } - }); + register(Singleton.class, new Factory<ChatRoom>(ChatRoom.class) { + @Override + public ChatRoom create() { + final ChatRoomPanel panel = new ChatRoomPanel($(WorkspaceSkeleton.class)); + final ChatRoomPresenter presenter = new ChatRoomPresenter(panel); + return presenter; + } + }); + register(Singleton.class, new Factory<RoomsAdmin>(RoomsAdmin.class) { + @Override + public RoomsAdmin create() { + final RoomsAdminPresenter presenter = new RoomsAdminPresenter($(ContextNavigator.class), + $(I18nUITranslationService.class), $$(StateManager.class), $(Session.class), + $$(ContentServiceAsync.class)); + return presenter; + } + }); - register(ToolGroup.class, new Factory<ChatClientTool>(ChatClientTool.class) { - public ChatClientTool create() { - return new ChatClientTool($(Session.class), $(Application.class), $(I18nUITranslationService.class), - $(EmiteUIDialog.class), $(WorkspaceSkeleton.class), $$(GroupMembersSummary.class), - $(ToolSelector.class), $(WsThemePresenter.class), $$(ChatContent.class), $$(ChatContext.class)); - } - }); + register(ToolGroup.class, new Factory<ChatClientTool>(ChatClientTool.class) { + @Override + public ChatClientTool create() { + return new ChatClientTool($(Session.class), $(Application.class), $(I18nUITranslationService.class), + $(EmiteUIDialog.class), $(WorkspaceSkeleton.class), $$(GroupMembersSummary.class), + $(ToolSelector.class), $(WsThemePresenter.class), $$(ChatContent.class), $$(ChatContext.class)); + } + }); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManager.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManager.java 2008-10-16 19:57:50 UTC (rev 914) @@ -20,18 +20,24 @@ package org.ourproject.kune.chat.server.managers; +import java.util.Collection; + +import org.jivesoftware.smack.RosterEntry; + public interface XmppManager { - ChatConnection login(String userName, String password, String resource); + Room createRoom(ChatConnection connection, String roomName, String ownerAlias); + void destroyRoom(ChatConnection conn, String roomName); + void disconnect(ChatConnection connection); - Room createRoom(ChatConnection connection, String roomName, String ownerAlias); + Collection<RosterEntry> getRoster(ChatConnection connection); Room joinRoom(ChatConnection connection, String roomName, String alias); + ChatConnection login(String userName, String password, String resource); + void sendMessage(Room room, String message); - void destroyRoom(ChatConnection conn, String roomName); - } Modified: trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManagerDefault.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManagerDefault.java 2008-10-16 19:57:50 UTC (rev 914) @@ -21,10 +21,13 @@ package org.ourproject.kune.chat.server.managers; import java.util.ArrayList; +import java.util.Collection; import java.util.Iterator; import java.util.List; import org.jivesoftware.smack.ConnectionConfiguration; +import org.jivesoftware.smack.Roster; +import org.jivesoftware.smack.RosterEntry; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.Message; @@ -46,26 +49,6 @@ this.chatProperties = chatProperties; } - public ChatConnection login(final String userName, final String password, final String resource) { - ConnectionConfiguration config = new ConnectionConfiguration(getServerName(), 5222); - XMPPConnection conn = new XMPPConnection(config); - try { - conn.connect(); - conn.login(userName, password, resource, true); - return new XmppConnection(userName, conn); - } catch (XMPPException e) { - throw new ChatException(e); - } - } - - private String getServerName() { - return chatProperties.getDomain(); - } - - private String getRoomName(final String room) { - return room + "@" + chatProperties.getRoomHost(); - } - public Room createRoom(final ChatConnection conn, final String roomName, final String alias) { XmppConnection xConn = (XmppConnection) conn; MultiUserChat muc = new MultiUserChat(xConn.getConn(), getRoomName(roomName)); @@ -90,6 +73,18 @@ } } + public void disconnect(final ChatConnection connection) { + XmppConnection xConn = (XmppConnection) connection; + xConn.getConn().disconnect(); + + } + + public Collection<RosterEntry> getRoster(ChatConnection conn) { + XmppConnection xConn = (XmppConnection) conn; + Roster roster = xConn.getConn().getRoster(); + return roster.getEntries(); + } + public Room joinRoom(final ChatConnection connection, final String roomName, final String alias) { XmppConnection xConn = (XmppConnection) connection; MultiUserChat muc = new MultiUserChat(xConn.getConn(), getRoomName(roomName)); @@ -104,6 +99,18 @@ } } + public ChatConnection login(final String userName, final String password, final String resource) { + ConnectionConfiguration config = new ConnectionConfiguration(getServerName(), 5222); + XMPPConnection conn = new XMPPConnection(config); + try { + conn.connect(); + conn.login(userName, password, resource, true); + return new XmppConnection(userName, conn); + } catch (XMPPException e) { + throw new ChatException(e); + } + } + public void sendMessage(final Room room, final String body) { XmppRoom xAccess = (XmppRoom) room; MultiUserChat muc = xAccess.getMuc(); @@ -136,22 +143,24 @@ muc.sendConfigurationForm(answer); } + private String getRoomName(final String room) { + return room + "@" + chatProperties.getRoomHost(); + } + + private String getServerName() { + return chatProperties.getDomain(); + } + private boolean isNotEmpty(final FormField field) { return field.getVariable() != null; } - private boolean isVisible(final String type) { - return !FormField.TYPE_HIDDEN.equals(type); - } - private boolean isNotList(final String type) { return !FormField.TYPE_JID_MULTI.equals(type) && !FormField.TYPE_LIST_MULTI.equals(type) && !FormField.TYPE_LIST_SINGLE.equals(type) && !isVisible(type); } - public void disconnect(final ChatConnection connection) { - XmppConnection xConn = (XmppConnection) connection; - xConn.getConn().disconnect(); - + private boolean isVisible(final String type) { + return !FormField.TYPE_HIDDEN.equals(type); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-10-16 19:57:50 UTC (rev 914) @@ -56,7 +56,7 @@ } @Override - public void onLoad() { + public void onInstall() { register(ToolGroup.class, new Factory<DocumentClientTool>(DocumentClientTool.class) { @Override Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java 2008-10-16 19:57:50 UTC (rev 914) @@ -56,6 +56,7 @@ private ParticipationDataDTO participation; private StateToken stateToken; private List<String> enabledTools; + private UserBuddiesDataDTO userBuddies; public StateDTO() { this(null, null, null); @@ -179,6 +180,10 @@ return typeId; } + public UserBuddiesDataDTO getUserBuddies() { + return userBuddies; + } + public int getVersion() { return version; } @@ -308,6 +313,10 @@ this.typeId = typeId; } + public void setUserBuddies(UserBuddiesDataDTO userBuddies) { + this.userBuddies = userBuddies; + } + public void setVersion(final int version) { this.version = version; } Added: trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserBuddiesDataDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserBuddiesDataDTO.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserBuddiesDataDTO.java 2008-10-16 19:57:50 UTC (rev 914) @@ -0,0 +1,30 @@ +package org.ourproject.kune.platf.client.dto; + +import java.util.List; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public class UserBuddiesDataDTO implements IsSerializable { + + private List<UserSimpleDTO> buddies; + int otherExternalBuddies; + + public UserBuddiesDataDTO() { + } + + public List<UserSimpleDTO> getBuddies() { + return buddies; + } + + public int getOtherExternalBuddies() { + return otherExternalBuddies; + } + + public void setBuddies(List<UserSimpleDTO> buddies) { + this.buddies = buddies; + } + + public void setOtherExternalBuddies(int otherExternalBuddies) { + this.otherExternalBuddies = otherExternalBuddies; + } +} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneCoreModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneCoreModule.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneCoreModule.java 2008-10-16 19:57:50 UTC (rev 914) @@ -8,8 +8,8 @@ public class KuneCoreModule extends AbstractModule { @Override - public void onLoad() { - registerDecorator(ApplicationComponentGroup.class, new ApplicationComponentGroup(container)); - registerDecorator(ToolGroup.class, new ToolGroup(container)); + public void onInstall() { + registerDecorator(ApplicationComponentGroup.class, new ApplicationComponentGroup(container)); + registerDecorator(ToolGroup.class, new ToolGroup(container)); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-16 19:57:50 UTC (rev 914) @@ -90,7 +90,7 @@ public class KuneModule extends AbstractModule { @Override - public void onLoad() { + public void onInstall() { register(Singleton.class, new Factory<Session>(Session.class) { @Override Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java 2008-10-16 19:57:50 UTC (rev 914) @@ -18,26 +18,28 @@ public class KunePlatformModule extends AbstractModule { @Override - protected void onLoad() { - register(Singleton.class, new Factory<ColorWebSafePalette>(ColorWebSafePalette.class) { - public ColorWebSafePalette create() { - final ColorWebSafePalettePresenter presenter = new ColorWebSafePalettePresenter(); - final ColorWebSafePalettePanel panel = new ColorWebSafePalettePanel(presenter); - presenter.init(panel); - return presenter; - } - }); + protected void onInstall() { + register(Singleton.class, new Factory<ColorWebSafePalette>(ColorWebSafePalette.class) { + @Override + public ColorWebSafePalette create() { + final ColorWebSafePalettePresenter presenter = new ColorWebSafePalettePresenter(); + final ColorWebSafePalettePanel panel = new ColorWebSafePalettePanel(presenter); + presenter.init(panel); + return presenter; + } + }); - register(Singleton.class, new Factory<FileUploader>(FileUploader.class) { - public FileUploader create() { - final FileUploaderPresenter presenter = new FileUploaderPresenter($(Session.class), - $$(ContextNavigator.class)); - final FileUploaderDialog panel = new FileUploaderDialog(presenter, $(I18nUITranslationService.class), - $(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); + register(Singleton.class, new Factory<FileUploader>(FileUploader.class) { + @Override + public FileUploader create() { + final FileUploaderPresenter presenter = new FileUploaderPresenter($(Session.class), + $$(ContextNavigator.class)); + final FileUploaderDialog panel = new FileUploaderDialog(presenter, $(I18nUITranslationService.class), + $(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java 2008-10-16 19:57:50 UTC (rev 914) @@ -58,6 +58,9 @@ import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserMenuPanel; import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserMenuPresenter; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import org.ourproject.kune.workspace.client.socialnet.BuddiesSummary; +import org.ourproject.kune.workspace.client.socialnet.BuddiesSummaryPanel; +import org.ourproject.kune.workspace.client.socialnet.BuddiesSummaryPresenter; import org.ourproject.kune.workspace.client.socialnet.GroupMembersSummary; import org.ourproject.kune.workspace.client.socialnet.GroupMembersSummaryPanel; import org.ourproject.kune.workspace.client.socialnet.GroupMembersSummaryPresenter; @@ -87,7 +90,7 @@ public class KuneWorkspaceModule extends AbstractModule { @Override - protected void onLoad() { + protected void onInstall() { register(ApplicationComponentGroup.class, new Factory<WorkspaceSkeleton>(WorkspaceSkeleton.class) { @Override @@ -327,6 +330,18 @@ } }); + register(ApplicationComponentGroup.class, new Factory<BuddiesSummary>(BuddiesSummary.class) { + @Override + public BuddiesSummary create() { + final BuddiesSummaryPresenter presenter = new BuddiesSummaryPresenter($(StateManager.class), + $(Session.class)); + final BuddiesSummaryPanel panel = new BuddiesSummaryPanel(presenter, $(WorkspaceSkeleton.class), + $(I18nTranslationService.class)); + presenter.init(panel); + return presenter; + } + }); + register(ApplicationComponentGroup.class, new Factory<ParticipationSummary>(ParticipationSummary.class) { @Override public ParticipationSummary create() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2008-10-16 19:57:50 UTC (rev 914) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.client.state; -import java.util.Iterator; import java.util.List; import org.ourproject.kune.platf.client.dto.I18nCountryDTO; @@ -35,6 +34,7 @@ import org.ourproject.kune.workspace.client.site.rpc.UserServiceAsync; import com.allen_sauer.gwt.log.client.Log; +import com.calclab.suco.client.event.Events; import com.calclab.suco.client.ioc.Provider; import com.calclab.suco.client.listener.Event; import com.calclab.suco.client.listener.Event0; @@ -56,150 +56,148 @@ 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"); + this.userHash = userHash == null || userHash.equals("null") ? null : userHash; + this.userServiceProvider = userServiceProvider; + languagesArray = null; + this.onInitDataReceived = Events.create(InitDataDTO.class, "initDataReceived"); + this.onUserSignIn = new Event<UserInfoDTO>("onUserSignIn"); + this.onUserSignOut = new Event0("onUserSignOut"); } public void check(final AsyncCallbackSimple<?> callback) { - Log.debug("Checking session (userhash: " + getUserHash() + ")"); - userServiceProvider.get().onlyCheckSession(getUserHash(), callback); + Log.debug("Checking session (userhash: " + getUserHash() + ")"); + userServiceProvider.get().onlyCheckSession(getUserHash(), callback); } public List<I18nCountryDTO> getCountries() { - return initData.getCountries(); + return initData.getCountries(); } public Object[][] getCountriesArray() { - if (countriesArray == null) { - countriesArray = mapCountries(); - } - return countriesArray; + if (countriesArray == null) { + countriesArray = mapCountries(); + } + return countriesArray; } public I18nLanguageDTO getCurrentLanguage() { - return currentLanguage; + return currentLanguage; } public StateDTO getCurrentState() { - return currentState; + return currentState; } public StateToken getCurrentStateToken() { - return currentState == null ? null : currentState.getStateToken(); + return currentState == null ? null : currentState.getStateToken(); } public UserInfoDTO getCurrentUserInfo() { - return currentUserInfo; + return currentUserInfo; } public String getGalleryPermittedExtensions() { - return initData.getGalleryPermittedExtensions(); + return initData.getGalleryPermittedExtensions(); } public List<I18nLanguageSimpleDTO> getLanguages() { - return initData.getLanguages(); + return initData.getLanguages(); } public Object[][] getLanguagesArray() { - if (languagesArray == null) { - languagesArray = mapLangs(); - } - return languagesArray; + if (languagesArray == null) { + languagesArray = mapLangs(); + } + return languagesArray; } public List<LicenseDTO> getLicenses() { - return initData.getLicenses(); + return initData.getLicenses(); } public Object[][] getTimezones() { - if (timezonesArray == null) { - mapTimezones(); - } - return timezonesArray; + if (timezonesArray == null) { + mapTimezones(); + } + return timezonesArray; } public String getUserHash() { - return userHash; + return userHash; } public boolean isLogged() { - return userHash != null; + return userHash != null; } public void onInitDataReceived(final Listener<InitDataDTO> listener) { - onInitDataReceived.add(listener); + onInitDataReceived.add(listener); } public void onUserSignIn(final Listener<UserInfoDTO> listener) { - onUserSignIn.add(listener); + onUserSignIn.add(listener); } public void onUserSignOut(final Listener0 listener) { - onUserSignOut.add(listener); + onUserSignOut.add(listener); } public void setCurrent(final StateDTO currentState) { - this.currentState = currentState; + this.currentState = currentState; } public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) { - this.currentLanguage = currentLanguage; + this.currentLanguage = currentLanguage; } public void setCurrentState(final StateDTO currentState) { - this.currentState = currentState; + this.currentState = currentState; } public void setCurrentUserInfo(final UserInfoDTO currentUserInfo) { - this.currentUserInfo = currentUserInfo; - if (currentUserInfo != null) { - onUserSignIn.fire(currentUserInfo); - } else { - onUserSignOut.fire(); - } + this.currentUserInfo = currentUserInfo; + if (currentUserInfo != null) { + onUserSignIn.fire(currentUserInfo); + } else { + onUserSignOut.fire(); + } } public void setInitData(final InitDataDTO initData) { - this.initData = initData; - onInitDataReceived.fire(initData); + this.initData = initData; + onInitDataReceived.fire(initData); } public void setUserHash(final String userHash) { - this.userHash = userHash; + this.userHash = userHash; } private Object[][] mapCountries() { - final Object[][] objs = new Object[initData.getCountries().size()][1]; - int i = 0; - for (final Iterator<I18nCountryDTO> iterator = initData.getCountries().iterator(); iterator.hasNext();) { - final I18nCountryDTO country = iterator.next(); - final Object[] obj = new Object[] { country.getCode(), country.getEnglishName() }; - objs[i++] = obj; - } - return objs; + final Object[][] objs = new Object[initData.getCountries().size()][1]; + int i = 0; + for (I18nCountryDTO country : initData.getCountries()) { + final Object[] obj = new Object[] { country.getCode(), country.getEnglishName() }; + objs[i++] = obj; + } + return objs; } private Object[][] mapLangs() { - final Object[][] objs = new Object[initData.getLanguages().size()][1]; - int i = 0; - for (final Iterator<I18nLanguageSimpleDTO> iterator = initData.getLanguages().iterator(); iterator.hasNext();) { - final I18nLanguageSimpleDTO language = iterator.next(); - final Object[] obj = new Object[] { language.getCode(), language.getEnglishName() }; - objs[i++] = obj; - } - return objs; + final Object[][] objs = new Object[initData.getLanguages().size()][1]; + int i = 0; + for (I18nLanguageSimpleDTO language : initData.getLanguages()) { + final Object[] obj = new Object[] { language.getCode(), language.getEnglishName() }; + objs[i++] = obj; + } + return objs; } private void mapTimezones() { - 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; - } + 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; + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/public/images/person-def.png =================================================================== (Binary files differ) Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person1-16.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person1-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person1-32.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person1-32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person1-85.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person1-85.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person2-16.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person2-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person2-32.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person2-32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person2-85.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person2-85.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person3-16.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person3-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person3-32.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person3-32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person3-85.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person3-85.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person4-16.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person4-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person4-32.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person4-32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person4-85.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person4-85.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person5-16.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person5-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person5-32.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person5-32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person5-85.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person5-85.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person6-16.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person6-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person6-32.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person6-32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person6-85.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/persons/person6-85.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/ParticipationData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/ParticipationData.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/server/ParticipationData.java 2008-10-16 19:57:50 UTC (rev 914) @@ -1,55 +0,0 @@ -/* - * - * Copyright (C) 2007-2008 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.server; - -import java.util.List; - -import org.ourproject.kune.platf.server.domain.Group; - -public class ParticipationData { - private List<Group> groupsIsAdmin; - private List<Group> groupsIsCollab; - - public ParticipationData() { - this(null, null); - } - - public ParticipationData(final List<Group> groupsIsAdmin, final List<Group> groupsIsCollab) { - this.groupsIsAdmin = groupsIsAdmin; - this.groupsIsCollab = groupsIsCollab; - } - - public List<Group> getGroupsIsAdmin() { - return groupsIsAdmin; - } - - public List<Group> getGroupsIsCollab() { - return groupsIsCollab; - } - - public void setGroupsIsAdmin(final List<Group> groupsIsAdmin) { - this.groupsIsAdmin = groupsIsAdmin; - } - - public void setGroupsIsCollab(final List<Group> groupsIsCollab) { - this.groupsIsCollab = groupsIsCollab; - } - -} 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 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java 2008-10-16 19:57:50 UTC (rev 914) @@ -71,7 +71,7 @@ throws DefaultException { checkGroupExistence(token); final Content descriptor = finder.getContent(token, defaultGroup); - if (descriptor.equals(Content.NO_CONTENT)) { + if (Content.NO_CONTENT.equals(descriptor)) { throw new NoDefaultContentException(); } final Access access = new Access(descriptor, descriptor.getContainer()); 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 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2008-10-16 19:57:50 UTC (rev 914) @@ -23,10 +23,10 @@ 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.ParticipationData; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.domain.SocialNetwork; import org.ourproject.kune.platf.server.domain.User; +import org.ourproject.kune.platf.server.sn.ParticipationData; public interface SocialNetworkManager extends Manager<SocialNetwork, Long> { 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 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java 2008-10-16 19:57:50 UTC (rev 914) @@ -23,6 +23,7 @@ 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; public interface UserManager { /** @@ -40,7 +41,7 @@ * @throws I18nNotFoundException */ User createUser(String shortName, String longName, String email, String passwd, String language, String country, - String timezone) throws I18nNotFoundException; + String timezone) throws I18nNotFoundException; /** * IMPORTANT: if userId == null, it returns User.UNKNOWN_USER @@ -50,6 +51,8 @@ */ User find(Long userId); + UserBuddiesData getUserBuddies(String shortName); + User login(String nickOrEmail, String passwd); void reIndex(); 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 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2008-10-16 19:57:50 UTC (rev 914) @@ -32,7 +32,6 @@ 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.ParticipationData; import org.ourproject.kune.platf.server.access.AccessRightsService; import org.ourproject.kune.platf.server.domain.AdmissionType; import org.ourproject.kune.platf.server.domain.Group; @@ -40,6 +39,7 @@ import org.ourproject.kune.platf.server.domain.SocialNetwork; import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.SocialNetworkManager; +import org.ourproject.kune.platf.server.sn.ParticipationData; import com.google.inject.Inject; import com.google.inject.Provider; 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 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2008-10-16 19:57:50 UTC (rev 914) @@ -20,6 +20,7 @@ package org.ourproject.kune.platf.server.manager.impl; +import java.util.Collection; import java.util.List; import java.util.TimeZone; @@ -30,6 +31,9 @@ import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; +import org.jivesoftware.smack.RosterEntry; +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.server.domain.I18nCountry; import org.ourproject.kune.platf.server.domain.I18nLanguage; @@ -37,6 +41,8 @@ import org.ourproject.kune.platf.server.manager.I18nCountryManager; import org.ourproject.kune.platf.server.manager.I18nLanguageManager; import org.ourproject.kune.platf.server.manager.UserManager; +import org.ourproject.kune.platf.server.properties.ChatProperties; +import org.ourproject.kune.platf.server.sn.UserBuddiesData; import com.google.inject.Inject; import com.google.inject.Provider; @@ -47,14 +53,19 @@ private final User finder; private final I18nCountryManager countryManager; private final I18nLanguageManager languageManager; + private final XmppManager xmppManager; + private final ChatProperties properties; @Inject public UserManagerDefault(final Provider<EntityManager> provider, final User finder, - final I18nLanguageManager languageManager, final I18nCountryManager countryManager) { + final I18nLanguageManager languageManager, final I18nCountryManager countryManager, + final XmppManager xmppManager, ChatProperties properties) { super(provider, User.class); this.finder = finder; this.languageManager = languageManager; this.countryManager = countryManager; + this.xmppManager = xmppManager; + this.properties = properties; } public User createUser(final String shortName, final String longName, final String email, final String passwd, @@ -70,6 +81,50 @@ } } + @Override + public User find(final Long userId) { + return userId != null ? super.find(userId) : User.UNKNOWN_USER; + } + + public List<User> getAll() { + return finder.getAll(); + } + + public User getByShortName(final String shortName) { + return finder.getByShortName(shortName); + } + + public UserBuddiesData getUserBuddies(final String shortName) { + // XEP-133 get roster by admin part is not implemented in openfire + // also access to the openfire db is not easy with hibernate (the use of + // two db at the same time). This compromise solution is server + // independent. + // In the future cache this. + String domain = "@" + properties.getDomain(); + UserBuddiesData buddiesData = new UserBuddiesData(); + User user = finder.getByShortName(shortName); + ChatConnection connection = xmppManager.login(user.getShortName(), user.getPassword(), "kserver"); + Collection<RosterEntry> roster = xmppManager.getRoster(connection); + for (RosterEntry entry : roster) { + switch (entry.getType()) { + case both: + // only show buddies with subscription 'both' + int index = entry.getUser().indexOf(domain); + if (index > 0) { + // local user + User buddie = finder.getByShortName(entry.getUser().substring(0, index)); + if (buddie != null) { + buddiesData.getBuddies().add(buddie); + } + } else { + // ext user (only count) + buddiesData.setOtherExternalBuddies(buddiesData.getOtherExternalBuddies() + 1); + } + } + } + return buddiesData; + } + public User login(final String nickOrEmail, final String passwd) { User user; try { @@ -88,18 +143,6 @@ } } - public List<User> getAll() { - return finder.getAll(); - } - - public User getByShortName(final String shortName) { - return finder.getByShortName(shortName); - } - - public User find(final Long userId) { - return userId != null ? super.find(userId) : User.UNKNOWN_USER; - } - public SearchResult<User> search(final String search) { return this.search(search, null, null); } 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 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2008-10-16 19:57:50 UTC (rev 914) @@ -32,6 +32,7 @@ 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.GroupType; import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; import org.ourproject.kune.platf.client.dto.StateDTO; import org.ourproject.kune.platf.client.dto.StateToken; @@ -65,6 +66,7 @@ import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.SocialNetworkManager; import org.ourproject.kune.platf.server.manager.TagManager; +import org.ourproject.kune.platf.server.manager.UserManager; import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.platf.server.state.State; import org.ourproject.kune.platf.server.state.StateService; @@ -90,18 +92,21 @@ private final SocialNetworkManager socialNetworkManager; private final CommentManager commentManager; private final AccessRightsService rightsService; + private final UserManager userManager; @Inject public ContentRPC(final Provider<UserSession> userSessionProvider, final AccessService accessService, final AccessRightsService rightsService, final StateService stateService, - final CreationService creationService, final GroupManager groupManager, final XmppManager xmppManager, - final ContentManager contentManager, final ContainerManager containerManager, final TagManager tagManager, + final CreationService creationService, final UserManager userManager, final GroupManager groupManager, + final XmppManager xmppManager, final ContentManager contentManager, + final ContainerManager containerManager, final TagManager tagManager, final SocialNetworkManager socialNetworkManager, final CommentManager commentManager, final Mapper mapper) { this.userSessionProvider = userSessionProvider; this.accessService = accessService; this.rightsService = rightsService; this.stateService = stateService; this.creationService = creationService; + this.userManager = userManager; this.groupManager = groupManager; this.xmppManager = xmppManager; this.contentManager = contentManager; @@ -421,6 +426,9 @@ state.setGroupTags(tagManager.getSummaryByGroup(group)); state.setGroupMembers(socialNetworkManager.get(user, group)); state.setParticipation(socialNetworkManager.findParticipation(user, group)); + if (group.getType().equals(GroupType.PERSONAL)) { + state.setUserBuddies(userManager.getUserBuddies(group.getShortName())); + } } private State createFolder(final String groupShortName, final Long parentFolderId, final String title, Copied: trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java (from rev 909, trunk/src/main/java/org/ourproject/kune/platf/server/ParticipationData.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/ParticipationData.java 2008-10-14 13:39:30 UTC (rev 909) +++ trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java 2008-10-16 19:57:50 UTC (rev 914) @@ -0,0 +1,55 @@ +/* + * + * Copyright (C) 2007-2008 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.server.sn; + +import java.util.List; + +import org.ourproject.kune.platf.server.domain.Group; + +public class ParticipationData { + private List<Group> groupsIsAdmin; + private List<Group> groupsIsCollab; + + public ParticipationData() { + this(null, null); + } + + public ParticipationData(final List<Group> groupsIsAdmin, final List<Group> groupsIsCollab) { + this.groupsIsAdmin = groupsIsAdmin; + this.groupsIsCollab = groupsIsCollab; + } + + public List<Group> getGroupsIsAdmin() { + return groupsIsAdmin; + } + + public List<Group> getGroupsIsCollab() { + return groupsIsCollab; + } + + public void setGroupsIsAdmin(final List<Group> groupsIsAdmin) { + this.groupsIsAdmin = groupsIsAdmin; + } + + public void setGroupsIsCollab(final List<Group> groupsIsCollab) { + this.groupsIsCollab = groupsIsCollab; + } + +} Property changes on: trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java ___________________________________________________________________ Name: svn:mergeinfo + Added: trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java 2008-10-16 19:57:50 UTC (rev 914) @@ -0,0 +1,33 @@ +package org.ourproject.kune.platf.server.sn; + +import java.util.ArrayList; +import java.util.List; + +import org.ourproject.kune.platf.server.domain.User; + +public class UserBuddiesData { + + private List<User> buddies; + int otherExternalBuddies; + + public UserBuddiesData() { + otherExternalBuddies = 0; + buddies = new ArrayList<User>(); + } + + public List<User> getBuddies() { + return buddies; + } + + public int getOtherExternalBuddies() { + return otherExternalBuddies; + } + + public void setBuddies(List<User> buddies) { + this.buddies = buddies; + } + + public void setOtherExternalBuddies(int otherExternalBuddies) { + this.otherExternalBuddies = otherExternalBuddies; + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/State.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/State.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/State.java 2008-10-16 19:57:50 UTC (rev 914) @@ -24,7 +24,6 @@ import java.util.List; import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.server.ParticipationData; import org.ourproject.kune.platf.server.access.AccessRights; import org.ourproject.kune.platf.server.domain.AccessLists; import org.ourproject.kune.platf.server.domain.BasicMimeType; @@ -36,6 +35,8 @@ import org.ourproject.kune.platf.server.domain.SocialNetwork; import org.ourproject.kune.platf.server.domain.TagResult; import org.ourproject.kune.platf.server.domain.User; +import org.ourproject.kune.platf.server.sn.ParticipationData; +import org.ourproject.kune.platf.server.sn.UserBuddiesData; public class State { private String documentId; @@ -66,6 +67,7 @@ private ParticipationData participation; private StateToken stateToken; private List<String> enabledTools; + private UserBuddiesData userBuddies; public State() { } @@ -178,6 +180,10 @@ return typeId; } + public UserBuddiesData getUserBuddies() { + return userBuddies; + } + public boolean isRateable() { return isRateable; } @@ -302,6 +308,10 @@ this.typeId = typeId; } + public void setUserBuddies(UserBuddiesData userBuddies) { + this.userBuddies = userBuddies; + } + @Override public String toString() { return "State[" + stateToken + "/" + typeId + "]"; 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 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2008-10-16 19:57:50 UTC (rev 914) @@ -20,12 +20,12 @@ package org.ourproject.kune.platf.server.users; import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.server.ParticipationData; import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.domain.I18nLanguage; import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.SocialNetworkManager; +import org.ourproject.kune.platf.server.sn.ParticipationData; import com.google.inject.Inject; import com.google.inject.Singleton; Added: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummary.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummary.java 2008-10-16 19:57:50 UTC (rev 914) @@ -0,0 +1,5 @@ +package org.ourproject.kune.workspace.client.socialnet; + +public interface BuddiesSummary { + +} Added: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2008-10-16 19:57:50 UTC (rev 914) @@ -0,0 +1,70 @@ +package org.ourproject.kune.workspace.client.socialnet; + +import org.ourproject.kune.platf.client.dto.UserSimpleDTO; +import org.ourproject.kune.platf.client.services.I18nTranslationService; +import org.ourproject.kune.workspace.client.skel.SummaryPanel; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; + +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.VerticalPanel; + +public class BuddiesSummaryPanel extends SummaryPanel implements BuddiesSummaryView { + + public class BuddieWidget extends Composite { + private final Image icon; + private final Label nick; + + public BuddieWidget(String nickName) { + VerticalPanel vp = new VerticalPanel(); + icon = new Image("images/persons/person2-32.png"); + nick = new Label(nickName); + vp.add(icon); + vp.add(nick); + initWidget(vp); + } + + public void setIcon(String url) { + icon.setUrl(url); + } + + public void setNick(String nickName) { + nick.setText(nickName); + } + } + private final FlowPanel flowPanel; + private final Label otherBuddiesLabel; + private final I18nTranslationService i18n; + + public BuddiesSummaryPanel(final BuddiesSummaryPresenter presenter, final WorkspaceSkeleton ws, + I18nTranslationService i18n) { + super(i18n.t("Buddies"), i18n.t("Buddies of this user"), ws); + this.i18n = i18n; + VerticalPanel vp = new VerticalPanel(); + flowPanel = new FlowPanel(); + otherBuddiesLabel = new Label(); + vp.add(flowPanel); + vp.add(otherBuddiesLabel); + super.add(vp); + } + + public void addBuddie(UserSimpleDTO user) { + flowPanel.add(new BuddieWidget(user.getShortName())); + } + + @Override + public void clear() { + flowPanel.clear(); + otherBuddiesLabel.setText(i18n.t("This user has no buddies")); + } + + public void setOtherUsers(int otherExternalBuddies) { + if (otherExternalBuddies > 0) { + otherBuddiesLabel.setText(i18n.t("and [%d] external users", otherExternalBuddies)); + } else { + otherBuddiesLabel.setText(""); + } + } +} Added: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2008-10-16 19:57:50 UTC (rev 914) @@ -0,0 +1,48 @@ +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.dto.GroupType; +import org.ourproject.kune.platf.client.dto.StateDTO; +import org.ourproject.kune.platf.client.dto.UserBuddiesDataDTO; +import org.ourproject.kune.platf.client.dto.UserSimpleDTO; +import org.ourproject.kune.platf.client.state.Session; +import org.ourproject.kune.platf.client.state.StateManager; + +import com.calclab.suco.client.listener.Listener2; + +public class BuddiesSummaryPresenter implements BuddiesSummary { + + private BuddiesSummaryView view; + + public BuddiesSummaryPresenter(StateManager stateManager, final Session session) { + stateManager.onGroupChanged(new Listener2<GroupDTO, GroupDTO>() { + public void onEvent(GroupDTO param1, GroupDTO param2) { + setState(session.getCurrentState()); + } + }); + } + + public View getView() { + return view; + } + + public void init(BuddiesSummaryView view) { + this.view = view; + } + + protected void setState(StateDTO state) { + if (state.getGroup().getType().equals(GroupType.PERSONAL)) { + view.clear(); + UserBuddiesDataDTO userBuddies = state.getUserBuddies(); + for (UserSimpleDTO user : userBuddies.getBuddies()) { + view.addBuddie(user); + } + view.setOtherUsers(userBuddies.getOtherExternalBuddies()); + view.show(); + } else { + view.hide(); + } + } + +} Added: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java 2008-10-16 19:57:50 UTC (rev 914) @@ -0,0 +1,17 @@ +package org.ourproject.kune.workspace.client.socialnet; + +import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.dto.UserSimpleDTO; + +public interface BuddiesSummaryView extends View { + + void addBuddie(UserSimpleDTO user); + + void clear(); + + void hide(); + + void setOtherUsers(int otherExternalBuddies); + + void show(); +} Modified: trunk/src/main/resources/dozerBeanMapping.xml =================================================================== --- trunk/src/main/resources/dozerBeanMapping.xml 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/main/resources/dozerBeanMapping.xml 2008-10-16 19:57:50 UTC (rev 914) @@ -307,7 +307,7 @@ org.ourproject.kune.platf.client.dto.ParticipationDataDTO </class-a> <class-b> - org.ourproject.kune.platf.server.ParticipationData + org.ourproject.kune.platf.server.sn.ParticipationData </class-b> </mapping> @@ -446,4 +446,12 @@ </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> + </mapping> </mappings> \ No newline at end of file Modified: trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java 2008-10-16 19:57:50 UTC (rev 914) @@ -6,14 +6,36 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import com.google.inject.Inject; -//FIXME: check this tests -public abstract class XmppManagerTest { +public class XmppManagerTest { + public static class OutputListener implements RoomListener { + Log log = LogFactory.getLog(OutputListener.class); + private final String name; + private int hits; + + public OutputListener(final String name) { + this.name = name; + this.hits = 0; + } + + public int getHits() { + return hits; + } + + public void onMessage(final String from, final String to, final String body) { + log.debug("Al listener " + name + "ha llegado: "); + log.debug(from + "- " + to + ": " + body); + hits++; + } + + } + @Inject XmppManager manager; @@ -22,18 +44,7 @@ IntegrationTestHelper.createInjector().injectMembers(this); } - @Test - public void testConnection() { - ChatConnection handler1 = manager.login("admin", "easyeasy", "test"); - assertNotNull(handler1); - } - - // @Test(expected = ChatException.class) - public void testUserDontExist() { - manager.login("user", "passowrd", "test"); - } - - // @Test + @Ignore public void testBroadcast() { String roomName = "roomName"; ChatConnection conn1 = manager.login("testUser1", "easy1", "test"); @@ -58,25 +69,20 @@ assertEquals(4, listener2.getHits()); } - public static class OutputListener implements RoomListener { - Log log = LogFactory.getLog(OutputListener.class); - private final String name; - private int hits; + @Test + public void testConnection() { + ChatConnection handler1 = manager.login("admin", "easyeasy", "test"); + assertNotNull(handler1); + } - public OutputListener(final String name) { - this.name = name; - this.hits = 0; - } + @Test + public void testGetRoster() { + ChatConnection handler = manager.login("admin", "easyeasy", "test"); + assertNotNull(manager.getRoster(handler)); + } - public void onMessage(final String from, final String to, final String body) { - log.debug("Al listener " + name + "ha llegado: "); - log.debug(from + "- " + to + ": " + body); - hits++; - } - - public int getHits() { - return hits; - } - + @Test(expected = ChatException.class) + public void testUserDontExist() { + manager.login("user", "passowrd", "test"); } } 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 2008-10-16 14:34:33 UTC (rev 913) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java 2008-10-16 19:57:50 UTC (rev 914) @@ -12,12 +12,12 @@ 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.ParticipationData; import org.ourproject.kune.platf.server.PersistenceTest; import org.ourproject.kune.platf.server.domain.AdmissionType; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.domain.GroupListMode; import org.ourproject.kune.platf.server.domain.User; +import org.ourproject.kune.platf.server.sn.ParticipationData; import org.ourproject.kune.testhelper.ctx.DomainContext; import com.google.inject.Inject;

1 0

16 Oct '08

Author: vjrj Date: 2008-10-16 16:34:33 +0200 (Thu, 16 Oct 2008) New Revision: 913 Added: trunk/src/main/java/org/ourproject/kune/platf/client/dto/ToolSimpleDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerToolRegistry.java trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerToolTarget.java trunk/src/main/java/org/ourproject/kune/platf/server/tool/ToolSimple.java Removed: trunk/src/main/java/org/ourproject/kune/platf/server/tool/ToolRegistry.java Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneContainerListener.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/server/DocumentServerTool.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.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/services/KuneErrorHandler.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/tool/ToolSelectorItem.java trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemView.java trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultForm.java trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationServiceDefault.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/ToolConfiguration.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.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/impl/GroupManagerDefault.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/SiteRPC.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java trunk/src/main/java/org/ourproject/kune/platf/server/state/State.java trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerTool.java trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java trunk/src/main/java/org/ourproject/kune/workspace/client/site/rpc/UserService.java trunk/src/main/java/org/ourproject/kune/workspace/client/site/rpc/UserServiceAsync.java trunk/src/main/resources/dozerBeanMapping.xml trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/server/PersistenceTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java Log: Incomplete - task Resolve signIn dialog issues (margins, message, overflow) Incomplete - task Tools must me optional and User/Group creation must reflect this Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneContainerListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/KuneContainerListener.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/app/server/KuneContainerListener.java 2008-10-16 14:34:33 UTC (rev 913) @@ -31,19 +31,19 @@ import org.apache.log4j.PropertyConfigurator; import org.ourproject.kune.docs.server.DocumentServerTool; import org.ourproject.kune.platf.server.KunePersistenceService; -import org.ourproject.kune.platf.server.tool.ToolRegistry; +import org.ourproject.kune.platf.server.tool.ServerToolRegistry; import org.ourproject.kune.rack.ContainerListener; import com.google.inject.Inject; class KuneContainerListener implements ContainerListener { KunePersistenceService persistenceService; - ToolRegistry toolRegistry; + ServerToolRegistry toolRegistry; DocumentServerTool documentTool; Logger logger; @Inject - public KuneContainerListener(KunePersistenceService persistenceService, ToolRegistry toolRegistry, DocumentServerTool documentTool, Logger logger) { + public KuneContainerListener(KunePersistenceService persistenceService, ServerToolRegistry toolRegistry, DocumentServerTool documentTool, Logger logger) { this.persistenceService = persistenceService; this.toolRegistry = toolRegistry; this.documentTool = documentTool; Modified: trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java 2008-10-16 14:34:33 UTC (rev 913) @@ -30,7 +30,8 @@ import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; import org.ourproject.kune.platf.server.tool.ServerTool; -import org.ourproject.kune.platf.server.tool.ToolRegistry; +import org.ourproject.kune.platf.server.tool.ServerToolRegistry; +import org.ourproject.kune.platf.server.tool.ServerToolTarget; import com.google.inject.Inject; @@ -45,49 +46,57 @@ @Inject public ChatServerTool(final ToolConfigurationManager configurationManager, final ContainerManager containerManager) { - this.configurationManager = configurationManager; - this.containerManager = containerManager; + this.configurationManager = configurationManager; + this.containerManager = containerManager; } public String getName() { - return NAME; + return NAME; } + public String getRootName() { + return ROOT_NAME; + } + public Group initGroup(final User user, final Group group) { - final ToolConfiguration config = new ToolConfiguration(); - final Container container = containerManager.createRootFolder(group, NAME, ROOT_NAME, TYPE_ROOT); - config.setRoot(container); - group.setToolConfig(NAME, config); - configurationManager.persist(config); - return group; + final ToolConfiguration config = new ToolConfiguration(); + final Container container = containerManager.createRootFolder(group, NAME, ROOT_NAME, TYPE_ROOT); + config.setRoot(container); + group.setToolConfig(NAME, config); + configurationManager.persist(config); + return group; } public void onCreateContainer(final Container container, final Container parent, final String typeId) { - checkTypeId(parent.getTypeId(), typeId); - container.setTypeId(typeId); + checkTypeId(parent.getTypeId(), typeId); + container.setTypeId(typeId); } public void onCreateContent(final Content content, final Container parent) { - if (parent.getTypeId().equals(TYPE_ROOM)) { - throw new RuntimeException(); - } - content.setTypeId(TYPE_CHAT); + if (parent.getTypeId().equals(TYPE_ROOM)) { + throw new RuntimeException(); + } + content.setTypeId(TYPE_CHAT); } @Inject - public void register(final ToolRegistry registry) { - registry.register(this); + public void register(final ServerToolRegistry registry) { + registry.register(this); } + public ServerToolTarget getTarget() { + return ServerToolTarget.forGroups; + } + private void checkTypeId(final String parentTypeId, final String typeId) { - if (typeId.equals(TYPE_ROOM)) { - if (!parentTypeId.equals(TYPE_ROOT)) { - throw new ContainerNotPermittedException(); - } - // ok valid container - } else { - throw new ContainerNotPermittedException(); - } + if (typeId.equals(TYPE_ROOM)) { + if (!parentTypeId.equals(TYPE_ROOT)) { + throw new ContainerNotPermittedException(); + } + // ok valid container + } else { + throw new ContainerNotPermittedException(); + } } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-10-16 14:34:33 UTC (rev 913) @@ -67,441 +67,442 @@ private final DocumentContent documentContent; public DocumentClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, - final Session session, final StateManager stateManager, - final Provider<ContentServiceAsync> contentServiceProvider, - final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, - final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, - final Provider<FileDownloadUtils> fileDownloadProvider, final EntityLogo entityLogo, - final Provider<TextEditor> textEditorProvider, final KuneErrorHandler errorHandler, - final DocumentContent documentContent) { - this.i18n = i18n; - this.contextNavigator = contextNavigator; - this.session = session; - this.stateManager = stateManager; - this.contentServiceProvider = contentServiceProvider; - this.groupServiceProvider = groupServiceProvider; - this.fileUploaderProvider = fileUploaderProvider; - this.contextActionRegistry = contextActionRegistry; - this.contentActionRegistry = contentActionRegistry; - this.fileDownloadProvider = fileDownloadProvider; - this.entityLogo = entityLogo; - this.textEditorProvider = textEditorProvider; - this.errorHandler = errorHandler; - this.documentContent = documentContent; - createActions(); + final Session session, final StateManager stateManager, + final Provider<ContentServiceAsync> contentServiceProvider, + final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, + final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, + final Provider<FileDownloadUtils> fileDownloadProvider, final EntityLogo entityLogo, + final Provider<TextEditor> textEditorProvider, final KuneErrorHandler errorHandler, + final DocumentContent documentContent) { + this.i18n = i18n; + this.contextNavigator = contextNavigator; + this.session = session; + this.stateManager = stateManager; + this.contentServiceProvider = contentServiceProvider; + this.groupServiceProvider = groupServiceProvider; + this.fileUploaderProvider = fileUploaderProvider; + this.contextActionRegistry = contextActionRegistry; + this.contentActionRegistry = contentActionRegistry; + this.fileDownloadProvider = fileDownloadProvider; + this.entityLogo = entityLogo; + this.textEditorProvider = textEditorProvider; + this.errorHandler = errorHandler; + this.documentContent = documentContent; + createActions(); } private void createActions() { - final ActionToolbarMenuAndItemDescriptor<StateToken> addFolder = createFolderAction(TYPE_FOLDER, - "images/nav/folder_add.png", i18n.t("New folder"), i18n.t("Folder"), i18n.t("New"), i18n - .t("New folder")); - final ActionToolbarMenuAndItemDescriptor<StateToken> addGallery = createFolderAction(TYPE_GALLERY, - "images/nav/gallery_add.png", i18n.t("New gallery"), i18n.t("Folder"), i18n.t("New"), i18n - .t("New gallery")); - final ActionToolbarMenuAndItemDescriptor<StateToken> addWiki = createFolderAction(TYPE_WIKI, - "images/nav/wiki_add.png", i18n.t("New wiki"), i18n.t("Folder"), i18n.t("New"), i18n.t("wiki")); + final ActionToolbarMenuAndItemDescriptor<StateToken> addFolder = createFolderAction(TYPE_FOLDER, + "images/nav/folder_add.png", i18n.t("New folder"), i18n.t("Folder"), i18n.t("New"), i18n + .t("New folder")); + final ActionToolbarMenuAndItemDescriptor<StateToken> addGallery = createFolderAction(TYPE_GALLERY, + "images/nav/gallery_add.png", i18n.t("New gallery"), i18n.t("Folder"), i18n.t("New"), i18n + .t("New gallery")); + final ActionToolbarMenuAndItemDescriptor<StateToken> addWiki = createFolderAction(TYPE_WIKI, + "images/nav/wiki_add.png", i18n.t("New wiki"), i18n.t("Folder"), i18n.t("New"), i18n.t("wiki")); - final ActionToolbarMenuAndItemDescriptor<StateToken> addDoc = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken token) { - Site.showProgressProcessing(); - contentServiceProvider.get().addContent(session.getUserHash(), - session.getCurrentState().getStateToken(), i18n.t("New document"), - new AsyncCallbackSimple<StateDTO>() { - public void onSuccess(final StateDTO state) { - contextNavigator.setEditOnNextStateChange(true); - stateManager.setRetrievedState(state); - } - }); - } - }); - addDoc.setTextDescription(i18n.t("New document")); - addDoc.setParentMenuTitle(i18n.t("Folder")); - addDoc.setParentSubMenuTitle(i18n.t("New")); - addDoc.setIconUrl("images/nav/page_add.png"); + final ActionToolbarMenuAndItemDescriptor<StateToken> addDoc = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken token) { + Site.showProgressProcessing(); + contentServiceProvider.get().addContent(session.getUserHash(), + session.getCurrentState().getStateToken(), i18n.t("New document"), + new AsyncCallbackSimple<StateDTO>() { + public void onSuccess(final StateDTO state) { + contextNavigator.setEditOnNextStateChange(true); + stateManager.setRetrievedState(state); + } + }); + } + }); + addDoc.setTextDescription(i18n.t("New document")); + addDoc.setParentMenuTitle(i18n.t("Folder")); + addDoc.setParentSubMenuTitle(i18n.t("New")); + addDoc.setIconUrl("images/nav/page_add.png"); - final ActionToolbarMenuAndItemDescriptor<StateToken> delContainer = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Administrator, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken token) { - Site.info("Sorry, in development"); - } - }); - delContainer.setParentMenuTitle(i18n.t("Folder")); - delContainer.setTextDescription(i18n.t("Delete folder")); - delContainer.setMustBeConfirmed(true); - delContainer.setConfirmationTitle(i18n.t("Please confirm")); - delContainer.setConfirmationText(i18n.t("You will delete it and also all its contents. Are you sure?")); + final ActionToolbarMenuAndItemDescriptor<StateToken> delContainer = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Administrator, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken token) { + Site.info("Sorry, in development"); + } + }); + delContainer.setParentMenuTitle(i18n.t("Folder")); + delContainer.setTextDescription(i18n.t("Delete folder")); + delContainer.setMustBeConfirmed(true); + delContainer.setConfirmationTitle(i18n.t("Please confirm")); + delContainer.setConfirmationText(i18n.t("You will delete it and also all its contents. Are you sure?")); - final ActionToolbarMenuAndItemDescriptor<StateToken> delContent = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Administrator, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken token) { - contentServiceProvider.get().delContent(session.getUserHash(), token, - new AsyncCallbackSimple<String>() { - public void onSuccess(final String result) { - final StateToken parent = token.clone().clearDocument(); - stateManager.gotoToken(parent); - } - }); - } - }); - delContent.setParentMenuTitle(i18n.t("File")); - delContent.setTextDescription(i18n.t("Delete")); - delContent.setMustBeConfirmed(true); - delContent.setConfirmationTitle(i18n.t("Please confirm")); - delContent.setConfirmationText(i18n.t("Are you sure?")); - delContent.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken itemToken) { - final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent() - .getStateToken(); - return !itemToken.equals(defContentToken); - } - }); + final ActionToolbarMenuAndItemDescriptor<StateToken> delContent = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Administrator, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken token) { + contentServiceProvider.get().delContent(session.getUserHash(), token, + new AsyncCallbackSimple<String>() { + public void onSuccess(final String result) { + final StateToken parent = token.clone().clearDocument(); + stateManager.gotoToken(parent); + } + }); + } + }); + delContent.setParentMenuTitle(i18n.t("File")); + delContent.setTextDescription(i18n.t("Delete")); + delContent.setMustBeConfirmed(true); + delContent.setConfirmationTitle(i18n.t("Please confirm")); + delContent.setConfirmationText(i18n.t("Are you sure?")); + delContent.setEnableCondition(new ActionEnableCondition<StateToken>() { + public boolean mustBeEnabled(final StateToken itemToken) { + final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent() + .getStateToken(); + return !itemToken.equals(defContentToken); + } + }); - final ActionMenuItemDescriptor<StateToken> go = new ActionMenuItemDescriptor<StateToken>(AccessRolDTO.Viewer, - new Listener<StateToken>() { - public void onEvent(final StateToken token) { - stateManager.gotoToken(token); - } - }); - go.setMustBeAuthenticated(false); - go.setTextDescription(i18n.t("Open")); - go.setIconUrl("images/nav/go.png"); - go.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken itemToken) { - return !contextNavigator.isSelected(itemToken); - } - }); + final ActionMenuItemDescriptor<StateToken> go = new ActionMenuItemDescriptor<StateToken>(AccessRolDTO.Viewer, + new Listener<StateToken>() { + public void onEvent(final StateToken token) { + stateManager.gotoToken(token); + } + }); + go.setMustBeAuthenticated(false); + go.setTextDescription(i18n.t("Open")); + go.setIconUrl("images/nav/go.png"); + go.setEnableCondition(new ActionEnableCondition<StateToken>() { + public boolean mustBeEnabled(final StateToken itemToken) { + return !contextNavigator.isSelected(itemToken); + } + }); - final ActionToolbarMenuAndItemDescriptor<StateToken> renameCtn = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken stateToken) { - contextNavigator.editItem(stateToken); - } - }); - renameCtn.setTextDescription(i18n.t("Rename")); - renameCtn.setParentMenuTitle(i18n.t("File")); + final ActionToolbarMenuAndItemDescriptor<StateToken> renameCtn = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken stateToken) { + contextNavigator.editItem(stateToken); + } + }); + renameCtn.setTextDescription(i18n.t("Rename")); + renameCtn.setParentMenuTitle(i18n.t("File")); - final ActionToolbarMenuAndItemDescriptor<StateToken> renameCtx = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken stateToken) { - contextNavigator.editItem(stateToken); - } - }); - renameCtx.setTextDescription(i18n.t("Rename")); - renameCtx.setParentMenuTitle(i18n.t("Folder")); + final ActionToolbarMenuAndItemDescriptor<StateToken> renameCtx = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken stateToken) { + contextNavigator.editItem(stateToken); + } + }); + renameCtx.setTextDescription(i18n.t("Rename")); + renameCtx.setParentMenuTitle(i18n.t("Folder")); - final ActionToolbarButtonDescriptor<StateToken> goGroupHome = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Viewer, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken token) { - stateManager.gotoToken(token.getGroup()); - } - }); - goGroupHome.setMustBeAuthenticated(false); - goGroupHome.setIconUrl("images/group-home.png"); - goGroupHome.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken itemToken) { - final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent() - .getStateToken(); - return !itemToken.equals(defContentToken); - } - }); + final ActionToolbarButtonDescriptor<StateToken> goGroupHome = new ActionToolbarButtonDescriptor<StateToken>( + AccessRolDTO.Viewer, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken token) { + stateManager.gotoToken(token.getGroup()); + } + }); + goGroupHome.setMustBeAuthenticated(false); + goGroupHome.setIconUrl("images/group-home.png"); + goGroupHome.setEnableCondition(new ActionEnableCondition<StateToken>() { + public boolean mustBeEnabled(final StateToken itemToken) { + final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent() + .getStateToken(); + return !itemToken.equals(defContentToken); + } + }); - final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCnt; - setAsDefGroupCnt = createSetAsDefContent(); - setAsDefGroupCnt.setParentMenuTitle(i18n.t("File")); + final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCnt; + setAsDefGroupCnt = createSetAsDefContent(); + setAsDefGroupCnt.setParentMenuTitle(i18n.t("File")); - final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt; - setAsDefGroupCxt = createSetAsDefContent(); - setAsDefGroupCxt.setParentMenuTitle(i18n.t("Folder")); + final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt; + setAsDefGroupCxt = createSetAsDefContent(); + setAsDefGroupCxt.setParentMenuTitle(i18n.t("Folder")); - final ActionToolbarMenuDescriptor<StateToken> refreshCtx = new ActionToolbarMenuDescriptor<StateToken>( - AccessRolDTO.Viewer, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken stateToken) { - stateManager.reload(); - contextNavigator.selectItem(stateToken); - } - }); - refreshCtx.setMustBeAuthenticated(false); - refreshCtx.setParentMenuTitle(i18n.t("Folder")); - refreshCtx.setTextDescription(i18n.t("Refresh")); - refreshCtx.setIconUrl("images/nav/refresh.png"); + final ActionToolbarMenuDescriptor<StateToken> refreshCtx = new ActionToolbarMenuDescriptor<StateToken>( + AccessRolDTO.Viewer, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken stateToken) { + Site.important("Refresh with state token: " + stateToken); + stateManager.reload(); + contextNavigator.selectItem(stateToken); + } + }); + refreshCtx.setMustBeAuthenticated(false); + refreshCtx.setParentMenuTitle(i18n.t("Folder")); + refreshCtx.setTextDescription(i18n.t("Refresh")); + refreshCtx.setIconUrl("images/nav/refresh.png"); - final ActionToolbarMenuDescriptor<StateToken> refreshCnt = new ActionToolbarMenuDescriptor<StateToken>( - AccessRolDTO.Viewer, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken stateToken) { - stateManager.reload(); - contextNavigator.selectItem(stateToken); - } - }); - refreshCnt.setMustBeAuthenticated(false); - refreshCnt.setParentMenuTitle(i18n.t("File")); - refreshCnt.setTextDescription(i18n.t("Refresh")); - refreshCnt.setIconUrl("images/nav/refresh.png"); + final ActionToolbarMenuDescriptor<StateToken> refreshCnt = new ActionToolbarMenuDescriptor<StateToken>( + AccessRolDTO.Viewer, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken stateToken) { + stateManager.reload(); + contextNavigator.selectItem(stateToken); + } + }); + refreshCnt.setMustBeAuthenticated(false); + refreshCnt.setParentMenuTitle(i18n.t("File")); + refreshCnt.setTextDescription(i18n.t("Refresh")); + refreshCnt.setIconUrl("images/nav/refresh.png"); - final ActionToolbarButtonAndItemDescriptor<StateToken> uploadFile = createUploadAction(i18n.t("Upload file"), - "images/nav/upload.png", i18n.t("Upload some files (images, PDFs, ...)"), null); + final ActionToolbarButtonAndItemDescriptor<StateToken> uploadFile = createUploadAction(i18n.t("Upload file"), + "images/nav/upload.png", i18n.t("Upload some files (images, PDFs, ...)"), null); - session.onInitDataReceived(new Listener<InitDataDTO>() { - public void onEvent(final InitDataDTO parameter) { - final ActionToolbarButtonAndItemDescriptor<StateToken> uploadMedia = createUploadAction(i18n - .t("Upload media"), "images/nav/upload.png", i18n.t("Upload some media (images, videos)"), - session.getGalleryPermittedExtensions()); - contextActionRegistry.addAction(uploadMedia, TYPE_GALLERY); - } - }); + session.onInitDataReceived(new Listener<InitDataDTO>() { + public void onEvent(final InitDataDTO parameter) { + final ActionToolbarButtonAndItemDescriptor<StateToken> uploadMedia = createUploadAction(i18n + .t("Upload media"), "images/nav/upload.png", i18n.t("Upload some media (images, videos)"), + session.getGalleryPermittedExtensions()); + contextActionRegistry.addAction(uploadMedia, TYPE_GALLERY); + } + }); - final ActionToolbarButtonDescriptor<StateToken> download = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Viewer, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken token) { - downloadContent(token); - } - }); - download.setMustBeAuthenticated(false); - download.setTextDescription(i18n.t("Download")); - download.setToolTip(i18n.t("Download this file")); - download.setIconUrl("images/nav/download.png"); + final ActionToolbarButtonDescriptor<StateToken> download = new ActionToolbarButtonDescriptor<StateToken>( + AccessRolDTO.Viewer, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken token) { + downloadContent(token); + } + }); + download.setMustBeAuthenticated(false); + download.setTextDescription(i18n.t("Download")); + download.setToolTip(i18n.t("Download this file")); + download.setIconUrl("images/nav/download.png"); - final ActionMenuItemDescriptor<StateToken> downloadCtx = new ActionMenuItemDescriptor<StateToken>( - AccessRolDTO.Viewer, new Listener<StateToken>() { - public void onEvent(final StateToken token) { - downloadContent(token); - } - }); - downloadCtx.setMustBeAuthenticated(false); - downloadCtx.setTextDescription(i18n.t("Download")); - downloadCtx.setIconUrl("images/nav/download.png"); + final ActionMenuItemDescriptor<StateToken> downloadCtx = new ActionMenuItemDescriptor<StateToken>( + AccessRolDTO.Viewer, new Listener<StateToken>() { + public void onEvent(final StateToken token) { + downloadContent(token); + } + }); + downloadCtx.setMustBeAuthenticated(false); + downloadCtx.setTextDescription(i18n.t("Download")); + downloadCtx.setIconUrl("images/nav/download.png"); - final ActionToolbarMenuAndItemDescriptor<StateToken> setGroupLogo = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Administrator, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken token) { - groupServiceProvider.get().setGroupLogo(session.getUserHash(), token, - new AsyncCallbackSimple<GroupDTO>() { - public void onSuccess(GroupDTO newGroup) { - Site.info("Logo selected"); - if (session.getCurrentState().getGroup().getShortName().equals( - newGroup.getShortName())) { - session.getCurrentState().setGroup(newGroup); - } - entityLogo.refreshGroupLogo(); - } - }); - } - }); - setGroupLogo.setParentMenuTitle(i18n.t("File")); - setGroupLogo.setTextDescription(i18n.t("Set this as the group logo")); - setGroupLogo.setIconUrl("images/nav/picture.png"); - setGroupLogo.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken itemToken) { - final BasicMimeTypeDTO mime = session.getCurrentState().getMimeType(); - return mime != null && mime.getType().equals("image"); - } - }); + final ActionToolbarMenuAndItemDescriptor<StateToken> setGroupLogo = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Administrator, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken token) { + groupServiceProvider.get().setGroupLogo(session.getUserHash(), token, + new AsyncCallbackSimple<GroupDTO>() { + public void onSuccess(GroupDTO newGroup) { + Site.info("Logo selected"); + if (session.getCurrentState().getGroup().getShortName().equals( + newGroup.getShortName())) { + session.getCurrentState().setGroup(newGroup); + } + entityLogo.refreshGroupLogo(); + } + }); + } + }); + setGroupLogo.setParentMenuTitle(i18n.t("File")); + setGroupLogo.setTextDescription(i18n.t("Set this as the group logo")); + setGroupLogo.setIconUrl("images/nav/picture.png"); + setGroupLogo.setEnableCondition(new ActionEnableCondition<StateToken>() { + public boolean mustBeEnabled(final StateToken itemToken) { + final BasicMimeTypeDTO mime = session.getCurrentState().getMimeType(); + return mime != null && mime.getType().equals("image"); + } + }); - final ActionToolbarMenuDescriptor<StateToken> setPublishStatus = createSetStatusAction( - AccessRolDTO.Administrator, i18n.t("Published online"), ContentStatusDTO.publishedOnline); - final ActionToolbarMenuDescriptor<StateToken> setEditionInProgressStatus = createSetStatusAction( - AccessRolDTO.Administrator, i18n.t("Editing in progress"), ContentStatusDTO.editingInProgress); - final ActionToolbarMenuDescriptor<StateToken> setRejectStatus = createSetStatusAction( - AccessRolDTO.Administrator, i18n.t("Rejected"), ContentStatusDTO.rejected); - final ActionToolbarMenuDescriptor<StateToken> setSubmittedForPublishStatus = createSetStatusAction( - AccessRolDTO.Administrator, i18n.t("Submitted for publish"), ContentStatusDTO.publishedOnline); - final ActionToolbarMenuDescriptor<StateToken> setInTheDustBinStatus = createSetStatusAction( - AccessRolDTO.Administrator, i18n.t("In the dustbin"), ContentStatusDTO.inTheDustbin); + final ActionToolbarMenuDescriptor<StateToken> setPublishStatus = createSetStatusAction( + AccessRolDTO.Administrator, i18n.t("Published online"), ContentStatusDTO.publishedOnline); + final ActionToolbarMenuDescriptor<StateToken> setEditionInProgressStatus = createSetStatusAction( + AccessRolDTO.Administrator, i18n.t("Editing in progress"), ContentStatusDTO.editingInProgress); + final ActionToolbarMenuDescriptor<StateToken> setRejectStatus = createSetStatusAction( + AccessRolDTO.Administrator, i18n.t("Rejected"), ContentStatusDTO.rejected); + final ActionToolbarMenuDescriptor<StateToken> setSubmittedForPublishStatus = createSetStatusAction( + AccessRolDTO.Administrator, i18n.t("Submitted for publish"), ContentStatusDTO.publishedOnline); + final ActionToolbarMenuDescriptor<StateToken> setInTheDustBinStatus = createSetStatusAction( + AccessRolDTO.Administrator, i18n.t("In the dustbin"), ContentStatusDTO.inTheDustbin); - final ActionToolbarButtonDescriptor<StateToken> translateContent = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken stateToken) { - Site.important(i18n.t("Sorry, this functionality is currently in development")); - } - }); - translateContent.setTextDescription(i18n.tWithNT("Translate", "used in button")); - translateContent.setToolTip(i18n.t("Translate this document to other languages")); - translateContent.setIconUrl("images/language.gif"); - translateContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); + final ActionToolbarButtonDescriptor<StateToken> translateContent = new ActionToolbarButtonDescriptor<StateToken>( + AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken stateToken) { + Site.important(i18n.t("Sorry, this functionality is currently in development")); + } + }); + translateContent.setTextDescription(i18n.tWithNT("Translate", "used in button")); + translateContent.setToolTip(i18n.t("Translate this document to other languages")); + translateContent.setIconUrl("images/language.gif"); + translateContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); - final ActionToolbarButtonDescriptor<StateToken> editContent = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken stateToken) { - session.check(new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - final TextEditor editor = textEditorProvider.get(); - documentContent.detach(); - editor.editContent(session.getCurrentState().getContent(), new Listener<String>() { - public void onEvent(final String html) { - Site.showProgressSaving(); - contentServiceProvider.get().save(session.getUserHash(), stateToken, html, - new AsyncCallback<Integer>() { - public void onFailure(final Throwable caught) { - Site.hideProgress(); - try { - throw caught; - } catch (final SessionExpiredException e) { - errorHandler.doSessionExpired(); - } catch (final Throwable e) { - Site.error(i18n.t("Error saving document. Retrying...")); - errorHandler.process(caught); - editor.onSaveFailed(); - } - } + final ActionToolbarButtonDescriptor<StateToken> editContent = new ActionToolbarButtonDescriptor<StateToken>( + AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken stateToken) { + session.check(new AsyncCallbackSimple<Object>() { + public void onSuccess(final Object result) { + final TextEditor editor = textEditorProvider.get(); + documentContent.detach(); + editor.editContent(session.getCurrentState().getContent(), new Listener<String>() { + public void onEvent(final String html) { + Site.showProgressSaving(); + contentServiceProvider.get().save(session.getUserHash(), stateToken, html, + new AsyncCallback<Integer>() { + public void onFailure(final Throwable caught) { + Site.hideProgress(); + try { + throw caught; + } catch (final SessionExpiredException e) { + errorHandler.doSessionExpired(); + } catch (final Throwable e) { + Site.error(i18n.t("Error saving document. Retrying...")); + errorHandler.process(caught); + editor.onSaveFailed(); + } + } - public void onSuccess(final Integer newVersion) { - Site.hideProgress(); - session.getCurrentState().setVersion(newVersion); - session.getCurrentState().setContent(html); - editor.onSaved(); - } - }); - } - }, new Listener0() { - public void onEvent() { - // onClose - if (session.getCurrentStateToken().equals(stateToken)) { - documentContent.refreshState(); - } - } - }); - } - }); - } - }); - editContent.setTextDescription(i18n.tWithNT("Edit", "used in button")); - editContent.setIconUrl("images/content_edit.png"); - editContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); + public void onSuccess(final Integer newVersion) { + Site.hideProgress(); + session.getCurrentState().setVersion(newVersion); + session.getCurrentState().setContent(html); + editor.onSaved(); + } + }); + } + }, new Listener0() { + public void onEvent() { + // onClose + if (session.getCurrentStateToken().equals(stateToken)) { + documentContent.refreshState(); + } + } + }); + } + }); + } + }); + editContent.setTextDescription(i18n.tWithNT("Edit", "used in button")); + editContent.setIconUrl("images/content_edit.png"); + editContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); - final String[] all = { TYPE_ROOT, TYPE_FOLDER, TYPE_DOCUMENT, TYPE_GALLERY, TYPE_BLOG, TYPE_POST, TYPE_WIKI, - TYPE_WIKIPAGE, TYPE_UPLOADEDFILE }; - final String[] containersNoRoot = { TYPE_FOLDER, TYPE_GALLERY, TYPE_BLOG, TYPE_WIKI }; - final String[] containers = { TYPE_ROOT, TYPE_FOLDER, TYPE_GALLERY, TYPE_BLOG, TYPE_WIKI }; - final String[] contents = { TYPE_DOCUMENT, TYPE_POST, TYPE_WIKIPAGE, TYPE_UPLOADEDFILE }; - final String[] contentsModerated = { TYPE_DOCUMENT, TYPE_POST, TYPE_UPLOADEDFILE }; + final String[] all = { TYPE_ROOT, TYPE_FOLDER, TYPE_DOCUMENT, TYPE_GALLERY, TYPE_BLOG, TYPE_POST, TYPE_WIKI, + TYPE_WIKIPAGE, TYPE_UPLOADEDFILE }; + final String[] containersNoRoot = { TYPE_FOLDER, TYPE_GALLERY, TYPE_BLOG, TYPE_WIKI }; + final String[] containers = { TYPE_ROOT, TYPE_FOLDER, TYPE_GALLERY, TYPE_BLOG, TYPE_WIKI }; + final String[] contents = { TYPE_DOCUMENT, TYPE_POST, TYPE_WIKIPAGE, TYPE_UPLOADEDFILE }; + final String[] contentsModerated = { TYPE_DOCUMENT, TYPE_POST, TYPE_UPLOADEDFILE }; - contentActionRegistry.addAction(setPublishStatus, contentsModerated); - contentActionRegistry.addAction(setEditionInProgressStatus, contentsModerated); - contentActionRegistry.addAction(setRejectStatus, contentsModerated); - contentActionRegistry.addAction(setSubmittedForPublishStatus, contentsModerated); - contentActionRegistry.addAction(setInTheDustBinStatus, contentsModerated); - contextActionRegistry.addAction(addDoc, TYPE_ROOT, TYPE_FOLDER); - contextActionRegistry.addAction(addFolder, TYPE_ROOT, TYPE_FOLDER); - contextActionRegistry.addAction(addGallery, TYPE_ROOT); - contextActionRegistry.addAction(addWiki, TYPE_ROOT); - contextActionRegistry.addAction(go, all); - contentActionRegistry.addAction(renameCtn, contents); - contextActionRegistry.addAction(renameCtx, containersNoRoot); - contextActionRegistry.addAction(refreshCtx, containers); - contentActionRegistry.addAction(refreshCnt, contents); - contextActionRegistry.addAction(uploadFile, TYPE_ROOT, TYPE_FOLDER, TYPE_BLOG); - contentActionRegistry.addAction(download, TYPE_UPLOADEDFILE); - contentActionRegistry.addAction(delContent, contents); - contextActionRegistry.addAction(delContainer, containersNoRoot); - contentActionRegistry.addAction(setAsDefGroupCnt, TYPE_DOCUMENT, TYPE_UPLOADEDFILE); - contentActionRegistry.addAction(setAsDefGroupCxt, TYPE_BLOG); - contextActionRegistry.addAction(goGroupHome, containers); - contentActionRegistry.addAction(setGroupLogo, TYPE_UPLOADEDFILE); - contextActionRegistry.addAction(downloadCtx, TYPE_UPLOADEDFILE); - contentActionRegistry.addAction(editContent, TYPE_DOCUMENT, TYPE_POST, TYPE_WIKIPAGE); - contentActionRegistry.addAction(translateContent, TYPE_DOCUMENT, TYPE_FOLDER, TYPE_GALLERY, TYPE_UPLOADEDFILE, - TYPE_WIKI, TYPE_WIKIPAGE); + contentActionRegistry.addAction(setPublishStatus, contentsModerated); + contentActionRegistry.addAction(setEditionInProgressStatus, contentsModerated); + contentActionRegistry.addAction(setRejectStatus, contentsModerated); + contentActionRegistry.addAction(setSubmittedForPublishStatus, contentsModerated); + contentActionRegistry.addAction(setInTheDustBinStatus, contentsModerated); + contextActionRegistry.addAction(addDoc, TYPE_ROOT, TYPE_FOLDER); + contextActionRegistry.addAction(addFolder, TYPE_ROOT, TYPE_FOLDER); + contextActionRegistry.addAction(addGallery, TYPE_ROOT); + contextActionRegistry.addAction(addWiki, TYPE_ROOT); + contextActionRegistry.addAction(go, all); + contentActionRegistry.addAction(renameCtn, contents); + contextActionRegistry.addAction(renameCtx, containersNoRoot); + contextActionRegistry.addAction(refreshCtx, containers); + contentActionRegistry.addAction(refreshCnt, contents); + contextActionRegistry.addAction(uploadFile, TYPE_ROOT, TYPE_FOLDER, TYPE_BLOG); + contentActionRegistry.addAction(download, TYPE_UPLOADEDFILE); + contentActionRegistry.addAction(delContent, contents); + contextActionRegistry.addAction(delContainer, containersNoRoot); + contentActionRegistry.addAction(setAsDefGroupCnt, TYPE_DOCUMENT, TYPE_UPLOADEDFILE); + contentActionRegistry.addAction(setAsDefGroupCxt, TYPE_BLOG); + contextActionRegistry.addAction(goGroupHome, containers); + contentActionRegistry.addAction(setGroupLogo, TYPE_UPLOADEDFILE); + contextActionRegistry.addAction(downloadCtx, TYPE_UPLOADEDFILE); + contentActionRegistry.addAction(editContent, TYPE_DOCUMENT, TYPE_POST, TYPE_WIKIPAGE); + contentActionRegistry.addAction(translateContent, TYPE_DOCUMENT, TYPE_FOLDER, TYPE_GALLERY, TYPE_UPLOADEDFILE, + TYPE_WIKI, TYPE_WIKIPAGE); } private ActionToolbarMenuAndItemDescriptor<StateToken> createFolderAction(final String contentTypeId, - final String iconUrl, final String textDescription, final String parentMenuTitle, - final String parentMenuSubtitle, final String defaultName) { - final ActionToolbarMenuAndItemDescriptor<StateToken> addFolder; - addFolder = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Editor, - ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken stateToken) { - Site.showProgressProcessing(); - contentServiceProvider.get().addFolder(session.getUserHash(), stateToken, defaultName, - contentTypeId, new AsyncCallbackSimple<StateDTO>() { - public void onSuccess(final StateDTO state) { - contextNavigator.setEditOnNextStateChange(true); - stateManager.setRetrievedState(state); - } - }); - } - }); - addFolder.setTextDescription(textDescription); - addFolder.setParentMenuTitle(parentMenuTitle); - addFolder.setParentSubMenuTitle(parentMenuSubtitle); - addFolder.setIconUrl(iconUrl); - return addFolder; + final String iconUrl, final String textDescription, final String parentMenuTitle, + final String parentMenuSubtitle, final String defaultName) { + final ActionToolbarMenuAndItemDescriptor<StateToken> addFolder; + addFolder = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Editor, + ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken stateToken) { + Site.showProgressProcessing(); + contentServiceProvider.get().addFolder(session.getUserHash(), stateToken, defaultName, + contentTypeId, new AsyncCallbackSimple<StateDTO>() { + public void onSuccess(final StateDTO state) { + contextNavigator.setEditOnNextStateChange(true); + stateManager.setRetrievedState(state); + } + }); + } + }); + addFolder.setTextDescription(textDescription); + addFolder.setParentMenuTitle(parentMenuTitle); + addFolder.setParentSubMenuTitle(parentMenuSubtitle); + addFolder.setIconUrl(iconUrl); + return addFolder; } private ActionToolbarMenuDescriptor<StateToken> createSetAsDefContent() { - final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupContent; - setAsDefGroupContent = new ActionToolbarMenuDescriptor<StateToken>(AccessRolDTO.Administrator, - ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken token) { - Site.showProgressProcessing(); - contentServiceProvider.get().setAsDefaultContent(session.getUserHash(), token, - new AsyncCallbackSimple<ContentSimpleDTO>() { - public void onSuccess(final ContentSimpleDTO defContent) { - session.getCurrentState().getGroup().setDefaultContent(defContent); - Site.hideProgress(); - Site.info(i18n.t("Document selected as the group homepage")); - } - }); - } - }); - setAsDefGroupContent.setTextDescription(i18n.t("Set this as the group default page")); - setAsDefGroupContent.setIconUrl("images/group-home.png"); - setAsDefGroupContent.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken itemToken) { - final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent() - .getStateToken(); - return !itemToken.equals(defContentToken); - } - }); - return setAsDefGroupContent; + final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupContent; + setAsDefGroupContent = new ActionToolbarMenuDescriptor<StateToken>(AccessRolDTO.Administrator, + ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken token) { + Site.showProgressProcessing(); + contentServiceProvider.get().setAsDefaultContent(session.getUserHash(), token, + new AsyncCallbackSimple<ContentSimpleDTO>() { + public void onSuccess(final ContentSimpleDTO defContent) { + session.getCurrentState().getGroup().setDefaultContent(defContent); + Site.hideProgress(); + Site.info(i18n.t("Document selected as the group homepage")); + } + }); + } + }); + setAsDefGroupContent.setTextDescription(i18n.t("Set this as the group default page")); + setAsDefGroupContent.setIconUrl("images/group-home.png"); + setAsDefGroupContent.setEnableCondition(new ActionEnableCondition<StateToken>() { + public boolean mustBeEnabled(final StateToken itemToken) { + final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent() + .getStateToken(); + return !itemToken.equals(defContentToken); + } + }); + return setAsDefGroupContent; } private ActionToolbarMenuAndItemDescriptor<StateToken> createSetStatusAction(final AccessRolDTO rol, - final String textDescription, final ContentStatusDTO status) { - final ActionToolbarMenuAndItemDescriptor<StateToken> action = new ActionToolbarMenuAndItemDescriptor<StateToken>( - rol, ActionToolbarPosition.topbar, new Listener<StateToken>() { - public void onEvent(final StateToken stateToken) { - final AsyncCallbackSimple<Object> callback = new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - session.getCurrentState().setStatus(status); - } - }; - if (status.equals(ContentStatusDTO.publishedOnline) || status.equals(ContentStatusDTO.rejected)) { - contentServiceProvider.get().setStatusAsAdmin(session.getUserHash(), stateToken, status, - callback); - } else { - contentServiceProvider.get().setStatus(session.getUserHash(), stateToken, status, callback); - } - } - }); - action.setTextDescription(textDescription); - action.setParentMenuTitle(i18n.t("File")); - action.setParentSubMenuTitle(i18n.t("Change the status")); - return action; + final String textDescription, final ContentStatusDTO status) { + final ActionToolbarMenuAndItemDescriptor<StateToken> action = new ActionToolbarMenuAndItemDescriptor<StateToken>( + rol, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(final StateToken stateToken) { + final AsyncCallbackSimple<Object> callback = new AsyncCallbackSimple<Object>() { + public void onSuccess(final Object result) { + session.getCurrentState().setStatus(status); + } + }; + if (status.equals(ContentStatusDTO.publishedOnline) || status.equals(ContentStatusDTO.rejected)) { + contentServiceProvider.get().setStatusAsAdmin(session.getUserHash(), stateToken, status, + callback); + } else { + contentServiceProvider.get().setStatus(session.getUserHash(), stateToken, status, callback); + } + } + }); + action.setTextDescription(textDescription); + action.setParentMenuTitle(i18n.t("File")); + action.setParentSubMenuTitle(i18n.t("Change the status")); + return action; } private ActionToolbarButtonAndItemDescriptor<StateToken> createUploadAction(final String textDescription, - final String iconUrl, final String toolTip, final String permitedExtensions) { - final ActionToolbarButtonAndItemDescriptor<StateToken> uploadFile; - uploadFile = new ActionToolbarButtonAndItemDescriptor<StateToken>(AccessRolDTO.Editor, - ActionToolbarPosition.bottombar, new Listener<StateToken>() { - public void onEvent(final StateToken token) { - if (permitedExtensions != null) { - // FIXME: can't be reset ... - // fileUploaderProvider.get().setPermittedExtensions(permitedExtensions); - } else { - // FIXME: can't be reset ... - // fileUploaderProvider.get().resetPermittedExtensions(); - } - fileUploaderProvider.get().show(); - } - }); - uploadFile.setTextDescription(textDescription); - uploadFile.setIconUrl(iconUrl); - uploadFile.setToolTip(toolTip); - return uploadFile; + final String iconUrl, final String toolTip, final String permitedExtensions) { + final ActionToolbarButtonAndItemDescriptor<StateToken> uploadFile; + uploadFile = new ActionToolbarButtonAndItemDescriptor<StateToken>(AccessRolDTO.Editor, + ActionToolbarPosition.bottombar, new Listener<StateToken>() { + public void onEvent(final StateToken token) { + if (permitedExtensions != null) { + // FIXME: can't be reset ... + // fileUploaderProvider.get().setPermittedExtensions(permitedExtensions); + } else { + // FIXME: can't be reset ... + // fileUploaderProvider.get().resetPermittedExtensions(); + } + fileUploaderProvider.get().show(); + } + }); + uploadFile.setTextDescription(textDescription); + uploadFile.setIconUrl(iconUrl); + uploadFile.setToolTip(toolTip); + return uploadFile; } private void downloadContent(final StateToken token) { - fileDownloadProvider.get().downloadFile(token); + fileDownloadProvider.get().downloadFile(token); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java 2008-10-16 14:34:33 UTC (rev 913) @@ -32,7 +32,8 @@ import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; import org.ourproject.kune.platf.server.tool.ServerTool; -import org.ourproject.kune.platf.server.tool.ToolRegistry; +import org.ourproject.kune.platf.server.tool.ServerToolRegistry; +import org.ourproject.kune.platf.server.tool.ServerToolTarget; import com.google.inject.Inject; @@ -57,61 +58,67 @@ @Inject public DocumentServerTool(final ContentManager contentManager, final ContainerManager containerManager, - final ToolConfigurationManager configurationManager, final I18nTranslationService translationService) { - this.contentManager = contentManager; - this.containerManager = containerManager; - this.configurationManager = configurationManager; - this.i18n = translationService; + final ToolConfigurationManager configurationManager, final I18nTranslationService translationService) { + this.contentManager = contentManager; + this.containerManager = containerManager; + this.configurationManager = configurationManager; + this.i18n = translationService; } public String getName() { - return NAME; + return NAME; } + public String getRootName() { + return ROOT_NAME; + } + + public ServerToolTarget getTarget() { + return ServerToolTarget.forBoth; + } + public Group initGroup(final User user, final Group group) { - final ToolConfiguration config = new ToolConfiguration(); - final Container container = containerManager.createRootFolder(group, NAME, ROOT_NAME, TYPE_ROOT); - config.setRoot(container); - group.setToolConfig(NAME, config); - configurationManager.persist(config); - final String longName = group.getLongName(); - final String publicDesc = group.getPublicDesc(); - final Content descriptor = contentManager.createContent(i18n.t("About [%s]", longName), publicDesc == null ? "" - : publicDesc, user, container); - descriptor.addAuthor(user); - descriptor.setLanguage(user.getLanguage()); - descriptor.setTypeId(TYPE_DOCUMENT); - descriptor.setStatus(ContentStatus.publishedOnline); - group.setDefaultContent(descriptor); - return group; + final ToolConfiguration config = new ToolConfiguration(); + final Container container = containerManager.createRootFolder(group, NAME, ROOT_NAME, TYPE_ROOT); + config.setRoot(container); + group.setToolConfig(NAME, config); + configurationManager.persist(config); + final String longName = group.getLongName(); + final Content descriptor = contentManager.createContent(i18n.t("About [%s]", longName), "", user, container); + descriptor.addAuthor(user); + descriptor.setLanguage(user.getLanguage()); + descriptor.setTypeId(TYPE_DOCUMENT); + descriptor.setStatus(ContentStatus.publishedOnline); + group.setDefaultContent(descriptor); + return group; } public void onCreateContainer(final Container container, final Container parent, final String typeId) { - checkTypeId(parent.getTypeId(), typeId); - container.setTypeId(typeId); + checkTypeId(parent.getTypeId(), typeId); + container.setTypeId(typeId); } public void onCreateContent(final Content content, final Container parent) { - content.setTypeId(TYPE_DOCUMENT); + content.setTypeId(TYPE_DOCUMENT); } @Inject - public void register(final ToolRegistry registry) { - registry.register(this); + public void register(final ServerToolRegistry registry) { + registry.register(this); } private void checkTypeId(final String parentTypeId, final String typeId) { - if (typeId.equals(TYPE_FOLDER) || typeId.equals(TYPE_GALLERY) || typeId.equals(TYPE_WIKI)) { - // ok valid container - if (typeId.equals(TYPE_GALLERY) && !parentTypeId.equals(TYPE_ROOT)) { - throw new ContainerNotPermittedException(); - } - if (typeId.equals(TYPE_WIKI) && !parentTypeId.equals(TYPE_ROOT)) { - throw new ContainerNotPermittedException(); - } - } else { - throw new ContainerNotPermittedException(); - } + if (typeId.equals(TYPE_FOLDER) || typeId.equals(TYPE_GALLERY) || typeId.equals(TYPE_WIKI)) { + // ok valid container + if (typeId.equals(TYPE_GALLERY) && !parentTypeId.equals(TYPE_ROOT)) { + throw new ContainerNotPermittedException(); + } + if (typeId.equals(TYPE_WIKI) && !parentTypeId.equals(TYPE_ROOT)) { + throw new ContainerNotPermittedException(); + } + } else { + throw new ContainerNotPermittedException(); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java 2008-10-16 14:34:33 UTC (rev 913) @@ -27,136 +27,119 @@ private Long id; private String shortName; private String longName; - private String publicDesc; private GroupType type; private ContentSimpleDTO defaultContent; private ContentSimpleDTO groupLogo; private LicenseDTO defaultLicense; private String workspaceTheme; - private String tags; public GroupDTO() { - this(null, null, null, GroupType.ORGANIZATION); + this(null, null, GroupType.ORGANIZATION); } - public GroupDTO(final String shortName, final String longName, final String publicDesc, final GroupType type) { - this.shortName = shortName; - this.longName = longName; - this.publicDesc = publicDesc; - this.type = type; + public GroupDTO(final String shortName, final String longName, final GroupType type) { + this.shortName = shortName; + this.longName = longName; + this.type = type; } + @Override public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - final GroupDTO other = (GroupDTO) obj; - if (shortName == null) { - if (other.shortName != null) { - return false; - } - } else if (!shortName.equals(other.shortName)) { - return false; - } - return true; + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + final GroupDTO other = (GroupDTO) obj; + if (shortName == null) { + if (other.shortName != null) { + return false; + } + } else if (!shortName.equals(other.shortName)) { + return false; + } + return true; } public ContentSimpleDTO getDefaultContent() { - return defaultContent; + return defaultContent; } public LicenseDTO getDefaultLicense() { - return defaultLicense; + return defaultLicense; } public ContentSimpleDTO getGroupLogo() { - return groupLogo; + return groupLogo; } public Long getId() { - return id; + return id; } public String getLongName() { - return longName; + return longName; } - public String getPublicDesc() { - return publicDesc; - } - public String getShortName() { - return shortName; + return shortName; } - public String getTags() { - return tags; - } - public GroupType getType() { - return type; + return type; } public String getWorkspaceTheme() { - return workspaceTheme; + return workspaceTheme; } + @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (defaultLicense == null ? 0 : defaultLicense.hashCode()); - result = prime * result + (id == null ? 0 : id.hashCode()); - result = prime * result + (longName == null ? 0 : longName.hashCode()); - result = prime * result + (publicDesc == null ? 0 : publicDesc.hashCode()); - result = prime * result + (shortName == null ? 0 : shortName.hashCode()); - result = prime * result + (type == null ? 0 : type.hashCode()); - return result; + final int prime = 31; + int result = 1; + result = prime * result + (defaultLicense == null ? 0 : defaultLicense.hashCode()); + result = prime * result + (id == null ? 0 : id.hashCode()); + result = prime * result + (longName == null ? 0 : longName.hashCode()); + result = prime * result + (shortName == null ? 0 : shortName.hashCode()); + result = prime * result + (type == null ? 0 : type.hashCode()); + return result; } public void setDefaultContent(final ContentSimpleDTO defaultContent) { - this.defaultContent = defaultContent; + this.defaultContent = defaultContent; } public void setDefaultLicense(final LicenseDTO defaultLicense) { - this.defaultLicense = defaultLicense; + this.defaultLicense = defaultLicense; } public void setGroupLogo(final ContentSimpleDTO groupLogo) { - this.groupLogo = groupLogo; + this.groupLogo = groupLogo; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setLongName(final String name) { - this.longName = name; + this.longName = name; } - public void setPublicDesc(final String publicDesc) { - this.publicDesc = publicDesc; - } - public void setShortName(final String shortName) { - this.shortName = shortName; + this.shortName = shortName; } - public void setTags(final String tags) { - this.tags = tags; - } - public void setType(final GroupType type) { - this.type = type; + this.type = type; } public void setWorkspaceTheme(final String workspaceTheme) { - this.workspaceTheme = workspaceTheme; + this.workspaceTheme = workspaceTheme; } + @Override public String toString() { - return "GroupDTO[" + shortName + "]"; + return "GroupDTO[" + shortName + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java 2008-10-16 14:34:33 UTC (rev 913) @@ -20,6 +20,7 @@ package org.ourproject.kune.platf.client.dto; import java.util.ArrayList; +import java.util.Collection; import com.google.gwt.user.client.rpc.IsSerializable; @@ -38,121 +39,139 @@ private String siteLogoUrl; private String galleryPermittedExtensions; private String maxFileSizeInMb; + private Collection<ToolSimpleDTO> userTools; + private Collection<ToolSimpleDTO> groupTools; public String getChatDomain() { - return chatDomain; + return chatDomain; } public String getChatHttpBase() { - return chatHttpBase; + return chatHttpBase; } public String getChatRoomHost() { - return chatRoomHost; + return chatRoomHost; } public ArrayList<I18nCountryDTO> getCountries() { - return countries; + return countries; } public String getDefaultWsTheme() { - return defaultWsTheme; + return defaultWsTheme; } public String getGalleryPermittedExtensions() { - return galleryPermittedExtensions; + return galleryPermittedExtensions; } + public Collection<ToolSimpleDTO> getGroupTools() { + return groupTools; + } + public ArrayList<I18nLanguageSimpleDTO> getLanguages() { - return languages; + return languages; } public ArrayList<LicenseDTO> getLicenses() { - return licenses; + return licenses; } public String getMaxFileSizeInMb() { - return maxFileSizeInMb; + return maxFileSizeInMb; } public String getSiteDomain() { - return siteDomain; + return siteDomain; } public String getSiteLogoUrl() { - return siteLogoUrl; + return siteLogoUrl; } public String[] getTimezones() { - return timezones; + return timezones; } public UserInfoDTO getUserInfo() { - return userInfo; + return userInfo; } + public Collection<ToolSimpleDTO> getUserTools() { + return userTools; + } + public String[] getWsThemes() { - return wsThemes; + return wsThemes; } public boolean hasUser() { - return getUserInfo() != null; + return getUserInfo() != null; } public void setChatDomain(final String chatDomain) { - this.chatDomain = chatDomain; + this.chatDomain = chatDomain; } public void setChatHttpBase(final String chatHttpBase) { - this.chatHttpBase = chatHttpBase; + this.chatHttpBase = chatHttpBase; } public void setChatRoomHost(final String chatRoomHost) { - this.chatRoomHost = chatRoomHost; + this.chatRoomHost = chatRoomHost; } public void setCountries(final ArrayList<I18nCountryDTO> countries) { - this.countries = countries; + this.countries = countries; } public void setDefaultWsTheme(final String defaultWsTheme) { - this.defaultWsTheme = defaultWsTheme; + this.defaultWsTheme = defaultWsTheme; } public void setGalleryPermittedExtensions(final String galleryPermittedExtensions) { - this.galleryPermittedExtensions = galleryPermittedExtensions; + this.galleryPermittedExtensions = galleryPermittedExtensions; } + public void setGroupTools(Collection<ToolSimpleDTO> groupTools) { + this.groupTools = groupTools; + } + public void setLanguages(final ArrayList<I18nLanguageSimpleDTO> languages) { - this.languages = languages; + this.languages = languages; } public void setLicenses(final ArrayList<LicenseDTO> licenses) { - this.licenses = licenses; + this.licenses = licenses; } public void setMaxFileSizeInMb(final String maxFileSizeInMb) { - this.maxFileSizeInMb = maxFileSizeInMb; + this.maxFileSizeInMb = maxFileSizeInMb; } public void setSiteDomain(final String siteDomain) { - this.siteDomain = siteDomain; + this.siteDomain = siteDomain; } public void setSiteLogoUrl(final String siteLogoUrl) { - this.siteLogoUrl = siteLogoUrl; + this.siteLogoUrl = siteLogoUrl; } public void setTimezones(final String[] timezones) { - this.timezones = timezones; + this.timezones = timezones; } public void setUserInfo(final UserInfoDTO currentUser) { - this.userInfo = currentUser; + this.userInfo = currentUser; } + public void setUserTools(Collection<ToolSimpleDTO> userTools) { + this.userTools = userTools; + } + public void setWsThemes(final String[] wsThemes) { - this.wsThemes = wsThemes; + this.wsThemes = wsThemes; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java 2008-10-16 14:34:33 UTC (rev 913) @@ -55,6 +55,7 @@ private SocialNetworkDTO groupMembers; private ParticipationDataDTO participation; private StateToken stateToken; + private List<String> enabledTools; public StateDTO() { this(null, null, null); @@ -98,6 +99,10 @@ return documentId; } + public List<String> getEnabledTools() { + return enabledTools; + } + public GroupDTO getGroup() { return this.group; } @@ -219,6 +224,10 @@ this.documentId = docRef; } + public void setEnabledTools(List<String> enabledTools) { + this.enabledTools = enabledTools; + } + public void setGroup(final GroupDTO group) { this.group = group; } Added: trunk/src/main/java/org/ourproject/kune/platf/client/dto/ToolSimpleDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ToolSimpleDTO.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/ToolSimpleDTO.java 2008-10-16 14:34:33 UTC (rev 913) @@ -0,0 +1,33 @@ +package org.ourproject.kune.platf.client.dto; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public class ToolSimpleDTO implements IsSerializable { + private String name; + private String rootName; + + public ToolSimpleDTO() { + this(null, null); + } + + public ToolSimpleDTO(String name, String rootName) { + this.name = name; + this.rootName = rootName; + } + + public String getName() { + return name; + } + + public String getRootName() { + return rootName; + } + + public void setName(String name) { + this.name = name; + } + + public void setRootName(String rootName) { + this.rootName = rootName; + } +} Added: trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java 2008-10-16 14:34:33 UTC (rev 913) @@ -0,0 +1,26 @@ +/* + * + * Copyright (C) 2007-2008 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +package org.ourproject.kune.platf.client.errors; + + +public class NoDefaultContentException extends DefaultException { + private static final long serialVersionUID = 1L; +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java 2008-10-16 14:34:33 UTC (rev 913) @@ -30,7 +30,8 @@ void changeGroupWsTheme(String userHash, StateToken groupToken, String theme) throws DefaultException; - StateToken createNewGroup(String userHash, GroupDTO group) throws DefaultException; + StateToken createNewGroup(String userHash, GroupDTO group, String publicDesc, String tags, String[] enabledTools) + throws DefaultException; GroupDTO setGroupLogo(String userHash, StateToken token); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java 2008-10-16 14:34:33 UTC (rev 913) @@ -29,7 +29,8 @@ void changeGroupWsTheme(String userHash, StateToken groupToken, String theme, AsyncCallback<?> callback); - void createNewGroup(String userHash, GroupDTO group, AsyncCallback<StateToken> callback); + void createNewGroup(String userHash, GroupDTO group, String publicDesc, String tags, String[] enabledTools, + AsyncCallback<StateToken> callback); void setGroupLogo(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java 2008-10-16 14:34:33 UTC (rev 913) @@ -26,6 +26,7 @@ import org.ourproject.kune.platf.client.errors.ContentNotFoundException; import org.ourproject.kune.platf.client.errors.GroupNotFoundException; import org.ourproject.kune.platf.client.errors.LastAdminInGroupException; +import org.ourproject.kune.platf.client.errors.NoDefaultContentException; import org.ourproject.kune.platf.client.errors.SessionExpiredException; import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; import org.ourproject.kune.platf.client.state.Session; @@ -48,88 +49,90 @@ private final Provider<StateManager> stateManagerProvider; public KuneErrorHandler(final Session session, final I18nTranslationService i18n, - final Provider<WorkspaceSkeleton> wsProvider, final Provider<StateManager> stateManagerProvider) { - this.session = session; - this.i18n = i18n; - this.wsProvider = wsProvider; - this.stateManagerProvider = stateManagerProvider; - this.onSessionExpired = new Event0("onSessionExpired"); + final Provider<WorkspaceSkeleton> wsProvider, final Provider<StateManager> stateManagerProvider) { + this.session = session; + this.i18n = i18n; + this.wsProvider = wsProvider; + this.stateManagerProvider = stateManagerProvider; + this.onSessionExpired = new Event0("onSessionExpired"); } public void doSessionExpired() { - onSessionExpired.fire(); - getWorkspaceSkeleton().showAlertMessage(i18n.t("Session expired"), - i18n.t("Your session has expired. Please login again.")); + onSessionExpired.fire(); + getWorkspaceSkeleton().showAlertMessage(i18n.t("Session expired"), + i18n.t("Your session has expired. Please login again.")); } public WorkspaceSkeleton getWorkspaceSkeleton() { - return wsProvider.get(); + return wsProvider.get(); } public void onSessionExpired(final Listener0 listener) { - onSessionExpired.add(listener); + onSessionExpired.add(listener); } public void process(final Throwable caught) { - Site.hideProgress(); - try { - throw caught; - } catch (final AccessViolationException e) { - logException(e); - Site.error(i18n.t("You don't have rights to do that")); - } catch (final SessionExpiredException e) { - logException(e); - doSessionExpired(); - } catch (final UserMustBeLoggedException e) { - logException(e); - if (session.isLogged()) { - doSessionExpired(); - } else { - Site.important(i18n.t("Please sign in or register to collaborate")); - } - } catch (final GroupNotFoundException e) { - logException(e); - Site.error(i18n.t("Group not found")); - stateManagerProvider.get().gotoToken(""); - } catch (final IncompatibleRemoteServiceException e) { - Site.error(i18n.t("Your browser is outdated from the server software. Please reload this page.")); - } catch (final ContentNotFoundException e) { - logException(e); - Site.error(i18n.t("Content not found")); - stateManagerProvider.get().gotoToken(""); - } catch (final ContainerNotPermittedException e) { - logException(e); - Site.error(i18n.t("Action not permitted in this location")); - stateManagerProvider.get().gotoToken(""); - } catch (final LastAdminInGroupException e) { - logException(e); - getWorkspaceSkeleton().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 unjoin this group.")); - } catch (final AlreadyGroupMemberException e) { - logException(e); - Site.error(i18n.t("This group is already a group member")); - } catch (final AlreadyUserMemberException e) { - logException(e); - Site.error(i18n.t("This user is already a member of this group")); - } catch (final Throwable e) { - logException(e, true); - Site.error(i18n.t("Error performing operation")); - GWT.log("Other kind of exception in StateManagerDefault/processErrorException", null); - } + Site.hideProgress(); + try { + throw caught; + } catch (final AccessViolationException e) { + logException(e); + Site.error(i18n.t("You don't have rights to do that")); + } catch (final SessionExpiredException e) { + logException(e); + doSessionExpired(); + } catch (final NoDefaultContentException e) { + stateManagerProvider.get().restorePreviousState(); + } catch (final UserMustBeLoggedException e) { + logException(e); + if (session.isLogged()) { + doSessionExpired(); + } else { + Site.important(i18n.t("Please sign in or register to collaborate")); + } + } catch (final GroupNotFoundException e) { + logException(e); + Site.error(i18n.t("Group not found")); + stateManagerProvider.get().gotoToken(""); + } catch (final IncompatibleRemoteServiceException e) { + Site.error(i18n.t("Your browser is outdated from the server software. Please reload this page.")); + } catch (final ContentNotFoundException e) { + logException(e); + Site.error(i18n.t("Content not found")); + stateManagerProvider.get().gotoToken(""); + } catch (final ContainerNotPermittedException e) { + logException(e); + Site.error(i18n.t("Action not permitted in this location")); + stateManagerProvider.get().gotoToken(""); + } catch (final LastAdminInGroupException e) { + logException(e); + getWorkspaceSkeleton().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 unjoin this group.")); + } catch (final AlreadyGroupMemberException e) { + logException(e); + Site.error(i18n.t("This group is already a group member")); + } catch (final AlreadyUserMemberException e) { + logException(e); + Site.error(i18n.t("This user is already a member of this group")); + } catch (final Throwable e) { + logException(e, true); + Site.error(i18n.t("Error performing operation")); + GWT.log("Other kind of exception in StateManagerDefault/processErrorException", null); + } } private void logException(final Throwable e) { - logException(e, false); + logException(e, false); } private void logException(final Throwable e, final boolean showException) { - if (showException) { - Log.debug("Exception in KuneErrorHandler", e); - } else { - Log.debug(e.getMessage()); - } + if (showException) { + Log.debug("Exception in KuneErrorHandler", e); + } else { + Log.debug(e.getMessage()); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java 2008-10-16 14:34:33 UTC (rev 913) @@ -49,6 +49,8 @@ void removeSiteToken(String token); + void restorePreviousState(); + void setRetrievedState(StateDTO state); void setSocialNetwork(SocialNetworkResultDTO socialNet); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2008-10-16 14:34:33 UTC (rev 913) @@ -52,77 +52,77 @@ private final Event2<GroupDTO, GroupDTO> onGroupChanged; public StateManagerDefault(final ContentProvider contentProvider, final Session session, - final HistoryWrapper history) { - this.contentProvider = contentProvider; - this.session = session; - this.history = history; - this.oldState = null; - this.onStateChanged = new Event<StateDTO>("onStateChanged"); - this.onGroupChanged = new Event2<GroupDTO, GroupDTO>("onGroupChanged"); - this.onToolChanged = new Event2<String, String>("onToolChanged"); - this.onSocialNetworkChanged = new Event<StateDTO>("onSocialNetworkChanged"); - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO parameter) { - if (oldState != null) { - restorePreviousState(); - } else { - reload(); - } - } - }); - session.onUserSignOut(new Listener0() { - public void onEvent() { - reload(); - } - }); - siteTokens = new HashMap<String, Listener<StateToken>>(); + final HistoryWrapper history) { + this.contentProvider = contentProvider; + this.session = session; + this.history = history; + this.oldState = null; + this.onStateChanged = new Event<StateDTO>("onStateChanged"); + this.onGroupChanged = new Event2<GroupDTO, GroupDTO>("onGroupChanged"); + this.onToolChanged = new Event2<String, String>("onToolChanged"); + this.onSocialNetworkChanged = new Event<StateDTO>("onSocialNetworkChanged"); + session.onUserSignIn(new Listener<UserInfoDTO>() { + public void onEvent(final UserInfoDTO parameter) { + if (oldState != null) { + restorePreviousState(); + } else { + reload(); + } + } + }); + session.onUserSignOut(new Listener0() { + public void onEvent() { + reload(); + } + }); + siteTokens = new HashMap<String, Listener<StateToken>>(); } public void addSiteToken(final String token, final Listener<StateToken> listener) { - siteTokens.put(token, listener); + siteTokens.put(token, listener); } public void gotoToken(final StateToken state) { - Log.debug("StateManager: history goto-token newItem (" + state + ")"); - history.newItem(state.getEncoded()); + Log.debug("StateManager: history goto-token newItem (" + state + ")"); + history.newItem(state.getEncoded()); } public void gotoToken(final String token) { - gotoToken(new StateToken(token)); + gotoToken(new StateToken(token)); } public void onGroupChanged(final Listener2<GroupDTO, GroupDTO> listener) { - onGroupChanged.add(listener); + onGroupChanged.add(listener); } public void onHistoryChanged(final String historyToken) { - final Listener<StateToken> tokenListener = siteTokens.get(historyToken); - Log.debug("StateManager: history token changed (" + historyToken + ")"); - if (tokenListener == null) { - onHistoryChanged(new StateToken(historyToken)); - } else { - StateToken stateToken; - if (oldState == null) { - // Starting with some token like "signin": load defContent also - stateToken = new StateToken(); - onHistoryChanged(stateToken); - } else { - stateToken = oldState.getStateToken(); - } - tokenListener.onEvent(stateToken); - } + final Listener<StateToken> tokenListener = siteTokens.get(historyToken); + Log.debug("StateManager: history token changed (" + historyToken + ")"); + if (tokenListener == null) { + onHistoryChanged(new StateToken(historyToken)); + } else { + StateToken stateToken; + if (oldState == null) { + // Starting with some token like "signin": load defContent also + stateToken = new StateToken(); + onHistoryChanged(stateToken); + } else { + stateToken = oldState.getStateToken(); + } + tokenListener.onEvent(stateToken); + } } public void onSocialNetworkChanged(final Listener<StateDTO> listener) { - onSocialNetworkChanged.add(listener); + onSocialNetworkChanged.add(listener); } public void onStateChanged(final Listener<StateDTO> listener) { - onStateChanged.add(listener); + onStateChanged.add(listener); } public void onToolChanged(final Listener2<String, String> listener) { - onToolChanged.add(listener); + onToolChanged.add(listener); } /** @@ -131,68 +131,68 @@ * </p> */ public void reload() { - onHistoryChanged(history.getToken()); + onHistoryChanged(history.getToken()); } public void removeSiteToken(final String token) { - siteTokens.remove(token); + siteTokens.remove(token); } + public void restorePreviousState() { + if (oldState == null) { + onHistoryChanged(new StateToken()); + } else { + final StateDTO newState = oldState; + oldState = session.getCurrentState(); + setState(newState); + } + } + public void setRetrievedState(final StateDTO newState) { - contentProvider.cache(newState.getStateToken(), newState); - setState(newState); + contentProvider.cache(newState.getStateToken(), newState); + setState(newState); } public void setSocialNetwork(final SocialNetworkResultDTO socialNet) { - StateDTO 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 - final SocialNetworkDTO groupMembers = socialNet.getGroupMembers(); - final ParticipationDataDTO userParticipation = socialNet.getUserParticipation(); - state.setGroupMembers(groupMembers); - state.setParticipation(userParticipation); - onSocialNetworkChanged.fire(state); - } + StateDTO 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 + final SocialNetworkDTO groupMembers = socialNet.getGroupMembers(); + final ParticipationDataDTO userParticipation = socialNet.getUserParticipation(); + state.setGroupMembers(groupMembers); + state.setParticipation(userParticipation); + onSocialNetworkChanged.fire(state); + } } private void checkGroupAndToolChange(final StateDTO oldState, final StateDTO newState) { - final GroupDTO oldGroup = oldState != null ? oldState.getGroup() : null; - final GroupDTO newGroup = newState.getGroup(); - final String oldToolName = oldState != null ? oldState.getToolName() : null; - final String newToolName = newState.getToolName(); - if (oldState == null || !oldGroup.equals(newGroup)) { - onGroupChanged.fire(oldGroup, newGroup); - } - if (oldState == null || !oldToolName.equals(newToolName)) { - onToolChanged.fire(oldToolName, newToolName); - } + final GroupDTO oldGroup = oldState != null ? oldState.getGroup() : null; + final GroupDTO newGroup = newState.getGroup(); + final String oldToolName = oldState != null ? oldState.getToolName() : null; + final String newToolName = newState.getToolName(); + if (oldState == null || !oldGroup.equals(newGroup)) { + onGroupChanged.fire(oldGroup, newGroup); + } + if (oldState == null || !oldToolName.equals(newToolName)) { + onToolChanged.fire(oldToolName, newToolName); + } } private void onHistoryChanged(final StateToken newState) { - contentProvider.getContent(session.getUserHash(), newState, new AsyncCallbackSimple<StateDTO>() { - public void onSuccess(final StateDTO newState) { - setState(newState); - } - }); + contentProvider.getContent(session.getUserHash(), newState, new AsyncCallbackSimple<StateDTO>() { + public void onSuccess(final StateDTO newState) { + setState(newState); + } + }); } - private void restorePreviousState() { - if (oldState == null) { - onHistoryChanged(new StateToken()); - } else { - final StateDTO newState = oldState; - oldState = session.getCurrentState(); - setState(newState); - } - } - private void setState(final StateDTO newState) { - session.setCurrent(newState); - onStateChanged.fire(newState); - Site.hideProgress(); - checkGroupAndToolChange(oldState, newState); - oldState = newState; + session.setCurrent(newState); + onStateChanged.fire(newState); + Site.hideProgress(); + checkGroupAndToolChange(oldState, newState); + oldState = newState; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItem.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItem.java 2008-10-16 14:34:33 UTC (rev 913) @@ -8,4 +8,6 @@ void setSelected(boolean selected); + void setVisible(boolean visible); + } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPresenter.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPresenter.java 2008-10-16 14:34:33 UTC (rev 913) @@ -16,42 +16,45 @@ private final String longName; public ToolSelectorItemPresenter(final String shortName, final String longName, final ToolSelector toolSelector, - final WsThemePresenter wsThemePresenter) { - this.shortName = shortName; - this.longName = longName; - this.toolSelector = toolSelector; - this.wsThemePresenter = wsThemePresenter; + final WsThemePresenter wsThemePresenter) { + this.shortName = shortName; + this.longName = longName; + this.toolSelector = toolSelector; + this.wsThemePresenter = wsThemePresenter; } public String getShortName() { - return shortName; + return shortName; } public View getView() { - return view; + return view; } public void init(final ToolSelectorItemView view) { - this.view = view; - toolSelector.addTool(this); - wsThemePresenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() { - public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { - setTheme(oldTheme, newTheme); - } - }); + this.view = view; + toolSelector.addTool(this); + wsThemePresenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() { + public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { + setTheme(oldTheme, newTheme); + } + }); } public void setGroupShortName(final String groupShortName) { - final StateToken token = new StateToken(groupShortName, getShortName(), null, null); - view.setLink(longName, token.toString()); + final StateToken token = new StateToken(groupShortName, getShortName(), null, null); + view.setLink(longName, token.toString()); } public void setSelected(final boolean selected) { - view.setSelected(selected); + view.setSelected(selected); } + public void setVisible(boolean visible) { + view.setVisible(visible); + } + private void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { - view.setTheme(oldTheme, newTheme); + view.setTheme(oldTheme, newTheme); } - } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemView.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemView.java 2008-10-16 14:34:33 UTC (rev 913) @@ -10,4 +10,6 @@ void setSelected(boolean selected); void setTheme(WsTheme oldTheme, WsTheme newTheme); + + void setVisible(boolean visible); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorPresenter.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorPresenter.java 2008-10-16 14:34:33 UTC (rev 913) @@ -1,11 +1,14 @@ package org.ourproject.kune.platf.client.tool; import java.util.HashMap; +import java.util.List; import org.ourproject.kune.platf.client.dto.GroupDTO; +import org.ourproject.kune.platf.client.dto.StateDTO; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.themes.WsThemePresenter; +import com.calclab.suco.client.listener.Listener; import com.calclab.suco.client.listener.Listener2; public class ToolSelectorPresenter implements ToolSelector { @@ -13,42 +16,54 @@ private final HashMap<String, ToolSelectorItem> tools; public ToolSelectorPresenter(final StateManager stateManager, final WsThemePresenter wsThemePresenter) { - tools = new HashMap<String, ToolSelectorItem>(); - stateManager.onGroupChanged(new Listener2<GroupDTO, GroupDTO>() { - public void onEvent(final GroupDTO oldGroup, final GroupDTO newGroup) { - onGroupChanged(newGroup.getShortName()); - } - }); - stateManager.onToolChanged(new Listener2<String, String>() { - public void onEvent(final String oldTool, final String newTool) { - onToolChanged(oldTool, newTool); - } - }); + tools = new HashMap<String, ToolSelectorItem>(); + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(StateDTO state) { + for (String tool : tools.keySet()) { + List<String> enabledTools = state.getEnabledTools(); + if (enabledTools != null && enabledTools.contains(tool)) { + tools.get(tool).setVisible(true); + } else { + tools.get(tool).setVisible(false); + } + } + } + }); + stateManager.onGroupChanged(new Listener2<GroupDTO, GroupDTO>() { + public void onEvent(final GroupDTO oldGroup, final GroupDTO newGroup) { + onGroupChanged(newGroup.getShortName()); + } + }); + stateManager.onToolChanged(new Listener2<String, String>() { + public void onEvent(final String oldTool, final String newTool) { + onToolChanged(oldTool, newTool); + } + }); } public void addTool(final ToolSelectorItem item) { - final String name = item.getShortName(); - if (name == null) { - throw new RuntimeException("You cannot add a tool without a name"); - } - if (tools.get(name) != null) { - throw new RuntimeException("A tool with the same name already added"); - } - tools.put(name, item); - item.setSelected(false); + final String name = item.getShortName(); + if (name == null) { + throw new RuntimeException("You cannot add a tool without a name"); + } + if (tools.get(name) != null) { + throw new RuntimeException("A tool with the same name already added"); + } + tools.put(name, item); + item.setSelected(false); } void onGroupChanged(final String newGroupName) { - for (final String name : tools.keySet()) { - tools.get(name).setGroupShortName(newGroupName); - } + for (final String name : tools.keySet()) { + tools.get(name).setGroupShortName(newGroupName); + } } void onToolChanged(final String oldTool, final String newTool) { - if (oldTool != null) { - tools.get(oldTool).setSelected(false); - } - tools.get(newTool).setSelected(true); + if (oldTool != null) { + tools.get(oldTool).setSelected(false); + } + tools.get(newTool).setSelected(true); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultForm.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultForm.java 2008-10-16 14:34:33 UTC (rev 913) @@ -2,62 +2,69 @@ import com.gwtext.client.core.Position; import com.gwtext.client.widgets.form.Field; +import com.gwtext.client.widgets.form.FieldSet; import com.gwtext.client.widgets.form.FormPanel; public class DefaultForm { protected static final int DEF_FIELD_WIDTH = 200; + protected static final int DEF_SMALL_FIELD_WIDTH = 100; + protected static final int DEF_MEDIUM_FIELD_WIDTH = 150; private static final int DEF_FIELD_LABEL_WITH = 75; private final FormPanel form; public DefaultForm() { - form = new FormPanel(); - form.setPaddings(10); - form.setBorder(false); - form.setLabelWidth(DEF_FIELD_LABEL_WITH); - form.setLabelAlign(Position.RIGHT); - form.setButtonAlign(Position.RIGHT); - form.setHeader(false); + form = new FormPanel(); + form.setPaddings(10); + form.setBorder(false); + form.setLabelWidth(DEF_FIELD_LABEL_WITH); + form.setLabelAlign(Position.RIGHT); + form.setButtonAlign(Position.RIGHT); + form.setHeader(false); } public void add(final Field field) { - form.add(field); + form.add(field); } + public void add(final FieldSet fieldset) { + form.add(fieldset); + } + public void addStyleName(final String cls) { - form.addStyleName(cls); + form.addStyleName(cls); } public FormPanel getForm() { - return form; + return form; } public boolean isValid() { - return form.getForm().isValid(); + return form.getForm().isValid(); } public void removeStyleName(final String cls) { - form.removeStyleName(cls); + form.removeStyleName(cls); } public void reset() { - form.getForm().reset(); + form.getForm().reset(); } public void setAutoHeight(final boolean autoHeight) { - form.setAutoHeight(autoHeight); + form.setAutoHeight(autoHeight); } public void setAutoWidth(final boolean autoWidth) { - form.setAutoWidth(autoWidth); + form.setAutoWidth(autoWidth); } public void validate() { - final Field[] fields = form.getFields(); - for (int i = 0; i < fields.length; i++) { - fields[i].validate(); - } + final Field[] fields = form.getFields(); + for (Field field : fields) { + field.validate(); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java 2008-10-16 14:34:33 UTC (rev 913) @@ -19,11 +19,13 @@ */ package org.ourproject.kune.platf.server; +import java.util.Collection; import java.util.List; import org.ourproject.kune.platf.server.domain.I18nCountry; import org.ourproject.kune.platf.server.domain.I18nLanguage; import org.ourproject.kune.platf.server.domain.License; +import org.ourproject.kune.platf.server.tool.ToolSimple; import org.ourproject.kune.platf.server.users.UserInfo; public class InitData { @@ -41,117 +43,135 @@ private String siteLogoUrl; private String galleryPermittedExtensions; private String maxFileSizeInMb; + private Collection<ToolSimple> userTools; + private Collection<ToolSimple> groupTools; public String getChatDomain() { - return chatDomain; + return chatDomain; } public String getChatHttpBase() { - return chatHttpBase; + return chatHttpBase; } public String getChatRoomHost() { - return chatRoomHost; + return chatRoomHost; } public List<I18nCountry> getCountries() { - return countries; + return countries; } public String getDefaultWsTheme() { - return defaultWsTheme; + return defaultWsTheme; } public String getGalleryPermittedExtensions() { - return galleryPermittedExtensions; + return galleryPermittedExtensions; } + public Collection<ToolSimple> getGroupTools() { + return groupTools; + } + public List<I18nLanguage> getLanguages() { - return languages; + return languages; } public List<License> getLicenses() { - return licenses; + return licenses; } public String getMaxFileSizeInMb() { - return maxFileSizeInMb; + return maxFileSizeInMb; } public String getSiteDomain() { - return siteDomain; + return siteDomain; } public String getSiteLogoUrl() { - return siteLogoUrl; + return siteLogoUrl; } public String[] getTimezones() { - return timezones; + return timezones; } public UserInfo getUserInfo() { - return userInfo; + return userInfo; } + public Collection<ToolSimple> getUserTools() { + return userTools; + } + public String[] getWsThemes() { - return wsThemes; + return wsThemes; } public void setChatDomain(final String chatDomain) { - this.chatDomain = chatDomain; + this.chatDomain = chatDomain; } public void setChatHttpBase(final String chatHttpBase) { - this.chatHttpBase = chatHttpBase; + this.chatHttpBase = chatHttpBase; } public void setChatRoomHost(final String chatRoomHost) { - this.chatRoomHost = chatRoomHost; + this.chatRoomHost = chatRoomHost; } public void setCountries(final List<I18nCountry> countries) { - this.countries = countries; + this.countries = countries; } public void setDefaultWsTheme(final String defaultWsTheme) { - this.defaultWsTheme = defaultWsTheme; + this.defaultWsTheme = defaultWsTheme; } public void setGalleryPermittedExtensions(final String galleryPermittedExtensions) { - this.galleryPermittedExtensions = galleryPermittedExtensions; + this.galleryPermittedExtensions = galleryPermittedExtensions; } + public void setGroupTools(Collection<ToolSimple> groupTools) { + this.groupTools = groupTools; + } + public void setLanguages(final List<I18nLanguage> languages) { - this.languages = languages; + this.languages = languages; } public void setLicenses(final List<License> licenses) { - this.licenses = licenses; + this.licenses = licenses; } public void setMaxFileSizeInMb(final String maxFileSizeInMb) { - this.maxFileSizeInMb = maxFileSizeInMb; + this.maxFileSizeInMb = maxFileSizeInMb; } public void setSiteDomain(final String siteDomain) { - this.siteDomain = siteDomain; + this.siteDomain = siteDomain; } public void setSiteLogoUrl(final String siteLogoUrl) { - this.siteLogoUrl = siteLogoUrl; + this.siteLogoUrl = siteLogoUrl; } public void setTimezones(final String[] timezones) { - this.timezones = timezones; + this.timezones = timezones; } public void setUserInfo(final UserInfo currentUserInfo) { - this.userInfo = currentUserInfo; + this.userInfo = currentUserInfo; } + public void setUserTools(Collection<ToolSimple> userTools) { + this.userTools = userTools; + } + public void setWsThemes(final String[] wsThemes) { - this.wsThemes = wsThemes; + this.wsThemes = wsThemes; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java 2008-10-16 14:34:33 UTC (rev 913) @@ -88,7 +88,7 @@ import org.ourproject.kune.platf.server.rpc.UserRPC; import org.ourproject.kune.platf.server.state.StateService; import org.ourproject.kune.platf.server.state.StateServiceDefault; -import org.ourproject.kune.platf.server.tool.ToolRegistry; +import org.ourproject.kune.platf.server.tool.ServerToolRegistry; import org.ourproject.kune.platf.server.users.UserInfoService; import org.ourproject.kune.platf.server.users.UserInfoServiceDefault; import org.ourproject.kune.workspace.client.site.rpc.UserService; @@ -108,7 +108,7 @@ bindServices(); bind(KuneProperties.class).to(KunePropertiesDefault.class); bind(Mapper.class).to(DozerMapper.class); - bind(ToolRegistry.class); + bind(ServerToolRegistry.class); bind(FileUploadManager.class); bind(FileDownloadManager.class); 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java 2008-10-16 14:34:33 UTC (rev 913) @@ -26,6 +26,7 @@ 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.NoDefaultContentException; import org.ourproject.kune.platf.server.domain.Container; import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.domain.Group; @@ -43,91 +44,94 @@ @Inject public AccessServiceDefault(final FinderService finder, final AccessRightsService accessRightsService, - final Group groupFinder) { - this.finder = finder; - this.accessRightsService = accessRightsService; - this.groupFinder = groupFinder; + final Group groupFinder) { + this.finder = finder; + this.accessRightsService = accessRightsService; + this.groupFinder = groupFinder; } public Container accessToContainer(final Long folderId, final User user, final AccessRol accessRol) - throws DefaultException { - final Container folder = finder.getFolder(folderId); - final Access access = new Access(null, folder); - addFolderRights(access, user); - addGroupRights(access, user); - return check(access, access.getContainerRights(), accessRol).getContainer(); + throws DefaultException { + final Container folder = finder.getFolder(folderId); + final Access access = new Access(null, folder); + addFolderRights(access, user); + addGroupRights(access, user); + return check(access, access.getContainerRights(), accessRol).getContainer(); } public Content accessToContent(final Long contentId, final User user, final AccessRol accessRol) - throws DefaultException { - final Content descriptor = finder.getContent(contentId); - final Access access = new Access(descriptor, null); - addContentRights(access, user); - return check(access, access.getContentRights(), accessRol).getContent(); + throws DefaultException { + final Content descriptor = finder.getContent(contentId); + final Access access = new Access(descriptor, null); + addContentRights(access, user); + return check(access, access.getContentRights(), accessRol).getContent(); } public Access getAccess(final User user, final StateToken token, final Group defaultGroup, final AccessRol accessRol) - throws DefaultException { - checkGroupExistence(token); - final Content descriptor = finder.getContent(token, defaultGroup); - final Access access = new Access(descriptor, descriptor.getContainer()); - addContentRights(access, user); - addFolderRights(access, user); - addGroupRights(access, user); - if (!isValid(accessRol, access.getContentRights()) || !isValid(accessRol, access.getContainerRights())) { - throw new AccessViolationException(); - } - return access; + throws DefaultException { + checkGroupExistence(token); + final Content descriptor = finder.getContent(token, defaultGroup); + if (descriptor.equals(Content.NO_CONTENT)) { + throw new NoDefaultContentException(); + } + final Access access = new Access(descriptor, descriptor.getContainer()); + addContentRights(access, user); + addFolderRights(access, user); + addGroupRights(access, user); + if (!isValid(accessRol, access.getContentRights()) || !isValid(accessRol, access.getContainerRights())) { + throw new AccessViolationException(); + } + return access; } private void addContentRights(final Access access, final User user) { - if (!access.hasContentRights()) { - access.setContentRights(accessRightsService.get(user, access.getContentAccessLists())); - } + if (!access.hasContentRights()) { + access.setContentRights(accessRightsService.get(user, access.getContentAccessLists())); + } } private void addFolderRights(final Access access, final User user) { - if (!access.hasContainerRights()) { - access.setContainerRights(accessRightsService.get(user, access.getContainerAccessLists())); - } + if (!access.hasContainerRights()) { + access.setContainerRights(accessRightsService.get(user, access.getContainerAccessLists())); + } } private void addGroupRights(final Access access, final User user) { - if (!access.hasGroupRights()) { - access.setGroupRights(accessRightsService.get(user, access.getGroupAccessLists())); - } + if (!access.hasGroupRights()) { + access.setGroupRights(accessRightsService.get(user, access.getGroupAccessLists())); + } } private Access check(final Access access, final AccessRights rights, final AccessRol accessRol) - throws AccessViolationException { - if (!isValid(accessRol, rights)) { - throw new AccessViolationException(); - } - return access; + throws AccessViolationException { + if (!isValid(accessRol, rights)) { + throw new AccessViolationException(); + } + return access; } private void checkGroupExistence(final StateToken token) throws ContentNotFoundException { - if (token.hasGroup()) { - try { - final String tokenGroup = token.getGroup(); - groupFinder.findByShortName(tokenGroup); - } catch (final NoResultException e) { - throw new ContentNotFoundException(); - } - } + if (token.hasGroup()) { + try { + final String tokenGroup = token.getGroup(); + groupFinder.findByShortName(tokenGroup); + } catch (final NoResultException e) { + throw new ContentNotFoundException(); + } + } } private boolean isValid(final AccessRol accessRol, final AccessRights rights) { - switch (accessRol) { - case Viewer: - return rights.isVisible(); - case Editor: - return rights.isEditable(); - case Administrator: - return rights.isAdministrable(); - default: - return false; - } + switch (accessRol) { + case Viewer: + return rights.isVisible(); + case Editor: + return rights.isEditable(); + case Administrator: + return rights.isAdministrable(); + default: + return false; + } } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java 2008-10-16 14:34:33 UTC (rev 913) @@ -72,6 +72,14 @@ return null; } + public Comment getComment(final Long commentId) throws ContentNotFoundException { + try { + return commentManager.find(commentId); + } catch (final PersistenceException e) { + throw new ContentNotFoundException(); + } + } + public Content getContent(final Long contentId) throws ContentNotFoundException { try { return contentManager.find(contentId); @@ -91,7 +99,8 @@ } else if (token.hasGroupAndTool()) { return findByRootOnGroup(token.getGroup(), token.getTool()); } else if (token.hasGroup()) { - return findDefaultOfGroup(token.getGroup()); + Content defaultOfGroup = findDefaultOfGroup(token.getGroup()); + return defaultOfGroup == null ? Content.NO_CONTENT : defaultOfGroup; } else if (token.hasNothing()) { return findDefaultOfGroup(defaultGroup); } else { @@ -107,14 +116,6 @@ } } - public Comment getComment(final Long commentId) throws ContentNotFoundException { - try { - return commentManager.find(commentId); - } catch (final PersistenceException e) { - throw new ContentNotFoundException(); - } - } - public Rate getRate(final User user, final Content content) { return rateManager.find(user, content); } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationServiceDefault.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationServiceDefault.java 2008-10-16 14:34:33 UTC (rev 913) @@ -25,7 +25,7 @@ import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.domain.I18nLanguage; import org.ourproject.kune.platf.server.domain.User; -import org.ourproject.kune.platf.server.tool.ToolRegistry; +import org.ourproject.kune.platf.server.tool.ServerToolRegistry; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -34,11 +34,11 @@ public class CreationServiceDefault implements CreationService { private final ContainerManager containerManager; private final ContentManager contentManager; - private final ToolRegistry tools; + private final ServerToolRegistry tools; @Inject public CreationServiceDefault(final ContainerManager containerManager, final ContentManager contentManager, - final ToolRegistry toolRegistry) { + final ServerToolRegistry toolRegistry) { this.containerManager = containerManager; this.contentManager = contentManager; this.tools = toolRegistry; 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java 2008-10-16 14:34:33 UTC (rev 913) @@ -91,149 +91,147 @@ private List<ContainerTranslation> containerTranslations; public Container() { - this(null, null, null); + this(null, null, null); } public Container(final String title, final Group group, final String toolName) { - this.name = title; - owner = group; - this.toolName = toolName; - this.contents = new HashSet<Content>(); - this.childs = new HashSet<Container>(); - this.absolutePath = new ArrayList<Container>(); + this.name = title; + owner = group; + this.toolName = toolName; + this.contents = new HashSet<Content>(); + this.childs = new HashSet<Container>(); + this.absolutePath = new ArrayList<Container>(); } public void addChild(final Container child) { - // childs.size(); - // childs.add(container); - child.setParent(this); - childs.add(child); + child.setParent(this); + childs.add(child); } public void addContent(final Content descriptor) { - // FIXME: something related with lazy initialization (workaround using - // size()) - contents.size(); - contents.add(descriptor); + // FIXME: something related with lazy initialization (workaround using + // size()) + contents.size(); + contents.add(descriptor); } public List<Container> getAbsolutePath() { - return absolutePath; + return absolutePath; } public List<ContainerTranslation> getAliases() { - return containerTranslations; + return containerTranslations; } public Set<Container> getChilds() { - return childs; + return childs; } public List<ContainerTranslation> getContainerTranslations() { - return containerTranslations; + return containerTranslations; } public Set<Content> getContents() { - return contents; + return contents; } public Long getId() { - return id; + return id; } public I18nLanguage getLanguage() { - return language; + return language; } public String getName() { - return name; + return name; } public Group getOwner() { - return owner; + return owner; } public Container getParent() { - return parent; + return parent; } public Long getParentFolderId() { - return parent != null ? parent.getId() : null; + return parent != null ? parent.getId() : null; } @Transient public StateToken getStateToken() { - return new StateToken(getOwner().getShortName(), getToolName(), getId()); + return new StateToken(getOwner().getShortName(), getToolName(), getId()); } @Transient public String getStateTokenEncoded() { - return getStateToken().getEncoded(); + return getStateToken().getEncoded(); } public String getToolName() { - return toolName; + return toolName; } public String getTypeId() { - return typeId; + return typeId; } @Transient public boolean isLeaf() { - return childs.size() == 0 && contents.size() == 0; + return childs.size() == 0 && contents.size() == 0; } @Transient public boolean isRoot() { - return parent == null; + return parent == null; } public void setAbsolutePath(final List<Container> absolutePath) { - this.absolutePath = absolutePath; + this.absolutePath = absolutePath; } public void setAliases(final List<ContainerTranslation> containerTranslations) { - this.containerTranslations = containerTranslations; + this.containerTranslations = containerTranslations; } public void setChilds(final Set<Container> childs) { - this.childs = childs; + this.childs = childs; } public void setContainerTranslations(final List<ContainerTranslation> containerTranslations) { - this.containerTranslations = containerTranslations; + this.containerTranslations = containerTranslations; } public void setContents(final HashSet<Content> contents) { - this.contents = contents; + this.contents = contents; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setLanguage(final I18nLanguage language) { - this.language = language; + this.language = language; } public void setName(final String name) { - this.name = name; + this.name = name; } public void setOwner(final Group owner) { - this.owner = owner; + this.owner = owner; } public void setParent(final Container parent) { - this.parent = parent; + this.parent = parent; } public void setToolName(final String toolName) { - this.toolName = toolName; + this.toolName = toolName; } public void setTypeId(final String typeId) { - this.typeId = typeId; + this.typeId = typeId; } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java 2008-10-16 14:34:33 UTC (rev 913) @@ -61,6 +61,8 @@ @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) public class Content implements HasStateToken { + public static Content NO_CONTENT = new Content(); + @Id @DocumentId @GeneratedValue @@ -128,218 +130,218 @@ private String filename; public Content() { - translations = new ArrayList<ContentTranslation>(); - authors = new ArrayList<User>(); - tags = new ArrayList<Tag>(); - comments = new HashSet<Comment>(); - this.createdOn = System.currentTimeMillis(); - this.lastRevision = new Revision(this); - accessLists = null; - status = ContentStatus.editingInProgress; + translations = new ArrayList<ContentTranslation>(); + authors = new ArrayList<User>(); + tags = new ArrayList<Tag>(); + comments = new HashSet<Comment>(); + this.createdOn = System.currentTimeMillis(); + this.lastRevision = new Revision(this); + accessLists = null; + status = ContentStatus.editingInProgress; } public void addAuthor(final User user) { - if (!this.authors.contains(user)) { - this.authors.add(user); - } + if (!this.authors.contains(user)) { + this.authors.add(user); + } } public void addComment(final Comment comment) { - // FIXME: something related with lazy initialization (workaround using - // size()) - comments.size(); - comments.add(comment); + // FIXME: something related with lazy initialization (workaround using + // size()) + comments.size(); + comments.add(comment); } public void addRevision(final Revision revision) { - if (lastRevision == null) { - lastRevision = revision; - } else { - revision.setPrevious(lastRevision); - lastRevision = revision; - } + if (lastRevision == null) { + lastRevision = revision; + } else { + revision.setPrevious(lastRevision); + lastRevision = revision; + } } public AccessLists getAccessLists() { - return accessLists; + return accessLists; } public List<User> getAuthors() { - return authors; + return authors; } public Set<Comment> getComments() { - return comments; + return comments; } public Container getContainer() { - return container; + return container; } public Long getCreatedOn() { - return createdOn; + return createdOn; } public Date getDeletedOn() { - return deletedOn; + return deletedOn; } public String getFilename() { - return filename; + return filename; } public Long getId() { - return id; + return id; } public I18nLanguage getLanguage() { - return language; + return language; } public Revision getLastRevision() { - return lastRevision; + return lastRevision; } public License getLicense() { - return license; + return license; } public BasicMimeType getMimeType() { - return mimeType; + return mimeType; } public Group getOwner(final Group group) { - return container.getOwner(); + return container.getOwner(); } public Date getPublishedOn() { - return publishedOn; + return publishedOn; } @Transient public StateToken getStateToken() { - return getContainer().getStateToken().clone().setDocument(getId()); + return getContainer().getStateToken().clone().setDocument(getId()); } @Transient public String getStateTokenEncoded() { - return getStateToken().getEncoded(); + return getStateToken().getEncoded(); } public ContentStatus getStatus() { - return status; + return status; } public List<Tag> getTags() { - return tags; + return tags; } public String getTagsAsString() { - String tagConcatenated = ""; - for (final Iterator<Tag> iterator = tags.iterator(); iterator.hasNext();) { - final Tag tag = iterator.next(); - tagConcatenated = tagConcatenated + tag.getName(); - if (iterator.hasNext()) { - tagConcatenated = tagConcatenated + " "; - } - } - return tagConcatenated; + String tagConcatenated = ""; + for (final Iterator<Tag> iterator = tags.iterator(); iterator.hasNext();) { + final Tag tag = iterator.next(); + tagConcatenated = tagConcatenated + tag.getName(); + if (iterator.hasNext()) { + tagConcatenated = tagConcatenated + " "; + } + } + return tagConcatenated; } public String getTitle() { - return lastRevision.getTitle(); + return lastRevision.getTitle(); } public List<ContentTranslation> getTranslations() { - return translations; + return translations; } public String getTypeId() { - return typeId; + return typeId; } public int getVersion() { - return version; + return version; } public boolean hasAccessList() { - return accessLists != null; + return accessLists != null; } public void removeAuthor(final User user) { - this.authors.remove(user); + this.authors.remove(user); } public void setAccessLists(final AccessLists accessLists) { - this.accessLists = accessLists; + this.accessLists = accessLists; } public void setAuthors(final List<User> authors) { - this.authors = authors; + this.authors = authors; } public void setComments(final Set<Comment> comments) { - this.comments = comments; + this.comments = comments; } public void setContainer(final Container container) { - this.container = container; + this.container = container; } public void setCreatedOn(final Long createdOn) { - this.createdOn = createdOn; + this.createdOn = createdOn; } public void setDeletedOn(final Date date) { - this.deletedOn = date; + this.deletedOn = date; } public void setFilename(final String filename) { - this.filename = filename; + this.filename = filename; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setLanguage(final I18nLanguage language) { - this.language = language; + this.language = language; } public void setLastRevision(final Revision revision) { - this.lastRevision = revision; + this.lastRevision = revision; } public void setLicense(final License license) { - this.license = license; + this.license = license; } public void setMimeType(final BasicMimeType mimeType) { - this.mimeType = mimeType; + this.mimeType = mimeType; } public void setPublishedOn(final Date publishedOn) { - this.publishedOn = publishedOn; + this.publishedOn = publishedOn; } public void setStatus(final ContentStatus status) { - this.status = status; + this.status = status; } public void setTags(final List<Tag> tags) { - this.tags = tags; + this.tags = tags; } public void setTranslations(final List<ContentTranslation> translations) { - this.translations = translations; + this.translations = translations; } public void setTypeId(final String typeId) { - this.typeId = typeId; + this.typeId = typeId; } public void setVersion(final int version) { - this.version = version; + this.version = version; } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java 2008-10-16 14:34:33 UTC (rev 913) @@ -80,10 +80,6 @@ @Length(min = 3, max = 50, message = "longName between 3 and 50 chars of lenght") private String longName; - @Field(index = Index.TOKENIZED, store = Store.NO) - @Length(max = 255, message = "Public desc max 255 chars of lenght") - private String publicDesc; - @OneToOne private Content defaultContent; @@ -102,186 +98,182 @@ private String workspaceTheme; public Group() { - this(null, null, null, null); + this(null, null, null, null); } public Group(final String shortName, final String longName) { - this(shortName, longName, null, GroupType.PROJECT); + this(shortName, longName, null, GroupType.PROJECT); } public Group(final String shortName, final String longName, final License defaultLicense, final GroupType type) { - this.shortName = shortName; - this.longName = longName; - this.toolsConfig = new HashMap<String, ToolConfiguration>(); - this.socialNetwork = new SocialNetwork(); - this.defaultLicense = defaultLicense; - this.type = type; - this.admissionType = AdmissionType.Moderated; + this.shortName = shortName; + this.longName = longName; + this.toolsConfig = new HashMap<String, ToolConfiguration>(); + this.socialNetwork = new SocialNetwork(); + this.defaultLicense = defaultLicense; + this.type = type; + this.admissionType = AdmissionType.Moderated; } @Override public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final Group other = (Group) obj; - if (shortName == null) { - if (other.shortName != null) { - return false; - } - } else if (!shortName.equals(other.shortName)) { - return false; - } - return true; + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final Group other = (Group) obj; + if (shortName == null) { + if (other.shortName != null) { + return false; + } + } else if (!shortName.equals(other.shortName)) { + return false; + } + return true; } public boolean existToolConfig(final String toolName) { - return toolsConfig.get(toolName) != null; + return toolsConfig.get(toolName) != null; } @Finder(query = "FROM Group g WHERE g.id IN (SELECT g.id FROM g.socialNetwork.accessLists.admins.list adm WHERE adm.id = :groupid)") - public List<Group> findAdminInGroups(@Named("groupid") - final Long groupId) { - return null; + public List<Group> findAdminInGroups(@Named("groupid") final Long groupId) { + return null; } @Finder(query = "FROM Group g WHERE g.shortName = :shortName") - public Group findByShortName(@Named("shortName") - final String shortName) { - return null; + public Group findByShortName(@Named("shortName") final String shortName) { + return null; } @Finder(query = "FROM Group g WHERE g.id IN (SELECT g.id FROM g.socialNetwork.accessLists.editors.list AS ed WHERE ed.id = :groupid)") - public List<Group> findCollabInGroups(@Named("groupid") - final Long groupId) { - return null; + public List<Group> findCollabInGroups(@Named("groupid") final Long groupId) { + return null; } + @Finder(query = "SELECT t.root.toolName FROM ToolConfiguration t WHERE t.enabled=true AND t.root.owner.id = :groupid") + public List<String> findEnabledTools(@Named("groupid") final Long groupId) { + return null; + } + public AdmissionType getAdmissionType() { - return admissionType; + return admissionType; } @Finder(query = "FROM Group") public List<Group> getAll() { - return null; + return null; } public Content getDefaultContent() { - return defaultContent; + return defaultContent; } public License getDefaultLicense() { - return defaultLicense; + return defaultLicense; } public Content getGroupLogo() { - return groupLogo; + return groupLogo; } public Long getId() { - return id; + return id; } public String getLongName() { - return longName; + return longName; } - public String getPublicDesc() { - return publicDesc; - } - public Container getRoot(final String toolName) { - return toolsConfig.get(toolName).getRoot(); + return toolsConfig.get(toolName).getRoot(); } public String getShortName() { - return shortName; + return shortName; } public SocialNetwork getSocialNetwork() { - return socialNetwork; + return socialNetwork; } public ToolConfiguration getToolConfiguration(final String name) { - return toolsConfig.get(name); + return toolsConfig.get(name); } public Map<String, ToolConfiguration> getToolsConfig() { - return toolsConfig; + return toolsConfig; } public GroupType getType() { - return type; + return type; } public String getWorkspaceTheme() { - return workspaceTheme; + return workspaceTheme; } @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (shortName == null ? 0 : shortName.hashCode()); - return result; + final int prime = 31; + int result = 1; + result = prime * result + (shortName == null ? 0 : shortName.hashCode()); + return result; } public void setAdmissionType(final AdmissionType admissionType) { - this.admissionType = admissionType; + this.admissionType = admissionType; } public void setDefaultContent(final Content defaultContent) { - this.defaultContent = defaultContent; + this.defaultContent = defaultContent; } public void setDefaultLicense(final License defaultLicense) { - this.defaultLicense = defaultLicense; + this.defaultLicense = defaultLicense; } public void setGroupLogo(final Content groupLogo) { - this.groupLogo = groupLogo; + this.groupLogo = groupLogo; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setLongName(final String longName) { - this.longName = longName; + this.longName = longName; } - public void setPublicDesc(final String publicDesc) { - this.publicDesc = publicDesc; - } - public void setShortName(final String shortName) { - this.shortName = shortName; + this.shortName = shortName; } public void setSocialNetwork(final SocialNetwork socialNetwork) { - this.socialNetwork = socialNetwork; + this.socialNetwork = socialNetwork; } public ToolConfiguration setToolConfig(final String name, final ToolConfiguration config) { - toolsConfig.put(name, config); - return config; + toolsConfig.put(name, config); + return config; } public void setType(final GroupType type) { - this.type = type; + this.type = type; } public void setWorkspaceTheme(final String workspaceTheme) { - this.workspaceTheme = workspaceTheme; + this.workspaceTheme = workspaceTheme; } + @Override public String toString() { - return "Group[" + shortName + "]"; + return "Group[" + shortName + "]"; } + } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/ToolConfiguration.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/ToolConfiguration.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/ToolConfiguration.java 2008-10-16 14:34:33 UTC (rev 913) @@ -34,25 +34,19 @@ @Id @GeneratedValue private Long id; - private boolean enabled; @OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST }) private Container root; - public Container setRoot(final Container root) { - this.root = root; - return root; + public ToolConfiguration() { + enabled = true; } public Long getId() { return id; } - public void setId(final Long id) { - this.id = id; - } - public Container getRoot() { return root; } @@ -65,4 +59,13 @@ this.enabled = enabled; } + public void setId(final Long id) { + this.id = id; + } + + public Container setRoot(final Container root) { + this.root = root; + return root; + } + } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java 2008-10-16 14:34:33 UTC (rev 913) @@ -55,7 +55,7 @@ public static final User UNKNOWN_USER = new User(); public static boolean isKnownUser(final User user) { - return user != UNKNOWN_USER; + return user != UNKNOWN_USER; } @Id @@ -102,118 +102,117 @@ private final CustomProperties customProperties; public User() { - this(null, null, null, null, null, null, null); + this(null, null, null, null, null, null, null); } public User(final String shortName, final String longName, final String email, final String passwd, - final I18nLanguage language, final I18nCountry country, final TimeZone timezone) { - this.shortName = shortName; - this.name = longName; - this.email = email; - this.password = passwd; - this.userGroup = Group.NO_GROUP; - this.language = language; - this.country = country; - this.timezone = timezone; - customProperties = new CustomProperties(); + final I18nLanguage language, final I18nCountry country, final TimeZone timezone) { + this.shortName = shortName; + this.name = longName; + this.email = email; + this.password = passwd; + this.userGroup = null; + this.language = language; + this.country = country; + this.timezone = timezone; + customProperties = new CustomProperties(); } @Finder(query = "from User") public List<User> getAll() { - return null; + return null; } @Finder(query = "from User where email = :email") - public User getByEmail(@Named("email") - final String email) { - return null; + public User getByEmail(@Named("email") final String email) { + return null; } @Finder(query = "from User where shortName = :shortName") - public User getByShortName(@Named("shortName") - final String shortName) { - return null; + public User getByShortName(@Named("shortName") final String shortName) { + return null; } public I18nCountry getCountry() { - return country; + return country; } public CustomProperties getCustomProperties() { - return customProperties; + return customProperties; } public String getEmail() { - return email; + return email; } public Long getId() { - return id; + return id; } public I18nLanguage getLanguage() { - return language; + return language; } public String getName() { - return name; + return name; } public String getPassword() { - return password; + return password; } public String getShortName() { - return shortName; + return shortName; } public TimeZone getTimezone() { - return timezone; + return timezone; } public Group getUserGroup() { - return userGroup; + return userGroup; } public void setCountry(final I18nCountry country) { - this.country = country; + this.country = country; } public void setEmail(final String email) { - this.email = email; + this.email = email; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setLanguage(final I18nLanguage language) { - this.language = language; + this.language = language; } public void setName(final String name) { - this.name = name; + this.name = name; } public void setPassword(final String password) { - this.password = password; - // http://www.dynamic.net.au/christos/crypt/ - // Use UnixCrypt (jetty) + this.password = password; + // http://www.dynamic.net.au/christos/crypt/ + // Use UnixCrypt (jetty) } public void setShortName(final String shortName) { - this.shortName = shortName; + this.shortName = shortName; } public void setTimezone(final TimeZone timezone) { - this.timezone = timezone; + this.timezone = timezone; } public void setUserGroup(final Group userGroup) { - this.userGroup = userGroup; + this.userGroup = userGroup; } + @Override public String toString() { - return "User[" + shortName + "]"; + return "User[" + shortName + "]"; } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2008-10-16 14:34:33 UTC (rev 913) @@ -59,134 +59,134 @@ @Inject public DatabaseInitializer(final DatabaseProperties properties, final UserManager userManager, - final GroupManager groupManager, final LicenseManager licenseManager, - final I18nLanguageManager languageManager, final I18nCountryManager countryManager, - final I18nTranslationManager translationManager, final ContentManager contentManager) { - this.properties = properties; - this.userManager = userManager; - this.groupManager = groupManager; - this.licenseManager = licenseManager; - this.languageManager = languageManager; - this.countryManager = countryManager; - this.translationManager = translationManager; - this.contentManager = contentManager; + final GroupManager groupManager, final LicenseManager licenseManager, + final I18nLanguageManager languageManager, final I18nCountryManager countryManager, + final I18nTranslationManager translationManager, final ContentManager contentManager) { + this.properties = properties; + this.userManager = userManager; + this.groupManager = groupManager; + this.licenseManager = licenseManager; + this.languageManager = languageManager; + this.countryManager = countryManager; + this.translationManager = translationManager; + this.contentManager = contentManager; } public void createOthers() { - final I18nLanguage english = new I18nLanguage(new Long(1819), "en", "ltr", "English", "", "", "en", "eng", - "eng", false, "", "", "", "c == 1 ? 1 : 2", null, "L"); - final I18nLanguage spanish = new I18nLanguage(new Long(5889), "es", "ltr", "Spanish", "", "", "es", "spa", - "spa", true, "Español", "", "", "c == 1 ? 1 : 2", null, "L"); - languageManager.persist(english); - languageManager.persist(spanish); - final I18nCountry gb = new I18nCountry(new Long(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", - "western", ","); - countryManager.persist(gb); - final I18nTranslation test = new I18nTranslation("test", english, "test"); - translationManager.persist(test); + final I18nLanguage english = new I18nLanguage(new Long(1819), "en", "ltr", "English", "", "", "en", "eng", + "eng", false, "", "", "", "c == 1 ? 1 : 2", null, "L"); + final I18nLanguage spanish = new I18nLanguage(new Long(5889), "es", "ltr", "Spanish", "", "", "es", "spa", + "spa", true, "Español", "", "", "c == 1 ? 1 : 2", null, "L"); + languageManager.persist(english); + languageManager.persist(spanish); + final I18nCountry gb = new I18nCountry(new Long(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", + "western", ","); + countryManager.persist(gb); + final I18nTranslation test = new I18nTranslation("test", english, "test"); + translationManager.persist(test); } public void initConditional() throws Exception { - try { - groupManager.getDefaultGroup(); - } catch (final NoResultException e) { - initDatabase(); - } + try { + groupManager.getDefaultGroup(); + } catch (final NoResultException e) { + initDatabase(); + } } @Transactional(type = TransactionType.READ_WRITE) public void initDatabase() throws Exception { - createOthers(); - createLicenses(); - createDefUsersGroup(); + createOthers(); + createLicenses(); + createDefUsersGroup(); } private void createDefUsersGroup() throws Exception, UserMustBeLoggedException { - final String adminName = properties.getAdminUserName(); - final String adminShortName = properties.getAdminShortName(); - final String adminEmail = properties.getAdminEmail(); - final String adminPassword = properties.getAdminPassword(); - // FIXME: - final User user = new User(adminShortName, adminName, adminEmail, adminPassword, languageManager - .findByCode("en"), countryManager.findByCode("GB"), TimeZone.getDefault()); - groupManager.createUserGroup(user); + final String adminName = properties.getAdminUserName(); + final String adminShortName = properties.getAdminShortName(); + final String adminEmail = properties.getAdminEmail(); + final String adminPassword = properties.getAdminPassword(); + // FIXME: + final User user = new User(adminShortName, adminName, adminEmail, adminPassword, languageManager + .findByCode("en"), countryManager.findByCode("GB"), TimeZone.getDefault()); + groupManager.createUserGroup(user, false); - final String siteName = properties.getDefaultSiteName(); - final String siteShortName = properties.getDefaultSiteShortName(); - final String defaultLicenseId = properties.getDefaultLicense(); - final License defaultLicense = licenseManager.findByShortName(defaultLicenseId); + final String siteName = properties.getDefaultSiteName(); + final String siteShortName = properties.getDefaultSiteShortName(); + final String defaultLicenseId = properties.getDefaultLicense(); + final License defaultLicense = licenseManager.findByShortName(defaultLicenseId); - final Group siteGroup = new Group(siteShortName, siteName, defaultLicense, GroupType.PROJECT); - groupManager.createGroup(siteGroup, user); + final Group siteGroup = new Group(siteShortName, siteName, defaultLicense, GroupType.PROJECT); + groupManager.createGroup(siteGroup, user); - userManager.reIndex(); - groupManager.reIndex(); + userManager.reIndex(); + groupManager.reIndex(); - final Content defaultContent = siteGroup.getDefaultContent(); - contentManager - .save(user, defaultContent, - "<img src=\"http://kune.ourproject.org/IMG/cache-200x37/siteon0-200x37.png\" " - + "align=\"right\">This a initial demo of " - + "<a href=\"http://kune.ourproject.org\">kune</a>." - + "<br><div style=\"text-align: right;\"><br></div>" - + "Kune is currently under initial development.<br>" - + "<br>To test it, <a href=\"#signin\">sign in registering an user</a>, " - + "but take into account that:<br><ul><li>kune is not optimized yet, " - + "then the initial load and other operations maybe are slow.</li>" - + "<li>Don\'t use passwords that you are using in other sites " - + "(kune isn\'t secure yet storing passwords).</li>" - + "<li>The site is divided in two main areas: the public " - + "space and the workspace:</li><ul>" - + "<li>The workspace is the most important part of kune, " - + "because is where users collaborate and communicates which each others. " - + "This part is the most dynamic and we are using modern " - + "(and sometimes experimental) web technologies to improve the end user " - + "experience. I heavily under development.<br></li>" - + "<li>The public space is currently lest developed. " - + "Our main goal is to offer customs and configurable styles " - + "for groups/users contents.</li></ul></ul><font size=\"4\"><br>" - + "We need your feedback<br><br></font>Please help us to improve this software " - + "reporting <a href=\"http://code.google.com/p/kune/issues\">bugs and/or " - + "suggestions</a>. Also you <a href=\"#translate\">help us to translate it</a> " - + "into other languages.<br><br>Thank you,<br>" - + "<br>--<br><span style=\"font-style: italic;\">" - + "The kune development team</span><br><br>"); - contentManager.renameContent(user, defaultContent.getId(), "Welcome to kune demo"); - contentManager.setStatus(defaultContent.getId(), ContentStatus.publishedOnline); + final Content defaultContent = siteGroup.getDefaultContent(); + contentManager + .save(user, defaultContent, + "<img src=\"http://kune.ourproject.org/IMG/cache-200x37/siteon0-200x37.png\" " + + "align=\"right\">This a initial demo of " + + "<a href=\"http://kune.ourproject.org\">kune</a>." + + "<br><div style=\"text-align: right;\"><br></div>" + + "Kune is currently under initial development.<br>" + + "<br>To test it, <a href=\"#signin\">sign in registering an user</a>, " + + "but take into account that:<br><ul><li>kune is not optimized yet, " + + "then the initial load and other operations maybe are slow.</li>" + + "<li>Don\'t use passwords that you are using in other sites " + + "(kune isn\'t secure yet storing passwords).</li>" + + "<li>The site is divided in two main areas: the public " + + "space and the workspace:</li><ul>" + + "<li>The workspace is the most important part of kune, " + + "because is where users collaborate and communicates which each others. " + + "This part is the most dynamic and we are using modern " + + "(and sometimes experimental) web technologies to improve the end user " + + "experience. I heavily under development.<br></li>" + + "<li>The public space is currently lest developed. " + + "Our main goal is to offer customs and configurable styles " + + "for groups/users contents.</li></ul></ul><font size=\"4\"><br>" + + "We need your feedback<br><br></font>Please help us to improve this software " + + "reporting <a href=\"http://code.google.com/p/kune/issues\">bugs and/or " + + "suggestions</a>. Also you <a href=\"#translate\">help us to translate it</a> " + + "into other languages.<br><br>Thank you,<br>" + + "<br>--<br><span style=\"font-style: italic;\">" + + "The kune development team</span><br><br>"); + contentManager.renameContent(user, defaultContent.getId(), "Welcome to kune demo"); + contentManager.setStatus(defaultContent.getId(), ContentStatus.publishedOnline); } private void createLicenses() { - // FIXME: add version to name - License license = new License("by", "Creative Commons Attribution", "None", - "http://creativecommons.org/licenses/by/3.0/", true, false, false, "FIXME: Here CC RDF", - "images/lic/by80x15.png"); - licenseManager.persist(license); - license = new License("by-sa", "Creative Commons Attribution-ShareAlike", "None", - "http://creativecommons.org/licenses/by-sa/3.0/", true, true, false, "FIXME: Here CC RDF", - "images/lic/bysa80x15.png"); - licenseManager.persist(license); - license = new License("by-nd", "Creative Commons Attribution-NoDerivs", "None", - "http://creativecommons.org/licenses/by-nd/3.0/", true, false, false, "FIXME: Here CC RDF", - "images/lic/bynd80x15.png"); - licenseManager.persist(license); - license = new License("by-nc", "Creative Commons Attribution-NonCommercial", "None", - "http://creativecommons.org/licenses/by-nc/3.0/", true, false, false, "FIXME: Here CC RDF", - "images/lic/bync80x15.png"); - licenseManager.persist(license); - license = new License("by-nc-sa", "Creative Commons Attribution-NonCommercial-ShareAlike", "None", - "http://creativecommons.org/licenses/by-nc-sa/3.0/", true, false, false, "FIXME: Here CC RDF", - "images/lic/byncsa80x15.png"); - licenseManager.persist(license); - license = new License("by-nc-nd", "Creative Commons Attribution-NonCommercial-NoDerivs", "None", - "http://creativecommons.org/licenses/by-nc-nd/3.0/", true, false, false, "FIXME: Here CC RDF", - "images/lic/byncnd80x15.png"); - licenseManager.persist(license); - license = new License("gfdl", "GNU Free Documentation License", "None", "http://www.gnu.org/copyleft/fdl.html", - false, true, false, "", "images/lic/gnu-fdl.gif"); - licenseManager.persist(license); - license = new License("fal", "Free Art License", "None", "http://artlibre.org/licence/lal/en/", false, true, - false, "", "images/lic/fal-license.gif"); - licenseManager.persist(license); + // FIXME: add version to name + License license = new License("by", "Creative Commons Attribution", "None", + "http://creativecommons.org/licenses/by/3.0/", true, false, false, "FIXME: Here CC RDF", + "images/lic/by80x15.png"); + licenseManager.persist(license); + license = new License("by-sa", "Creative Commons Attribution-ShareAlike", "None", + "http://creativecommons.org/licenses/by-sa/3.0/", true, true, false, "FIXME: Here CC RDF", + "images/lic/bysa80x15.png"); + licenseManager.persist(license); + license = new License("by-nd", "Creative Commons Attribution-NoDerivs", "None", + "http://creativecommons.org/licenses/by-nd/3.0/", true, false, false, "FIXME: Here CC RDF", + "images/lic/bynd80x15.png"); + licenseManager.persist(license); + license = new License("by-nc", "Creative Commons Attribution-NonCommercial", "None", + "http://creativecommons.org/licenses/by-nc/3.0/", true, false, false, "FIXME: Here CC RDF", + "images/lic/bync80x15.png"); + licenseManager.persist(license); + license = new License("by-nc-sa", "Creative Commons Attribution-NonCommercial-ShareAlike", "None", + "http://creativecommons.org/licenses/by-nc-sa/3.0/", true, false, false, "FIXME: Here CC RDF", + "images/lic/byncsa80x15.png"); + licenseManager.persist(license); + license = new License("by-nc-nd", "Creative Commons Attribution-NonCommercial-NoDerivs", "None", + "http://creativecommons.org/licenses/by-nc-nd/3.0/", true, false, false, "FIXME: Here CC RDF", + "images/lic/byncnd80x15.png"); + licenseManager.persist(license); + license = new License("gfdl", "GNU Free Documentation License", "None", "http://www.gnu.org/copyleft/fdl.html", + false, true, false, "", "images/lic/gnu-fdl.gif"); + licenseManager.persist(license); + license = new License("fal", "Free Art License", "None", "http://artlibre.org/licence/lal/en/", false, true, + false, "", "images/lic/fal-license.gif"); + licenseManager.persist(license); } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java 2008-10-16 14:34:33 UTC (rev 913) @@ -39,12 +39,17 @@ Group createUserGroup(User user) throws GroupNameInUseException, EmailAddressInUseException; + Group createUserGroup(User user, boolean wantPersonalHomepage) throws GroupNameInUseException, + EmailAddressInUseException; + List<Group> findAdminInGroups(Long groupId); Group findByShortName(String groupName); List<Group> findCollabInGroups(Long groupId); + List<String> findEnabledTools(Long id); + Group getDefaultGroup(); /** 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java 2008-10-16 14:34:33 UTC (rev 913) @@ -20,6 +20,7 @@ package org.ourproject.kune.platf.server.manager.impl; +import java.util.Collection; import java.util.List; import javax.persistence.EntityExistsException; @@ -48,7 +49,7 @@ import org.ourproject.kune.platf.server.properties.DatabaseProperties; import org.ourproject.kune.platf.server.properties.KuneProperties; import org.ourproject.kune.platf.server.tool.ServerTool; -import org.ourproject.kune.platf.server.tool.ToolRegistry; +import org.ourproject.kune.platf.server.tool.ServerToolRegistry; import com.google.inject.Inject; import com.google.inject.Provider; @@ -58,152 +59,167 @@ public class GroupManagerDefault extends DefaultManager<Group, Long> implements GroupManager { private final Group finder; - private final ToolRegistry registry; + private final ServerToolRegistry registry; private final DatabaseProperties properties; private final License licenseFinder; private final KuneProperties kuneProperties; private final User userFinder; + private final ServerToolRegistry serverToolRegistry; @Inject public GroupManagerDefault(final Provider<EntityManager> provider, final Group finder, final User userFinder, - final KuneProperties kuneProperties, final DatabaseProperties properties, final ToolRegistry registry, - final License licenseFinder) { - super(provider, Group.class); - this.finder = finder; - this.userFinder = userFinder; - this.kuneProperties = kuneProperties; - this.properties = properties; - this.registry = registry; - this.licenseFinder = licenseFinder; + final KuneProperties kuneProperties, final DatabaseProperties properties, + final ServerToolRegistry registry, final License licenseFinder, ServerToolRegistry serverToolRegistry) { + super(provider, Group.class); + this.finder = finder; + this.userFinder = userFinder; + this.kuneProperties = kuneProperties; + this.properties = properties; + this.registry = registry; + this.licenseFinder = licenseFinder; + this.serverToolRegistry = serverToolRegistry; } public void changeWsTheme(final User user, final Group group, final String theme) throws AccessViolationException { - // TODO: check theme - group.setWorkspaceTheme(theme); + // TODO: check theme + group.setWorkspaceTheme(theme); } public Group createGroup(final Group group, final User user) throws GroupNameInUseException, - UserMustBeLoggedException { - final String defaultSiteWorkspaceTheme = kuneProperties.get(KuneProperties.WS_THEMES_DEF); - if (User.isKnownUser(user)) { - if (group.getType().equals(GroupType.COMMUNITY)) { - group.setAdmissionType(AdmissionType.Open); - } else if (group.getType().equals(GroupType.ORGANIZATION)) { - group.setAdmissionType(AdmissionType.Moderated); - } else if (group.getType().equals(GroupType.PROJECT)) { - group.setAdmissionType(AdmissionType.Moderated); - } else if (group.getType().equals(GroupType.ORPHANED_PROJECT)) { - group.setAdmissionType(AdmissionType.Open); - } - final String licName = group.getDefaultLicense().getShortName(); - final License license = licenseFinder.findByShortName(licName); - group.setDefaultLicense(license); - group.setWorkspaceTheme(defaultSiteWorkspaceTheme); - initSocialNetwork(group, user.getUserGroup()); - initGroup(user, group); - return group; - } else { - throw new UserMustBeLoggedException(); - } - + UserMustBeLoggedException { + final String defaultSiteWorkspaceTheme = kuneProperties.get(KuneProperties.WS_THEMES_DEF); + if (User.isKnownUser(user)) { + if (group.getType().equals(GroupType.COMMUNITY)) { + group.setAdmissionType(AdmissionType.Open); + } else if (group.getType().equals(GroupType.ORGANIZATION)) { + group.setAdmissionType(AdmissionType.Moderated); + } else if (group.getType().equals(GroupType.PROJECT)) { + group.setAdmissionType(AdmissionType.Moderated); + } else if (group.getType().equals(GroupType.ORPHANED_PROJECT)) { + group.setAdmissionType(AdmissionType.Open); + } + final String licName = group.getDefaultLicense().getShortName(); + final License license = licenseFinder.findByShortName(licName); + group.setDefaultLicense(license); + group.setWorkspaceTheme(defaultSiteWorkspaceTheme); + initSocialNetwork(group, user.getUserGroup()); + initGroup(user, group, serverToolRegistry.getToolsForGroupsKeys()); + return group; + } else { + throw new UserMustBeLoggedException(); + } } public Group createUserGroup(final User user) throws GroupNameInUseException, EmailAddressInUseException { - final String defaultSiteWorkspaceTheme = kuneProperties.get(KuneProperties.WS_THEMES_DEF); - final String licenseDefId = properties.getDefaultLicense(); - final License licenseDef = licenseFinder.findByShortName(licenseDefId); - final Group userGroup = new Group(user.getShortName(), user.getName(), licenseDef, GroupType.PERSONAL); - User userSameEmail = null; - try { - userSameEmail = userFinder.getByEmail(user.getEmail()); - } catch (final NoResultException e) { - // Ok, no more with this email - } - if (userSameEmail != null) { - throw new EmailAddressInUseException(); - } - userGroup.setAdmissionType(AdmissionType.Closed); - userGroup.setWorkspaceTheme(defaultSiteWorkspaceTheme); - user.setUserGroup(userGroup); - initSocialNetwork(userGroup, userGroup); - try { - initGroup(user, userGroup); - super.persist(user, User.class); - } catch (final EntityExistsException e) { - throw new GroupNameInUseException(); - } - return userGroup; + return createUserGroup(user, true); } + public Group createUserGroup(User user, boolean wantPersonalHomepage) throws GroupNameInUseException, + EmailAddressInUseException { + final String defaultSiteWorkspaceTheme = kuneProperties.get(KuneProperties.WS_THEMES_DEF); + final String licenseDefId = properties.getDefaultLicense(); + final License licenseDef = licenseFinder.findByShortName(licenseDefId); + final Group userGroup = new Group(user.getShortName(), user.getName(), licenseDef, GroupType.PERSONAL); + User userSameEmail = null; + try { + userSameEmail = userFinder.getByEmail(user.getEmail()); + } catch (final NoResultException e) { + // Ok, no more with this email + } + if (userSameEmail != null) { + throw new EmailAddressInUseException(); + } + userGroup.setAdmissionType(AdmissionType.Closed); + userGroup.setWorkspaceTheme(defaultSiteWorkspaceTheme); + userGroup.setDefaultContent(null); + user.setUserGroup(userGroup); + initSocialNetwork(userGroup, userGroup); + try { + initGroup(user, userGroup, wantPersonalHomepage ? serverToolRegistry.getToolsForUserKeys() + : ServerToolRegistry.emptyToolList); + super.persist(user, User.class); + } catch (final EntityExistsException e) { + throw new GroupNameInUseException(); + } + return userGroup; + } + public List<Group> findAdminInGroups(final Long groupId) { - return finder.findAdminInGroups(groupId); + return finder.findAdminInGroups(groupId); } public Group findByShortName(final String shortName) { - return finder.findByShortName(shortName); + return finder.findByShortName(shortName); } public List<Group> findCollabInGroups(final Long groupId) { - return finder.findCollabInGroups(groupId); + return finder.findCollabInGroups(groupId); } + public List<String> findEnabledTools(Long id) { + return finder.findEnabledTools(id); + } + public Group getDefaultGroup() { - final String shortName = properties.getDefaultSiteShortName(); - return findByShortName(shortName); + final String shortName = properties.getDefaultSiteShortName(); + return findByShortName(shortName); } public Group getGroupOfUserWithId(final Long userId) { - return userId != null ? find(User.class, userId).getUserGroup() : null; + return userId != null ? find(User.class, userId).getUserGroup() : null; } public SearchResult<Group> search(final String search) { - return this.search(search, null, null); + return this.search(search, null, null); } public SearchResult<Group> search(final String search, final Integer firstResult, final Integer maxResults) { - final MultiFieldQueryParser parser = new MultiFieldQueryParser(new String[] { "longName", "shortName", - "publicDesc" }, new StandardAnalyzer()); - Query query; - try { - query = parser.parse(search); - } catch (final ParseException e) { - throw new RuntimeException("Error parsing search"); - } - return super.search(query, firstResult, maxResults); + final MultiFieldQueryParser parser = new MultiFieldQueryParser(new String[] { "longName", "shortName", + "publicDesc" }, new StandardAnalyzer()); + Query query; + try { + query = parser.parse(search); + } catch (final ParseException e) { + throw new RuntimeException("Error parsing search"); + } + return super.search(query, firstResult, maxResults); } public void setDefaultContent(final String groupShortName, final Content content) { - final Group group = findByShortName(groupShortName); - group.setDefaultContent(content); + final Group group = findByShortName(groupShortName); + group.setDefaultContent(content); } public void setGroupLogo(final Group group, final Content content) { - if (content.getMimeType().getType().equals("image")) { - group.setGroupLogo(content); - } else { - new DefaultException("Trying to set not a image as group logo"); - } + if (content.getMimeType().getType().equals("image")) { + group.setGroupLogo(content); + } else { + new DefaultException("Trying to set not a image as group logo"); + } } - private void initGroup(final User user, final Group group) throws GroupNameInUseException { - try { - persist(group); - } catch (final EntityExistsException e) { - throw new GroupNameInUseException(); - } - for (final ServerTool tool : registry.all()) { - tool.initGroup(user, group); - } + private void initGroup(final User user, final Group group, Collection<String> toolsToEnable) + throws GroupNameInUseException { + try { + persist(group); + } catch (final EntityExistsException e) { + throw new GroupNameInUseException(); + } + for (final ServerTool tool : registry.all()) { + if (toolsToEnable.contains(tool.getName())) { + tool.initGroup(user, group); + } + } } private void initSocialNetwork(final Group group, final Group userGroup) { - final SocialNetwork network = group.getSocialNetwork(); - final AccessLists lists = network.getAccessLists(); - lists.getEditors().setMode(GroupListMode.NOBODY); - lists.getViewers().setMode(GroupListMode.EVERYONE); - if (!group.getType().equals(GroupType.ORPHANED_PROJECT)) { - network.addAdmin(userGroup); - } + final SocialNetwork network = group.getSocialNetwork(); + final AccessLists lists = network.getAccessLists(); + lists.getEditors().setMode(GroupListMode.NOBODY); + lists.getViewers().setMode(GroupListMode.EVERYONE); + if (!group.getType().equals(GroupType.ORPHANED_PROJECT)) { + network.addAdmin(userGroup); + } } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2008-10-16 14:34:33 UTC (rev 913) @@ -93,133 +93,133 @@ @Inject public ContentRPC(final Provider<UserSession> userSessionProvider, final AccessService accessService, - final AccessRightsService rightsService, final StateService stateService, - final CreationService creationService, final GroupManager groupManager, final XmppManager xmppManager, - final ContentManager contentManager, final ContainerManager containerManager, final TagManager tagManager, - final SocialNetworkManager socialNetworkManager, final CommentManager commentManager, final Mapper mapper) { - this.userSessionProvider = userSessionProvider; - this.accessService = accessService; - this.rightsService = rightsService; - this.stateService = stateService; - this.creationService = creationService; - this.groupManager = groupManager; - this.xmppManager = xmppManager; - this.contentManager = contentManager; - this.containerManager = containerManager; - this.tagManager = tagManager; - this.socialNetworkManager = socialNetworkManager; - this.commentManager = commentManager; - this.mapper = mapper; + final AccessRightsService rightsService, final StateService stateService, + final CreationService creationService, final GroupManager groupManager, final XmppManager xmppManager, + final ContentManager contentManager, final ContainerManager containerManager, final TagManager tagManager, + final SocialNetworkManager socialNetworkManager, final CommentManager commentManager, final Mapper mapper) { + this.userSessionProvider = userSessionProvider; + this.accessService = accessService; + this.rightsService = rightsService; + this.stateService = stateService; + this.creationService = creationService; + this.groupManager = groupManager; + this.xmppManager = xmppManager; + this.contentManager = contentManager; + this.containerManager = containerManager; + this.tagManager = tagManager; + this.socialNetworkManager = socialNetworkManager; + this.commentManager = commentManager; + this.mapper = mapper; } @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) public void addAuthor(final String userHash, final StateToken token, final String authorShortName) - throws DefaultException { - final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - contentManager.addAuthor(user, contentId, authorShortName); + throws DefaultException { + final Long contentId = ContentUtils.parseId(token.getDocument()); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + contentManager.addAuthor(user, contentId, authorShortName); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_WRITE) public CommentDTO addComment(final String userHash, final StateToken token, final Long parentCommentId, - final String commentText) throws DefaultException { - final UserSession userSession = getUserSession(); - final User author = userSession.getUser(); - final Long contentId = ContentUtils.parseId(token.getDocument()); - final Comment comment = commentManager.addComment(author, contentId, commentText, parentCommentId); - return mapper.map(comment, CommentDTO.class); + final String commentText) throws DefaultException { + final UserSession userSession = getUserSession(); + final User author = userSession.getUser(); + final Long contentId = ContentUtils.parseId(token.getDocument()); + final Comment comment = commentManager.addComment(author, contentId, commentText, parentCommentId); + return mapper.map(comment, CommentDTO.class); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_WRITE) public CommentDTO addComment(final String userHash, final StateToken token, final String commentText) - throws DefaultException { - final UserSession userSession = getUserSession(); - final User author = userSession.getUser(); - final Long contentId = ContentUtils.parseId(token.getDocument()); - final Comment comment = commentManager.addComment(author, contentId, commentText); - return mapper.map(comment, CommentDTO.class); + throws DefaultException { + final UserSession userSession = getUserSession(); + final User author = userSession.getUser(); + final Long contentId = ContentUtils.parseId(token.getDocument()); + final Comment comment = commentManager.addComment(author, contentId, commentText); + return mapper.map(comment, CommentDTO.class); } @Authenticated @Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) public StateDTO addContent(final String userHash, final StateToken parentToken, final String title) - throws DefaultException { - final Group group = groupManager.findByShortName(parentToken.getGroup()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final boolean userIsLoggedIn = userSession.isUserLoggedIn(); - final Container container = accessService.accessToContainer(ContentUtils.parseId(parentToken.getFolder()), - user, AccessRol.Editor); - final Content addedContent = creationService.createContent(title, "", user, container); - final Access access = accessService.getAccess(user, addedContent.getStateToken(), group, AccessRol.Editor); - final State state = stateService.create(access); - completeState(user, userIsLoggedIn, group, state); - return mapState(state, user, group); + throws DefaultException { + final Group group = groupManager.findByShortName(parentToken.getGroup()); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + final boolean userIsLoggedIn = userSession.isUserLoggedIn(); + final Container container = accessService.accessToContainer(ContentUtils.parseId(parentToken.getFolder()), + user, AccessRol.Editor); + final Content addedContent = creationService.createContent(title, "", user, container); + final Access access = accessService.getAccess(user, addedContent.getStateToken(), group, AccessRol.Editor); + final State state = stateService.create(access); + completeState(user, userIsLoggedIn, group, state); + return mapState(state, user, group); } @Authenticated @Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) public StateDTO addFolder(final String userHash, final StateToken parentToken, final String title, - final String contentTypeId) throws DefaultException { - final Group group = groupManager.findByShortName(parentToken.getGroup()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final boolean userIsLoggedIn = userSession.isUserLoggedIn(); - final State state = createFolder(parentToken.getGroup(), ContentUtils.parseId(parentToken.getFolder()), title, - contentTypeId); - completeState(user, userIsLoggedIn, group, state); - return mapState(state, user, group); + final String contentTypeId) throws DefaultException { + final Group group = groupManager.findByShortName(parentToken.getGroup()); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + final boolean userIsLoggedIn = userSession.isUserLoggedIn(); + final State state = createFolder(parentToken.getGroup(), ContentUtils.parseId(parentToken.getFolder()), title, + contentTypeId); + completeState(user, userIsLoggedIn, group, state); + return mapState(state, user, group); } @Authenticated @Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) public StateDTO addRoom(final String userHash, final StateToken parentToken, final String roomName) - throws DefaultException { - final String groupShortName = parentToken.getGroup(); - final Group group = groupManager.findByShortName(groupShortName); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final boolean userIsLoggedIn = userSession.isUserLoggedIn(); - final String userShortName = user.getShortName(); - final ChatConnection connection = xmppManager.login(userShortName, userSession.getUser().getPassword(), - userHash); - xmppManager.createRoom(connection, roomName, userShortName + userHash); - xmppManager.disconnect(connection); - try { - final State state = createFolder(groupShortName, ContentUtils.parseId(parentToken.getFolder()), roomName, - ChatServerTool.TYPE_ROOM); - completeState(user, userIsLoggedIn, group, state); - return mapState(state, user, group); - } catch (final ContentNotFoundException e) { - xmppManager.destroyRoom(connection, roomName); - throw new ContentNotFoundException(); - } catch (final AccessViolationException e) { - xmppManager.destroyRoom(connection, roomName); - throw new AccessViolationException(); - } catch (final GroupNotFoundException e) { - xmppManager.destroyRoom(connection, roomName); - throw new GroupNotFoundException(); - } + throws DefaultException { + final String groupShortName = parentToken.getGroup(); + final Group group = groupManager.findByShortName(groupShortName); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + final boolean userIsLoggedIn = userSession.isUserLoggedIn(); + final String userShortName = user.getShortName(); + final ChatConnection connection = xmppManager.login(userShortName, userSession.getUser().getPassword(), + userHash); + xmppManager.createRoom(connection, roomName, userShortName + userHash); + xmppManager.disconnect(connection); + try { + final State state = createFolder(groupShortName, ContentUtils.parseId(parentToken.getFolder()), roomName, + ChatServerTool.TYPE_ROOM); + completeState(user, userIsLoggedIn, group, state); + return mapState(state, user, group); + } catch (final ContentNotFoundException e) { + xmppManager.destroyRoom(connection, roomName); + throw new ContentNotFoundException(); + } catch (final AccessViolationException e) { + xmppManager.destroyRoom(connection, roomName); + throw new AccessViolationException(); + } catch (final GroupNotFoundException e) { + xmppManager.destroyRoom(connection, roomName); + throw new GroupNotFoundException(); + } } @Authenticated @Authorizated(accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) public void delContent(final String userHash, final StateToken token) throws DefaultException { - final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - contentManager.delContent(user, contentId); + final Long contentId = ContentUtils.parseId(token.getDocument()); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + contentManager.delContent(user, contentId); } // Not using @Authorizated because accessService is doing this job and is @@ -228,257 +228,258 @@ @Authenticated(mandatory = false) @Transactional(type = TransactionType.READ_ONLY) public StateDTO getContent(final String userHash, final StateToken token) throws DefaultException { - Group defaultGroup; - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final boolean userIsLoggedIn = userSession.isUserLoggedIn(); - if (userIsLoggedIn) { - defaultGroup = groupManager.getGroupOfUserWithId(user.getId()); - } else { - defaultGroup = groupManager.getDefaultGroup(); - } - Access access; - try { - access = accessService.getAccess(user, token, defaultGroup, AccessRol.Viewer); - } catch (final NoResultException e) { - throw new ContentNotFoundException(); - } catch (final ToolNotFoundException e) { - throw new ContentNotFoundException(); - } - final State state = stateService.create(access); - final Group group = state.getGroup(); - completeState(user, userIsLoggedIn, group, state); - return mapState(state, user, group); + Group defaultGroup; + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + final boolean userIsLoggedIn = userSession.isUserLoggedIn(); + if (userIsLoggedIn) { + defaultGroup = groupManager.getGroupOfUserWithId(user.getId()); + } else { + defaultGroup = groupManager.getDefaultGroup(); + } + Access access; + try { + access = accessService.getAccess(user, token, defaultGroup, AccessRol.Viewer); + } catch (final NoResultException e) { + throw new ContentNotFoundException(); + } catch (final ToolNotFoundException e) { + throw new ContentNotFoundException(); + } + final State state = stateService.create(access); + final Group group = state.getGroup(); + completeState(user, userIsLoggedIn, group, state); + return mapState(state, user, group); } @Authenticated(mandatory = false) @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_ONLY) public List<TagResultDTO> getSummaryTags(final String userHash, final StateToken groupToken) { - final Group group = groupManager.findByShortName(groupToken.getGroup()); - return getSummaryTags(group); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + return getSummaryTags(group); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_WRITE) public CommentDTO markCommentAsAbuse(final String userHash, final StateToken token, final Long commentId) - throws DefaultException { - final UserSession userSession = getUserSession(); - final User informer = userSession.getUser(); - final Long contentId = ContentUtils.parseId(token.getDocument()); - final Comment comment = commentManager.markAsAbuse(informer, contentId, commentId); - return mapper.map(comment, CommentDTO.class); + throws DefaultException { + final UserSession userSession = getUserSession(); + final User informer = userSession.getUser(); + final Long contentId = ContentUtils.parseId(token.getDocument()); + final Comment comment = commentManager.markAsAbuse(informer, contentId, commentId); + return mapper.map(comment, CommentDTO.class); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_WRITE) public void rateContent(final String userHash, final StateToken token, final Double value) throws DefaultException { - final UserSession userSession = getUserSession(); - final User rater = userSession.getUser(); - final Long contentId = ContentUtils.parseId(token.getDocument()); + final UserSession userSession = getUserSession(); + final User rater = userSession.getUser(); + final Long contentId = ContentUtils.parseId(token.getDocument()); - if (userSession.isUserLoggedIn()) { - contentManager.rateContent(rater, contentId, value); - } else { - throw new AccessViolationException(); - } + if (userSession.isUserLoggedIn()) { + contentManager.rateContent(rater, contentId, value); + } else { + throw new AccessViolationException(); + } } @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) public void removeAuthor(final String userHash, final StateToken token, final String authorShortName) - throws DefaultException { - final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - contentManager.removeAuthor(user, contentId, authorShortName); + throws DefaultException { + final Long contentId = ContentUtils.parseId(token.getDocument()); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + contentManager.removeAuthor(user, contentId, authorShortName); } @Authenticated @Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) public String renameContainer(final String userHash, final StateToken token, final String newName) - throws DefaultException { - return renameFolder(token.getGroup(), ContentUtils.parseId(token.getFolder()), newName); + throws DefaultException { + return renameFolder(token.getGroup(), ContentUtils.parseId(token.getFolder()), newName); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) public String renameContent(final String userHash, final StateToken token, final String newName) - throws DefaultException { - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - try { - accessService.accessToContent(ContentUtils.parseId(token.getDocument()), user, AccessRol.Editor); - } catch (final NoResultException e) { - throw new AccessViolationException(); - } - return renameContent(token.getDocument(), newName); + throws DefaultException { + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + try { + accessService.accessToContent(ContentUtils.parseId(token.getDocument()), user, AccessRol.Editor); + } catch (final NoResultException e) { + throw new AccessViolationException(); + } + return renameContent(token.getDocument(), newName); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) public Integer save(final String userHash, final StateToken token, final String textContent) - throws DefaultException { + throws DefaultException { - final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final Content content = accessService.accessToContent(contentId, user, AccessRol.Editor); - final Content descriptor = creationService.saveContent(user, content, textContent); - return descriptor.getVersion(); + final Long contentId = ContentUtils.parseId(token.getDocument()); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + final Content content = accessService.accessToContent(contentId, user, AccessRol.Editor); + final Content descriptor = creationService.saveContent(user, content, textContent); + return descriptor.getVersion(); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) public ContentSimpleDTO setAsDefaultContent(final String userHash, final StateToken token) { - final Content content = contentManager.find(ContentUtils.parseId(token.getDocument())); - groupManager.setDefaultContent(token.getGroup(), content); - return mapper.map(content, ContentSimpleDTO.class); + final Content content = contentManager.find(ContentUtils.parseId(token.getDocument())); + groupManager.setDefaultContent(token.getGroup(), content); + return mapper.map(content, ContentSimpleDTO.class); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) public I18nLanguageDTO setLanguage(final String userHash, final StateToken token, final String languageCode) - throws DefaultException { - final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - return mapper.map(contentManager.setLanguage(user, contentId, languageCode), I18nLanguageDTO.class); + throws DefaultException { + final Long contentId = ContentUtils.parseId(token.getDocument()); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + return mapper.map(contentManager.setLanguage(user, contentId, languageCode), I18nLanguageDTO.class); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) public void setPublishedOn(final String userHash, final StateToken token, final Date publishedOn) - throws DefaultException { - final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - contentManager.setPublishedOn(user, contentId, publishedOn); + throws DefaultException { + final Long contentId = ContentUtils.parseId(token.getDocument()); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + contentManager.setPublishedOn(user, contentId, publishedOn); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) public void setStatus(final String userHash, final StateToken token, final ContentStatusDTO status) { - if (status.equals(ContentStatusDTO.publishedOnline) || status.equals(ContentStatusDTO.rejected)) { - throw new AccessViolationException(); - } - contentManager.setStatus(ContentUtils.parseId(token.getDocument()), ContentStatus.valueOf(status.toString())); + if (status.equals(ContentStatusDTO.publishedOnline) || status.equals(ContentStatusDTO.rejected)) { + throw new AccessViolationException(); + } + contentManager.setStatus(ContentUtils.parseId(token.getDocument()), ContentStatus.valueOf(status.toString())); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) public void setStatusAsAdmin(final String userHash, final StateToken token, final ContentStatusDTO status) { - contentManager.setStatus(ContentUtils.parseId(token.getDocument()), ContentStatus.valueOf(status.toString())); + contentManager.setStatus(ContentUtils.parseId(token.getDocument()), ContentStatus.valueOf(status.toString())); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) public List<TagResultDTO> setTags(final String userHash, final StateToken token, final String tags) - throws DefaultException { - final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final Group group = groupManager.findByShortName(token.getGroup()); - contentManager.setTags(user, contentId, tags); - return getSummaryTags(group); + throws DefaultException { + final Long contentId = ContentUtils.parseId(token.getDocument()); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + final Group group = groupManager.findByShortName(token.getGroup()); + contentManager.setTags(user, contentId, tags); + return getSummaryTags(group); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_WRITE) public CommentDTO voteComment(final String userHash, final StateToken token, final Long commentId, - final boolean votePositive) throws DefaultException { - final UserSession userSession = getUserSession(); - final User voter = userSession.getUser(); - final Long contentId = ContentUtils.parseId(token.getDocument()); - final Comment comment = commentManager.vote(voter, contentId, commentId, votePositive); - return mapper.map(comment, CommentDTO.class); + final boolean votePositive) throws DefaultException { + final UserSession userSession = getUserSession(); + final User voter = userSession.getUser(); + final Long contentId = ContentUtils.parseId(token.getDocument()); + final Comment comment = commentManager.vote(voter, contentId, commentId, votePositive); + return mapper.map(comment, CommentDTO.class); } private void completeState(final User user, final boolean userIsLoggedIn, final Group group, final State state) { - if (state.isRateable()) { - final Long contentId = ContentUtils.parseId(state.getDocumentId()); - final Content content = contentManager.find(contentId); - if (userIsLoggedIn) { - state.setCurrentUserRate(contentManager.getRateContent(user, content)); - } - state.setRate(contentManager.getRateAvg(content)); - state.setRateByUsers(contentManager.getRateByUsers(content)); - } - - state.setGroupTags(tagManager.getSummaryByGroup(group)); - state.setGroupMembers(socialNetworkManager.get(user, group)); - state.setParticipation(socialNetworkManager.findParticipation(user, group)); + if (state.isRateable()) { + final Long contentId = ContentUtils.parseId(state.getDocumentId()); + final Content content = contentManager.find(contentId); + if (userIsLoggedIn) { + state.setCurrentUserRate(contentManager.getRateContent(user, content)); + } + state.setRate(contentManager.getRateAvg(content)); + state.setRateByUsers(contentManager.getRateByUsers(content)); + } + state.setEnabledTools(groupManager.findEnabledTools(group.getId())); + state.setGroupTags(tagManager.getSummaryByGroup(group)); + state.setGroupMembers(socialNetworkManager.get(user, group)); + state.setParticipation(socialNetworkManager.findParticipation(user, group)); } private State createFolder(final String groupShortName, final Long parentFolderId, final String title, - final String typeId) throws DefaultException { - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final Group group = groupManager.findByShortName(groupShortName); + final String typeId) throws DefaultException { + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + final Group group = groupManager.findByShortName(groupShortName); - accessService.accessToContainer(parentFolderId, user, AccessRol.Editor); + accessService.accessToContainer(parentFolderId, user, AccessRol.Editor); - final Container container = creationService.createFolder(group, parentFolderId, title, user.getLanguage(), - typeId); - final Access access = accessService.getAccess(user, container.getStateToken(), group, AccessRol.Editor); - final State state = stateService.create(access); - return state; + final Container container = creationService.createFolder(group, parentFolderId, title, user.getLanguage(), + typeId); + final Access access = accessService.getAccess(user, container.getStateToken(), group, AccessRol.Editor); + final State state = stateService.create(access); + return state; } private List<TagResultDTO> getSummaryTags(final Group group) { - return mapper.mapList(tagManager.getSummaryByGroup(group), TagResultDTO.class); + return mapper.mapList(tagManager.getSummaryByGroup(group), TagResultDTO.class); } private UserSession getUserSession() { - return userSessionProvider.get(); + return userSessionProvider.get(); } - private void mapContentRightsInstate(final User user, final AccessLists groupAccessList, final ContentSimpleDTO siblingDTO) { - final Content sibling = contentManager.find(siblingDTO.getId()); - final AccessLists lists = sibling.hasAccessList() ? sibling.getAccessLists() : groupAccessList; - siblingDTO.setRights(mapper.map(rightsService.get(user, lists), AccessRightsDTO.class)); + private void mapContentRightsInstate(final User user, final AccessLists groupAccessList, + final ContentSimpleDTO siblingDTO) { + final Content sibling = contentManager.find(siblingDTO.getId()); + final AccessLists lists = sibling.hasAccessList() ? sibling.getAccessLists() : groupAccessList; + siblingDTO.setRights(mapper.map(rightsService.get(user, lists), AccessRightsDTO.class)); } private StateDTO mapState(final State state, final User user, final Group group) { - final StateDTO stateDTO = mapper.map(state, StateDTO.class); - final AccessLists groupAccessList = group.getSocialNetwork().getAccessLists(); - for (final ContentSimpleDTO siblingDTO : stateDTO.getRootContainer().getContents()) { - mapContentRightsInstate(user, groupAccessList, siblingDTO); - } - for (final ContentSimpleDTO siblingDTO : stateDTO.getContainer().getContents()) { - mapContentRightsInstate(user, groupAccessList, siblingDTO); - } - return stateDTO; + final StateDTO stateDTO = mapper.map(state, StateDTO.class); + final AccessLists groupAccessList = group.getSocialNetwork().getAccessLists(); + for (final ContentSimpleDTO siblingDTO : stateDTO.getRootContainer().getContents()) { + mapContentRightsInstate(user, groupAccessList, siblingDTO); + } + for (final ContentSimpleDTO siblingDTO : stateDTO.getContainer().getContents()) { + mapContentRightsInstate(user, groupAccessList, siblingDTO); + } + return stateDTO; } private String renameContent(final String documentId, final String newName) throws ContentNotFoundException, - DefaultException { - final Long contentId = ContentUtils.parseId(documentId); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - return contentManager.renameContent(user, contentId, newName); + DefaultException { + final Long contentId = ContentUtils.parseId(documentId); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + return contentManager.renameContent(user, contentId, newName); } private String renameFolder(final String groupShortName, final Long folderId, final String newName) - throws DefaultException { - final Group group = groupManager.findByShortName(groupShortName); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final Container container = accessService.accessToContainer(folderId, user, AccessRol.Editor); - return containerManager.renameFolder(group, container, newName); + throws DefaultException { + final Group group = groupManager.findByShortName(groupShortName); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + final Container container = accessService.accessToContainer(folderId, user, AccessRol.Editor); + return containerManager.renameFolder(group, container, newName); } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java 2008-10-16 14:34:33 UTC (rev 913) @@ -20,8 +20,6 @@ package org.ourproject.kune.platf.server.rpc; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.ourproject.kune.platf.client.dto.GroupDTO; import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.errors.DefaultException; @@ -47,7 +45,6 @@ @Singleton public class GroupRPC implements RPC, GroupService { - private static final Log log = LogFactory.getLog(GroupRPC.class); private final Mapper mapper; private final GroupManager groupManager; private final Provider<UserSession> userSessionProvider; @@ -55,50 +52,50 @@ @Inject public GroupRPC(final Provider<UserSession> userSessionProvider, final GroupManager groupManager, - final ContentManager contentManager, final Mapper mapper) { - this.userSessionProvider = userSessionProvider; - this.groupManager = groupManager; - this.contentManager = contentManager; - this.mapper = mapper; + final ContentManager contentManager, final Mapper mapper) { + this.userSessionProvider = userSessionProvider; + this.groupManager = groupManager; + this.contentManager = contentManager; + this.mapper = mapper; } @Authenticated @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) public void changeGroupWsTheme(final String userHash, final StateToken groupToken, final String theme) - throws DefaultException { - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final Group group = groupManager.findByShortName(groupToken.getGroup()); - groupManager.changeWsTheme(user, group, theme); + throws DefaultException { + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + final Group group = groupManager.findByShortName(groupToken.getGroup()); + groupManager.changeWsTheme(user, group, theme); } @Authenticated @Transactional(type = TransactionType.READ_WRITE, rollbackOn = DefaultException.class) - public StateToken createNewGroup(final String userHash, final GroupDTO groupDTO) throws DefaultException { - log.debug(groupDTO.getShortName() + groupDTO.getLongName() + groupDTO.getPublicDesc() - + groupDTO.getDefaultLicense() + groupDTO.getType()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final Group group = mapper.map(groupDTO, Group.class); - final Group newGroup = groupManager.createGroup(group, user); - final Long defContentId = newGroup.getDefaultContent().getId(); - contentManager.setTags(user, defContentId, groupDTO.getTags()); - return newGroup.getDefaultContent().getStateToken(); + public StateToken createNewGroup(final String userHash, final GroupDTO groupDTO, String publicDesc, String tags, + String[] enabledTools) throws DefaultException { + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + final Group group = mapper.map(groupDTO, Group.class); + final Group newGroup = groupManager.createGroup(group, user); + final Long defContentId = newGroup.getDefaultContent().getId(); + contentManager.save(user, newGroup.getDefaultContent(), publicDesc); + contentManager.setTags(user, defContentId, tags); + return newGroup.getDefaultContent().getStateToken(); } @Authenticated @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) public GroupDTO setGroupLogo(final String userHash, final StateToken token) { - final Group group = groupManager.findByShortName(token.getGroup()); - final Content content = contentManager.find(ContentUtils.parseId(token.getDocument())); - groupManager.setGroupLogo(group, content); - return mapper.map(group, GroupDTO.class); + final Group group = groupManager.findByShortName(token.getGroup()); + final Content content = contentManager.find(ContentUtils.parseId(token.getDocument())); + groupManager.setGroupLogo(group, content); + return mapper.map(group, GroupDTO.class); } private UserSession getUserSession() { - return userSessionProvider.get(); + return userSessionProvider.get(); } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java 2008-10-16 14:34:33 UTC (rev 913) @@ -34,6 +34,7 @@ import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.platf.server.properties.ChatProperties; import org.ourproject.kune.platf.server.properties.KuneProperties; +import org.ourproject.kune.platf.server.tool.ServerToolRegistry; import org.ourproject.kune.platf.server.users.UserInfoService; import com.google.inject.Inject; @@ -53,48 +54,53 @@ private final KuneProperties kuneProperties; private final I18nLanguageManager languageManager; private final I18nCountryManager countryManager; + private final ServerToolRegistry serverToolRegistry; // TODO: refactor: too many parameters! refactor to Facade Pattern @Inject public SiteRPC(final Provider<UserSession> userSessionProvider, final UserManager userManager, - final UserInfoService userInfoService, final LicenseManager licenseManager, final Mapper mapper, - final KuneProperties kuneProperties, final ChatProperties chatProperties, - final I18nLanguageManager languageManager, final I18nCountryManager countryManager) { - this.userSessionProvider = userSessionProvider; - this.userManager = userManager; - this.userInfoService = userInfoService; - this.licenseManager = licenseManager; - this.mapper = mapper; - this.kuneProperties = kuneProperties; - this.chatProperties = chatProperties; - this.languageManager = languageManager; - this.countryManager = countryManager; + final UserInfoService userInfoService, final LicenseManager licenseManager, final Mapper mapper, + final KuneProperties kuneProperties, final ChatProperties chatProperties, + final I18nLanguageManager languageManager, final I18nCountryManager countryManager, + final ServerToolRegistry serverToolRegistry) { + this.userSessionProvider = userSessionProvider; + this.userManager = userManager; + this.userInfoService = userInfoService; + this.licenseManager = licenseManager; + this.mapper = mapper; + this.kuneProperties = kuneProperties; + this.chatProperties = chatProperties; + this.languageManager = languageManager; + this.countryManager = countryManager; + this.serverToolRegistry = serverToolRegistry; } @Transactional(type = TransactionType.READ_ONLY) public InitDataDTO getInitData(final String userHash) throws DefaultException { - final InitData data = new InitData(); - final UserSession userSession = getUserSession(); + final InitData data = new InitData(); + final UserSession userSession = getUserSession(); - data.setLicenses(licenseManager.getAll()); - data.setLanguages(languageManager.getAll()); - data.setCountries(countryManager.getAll()); - data.setTimezones(TimeZone.getAvailableIDs()); - data.setUserInfo(userInfoService.buildInfo(userManager.find(userSession.getUser().getId()), userSession - .getHash())); - data.setChatHttpBase(chatProperties.getHttpBase()); - data.setChatDomain(chatProperties.getDomain()); - data.setSiteDomain(kuneProperties.get(KuneProperties.SITE_DOMAIN)); - data.setChatRoomHost(chatProperties.getRoomHost()); - data.setWsThemes(this.kuneProperties.get(KuneProperties.WS_THEMES).split(",")); - data.setDefaultWsTheme(this.kuneProperties.get(KuneProperties.WS_THEMES_DEF)); - data.setSiteLogoUrl(kuneProperties.get(KuneProperties.SITE_LOGO_URL)); - data.setGalleryPermittedExtensions(kuneProperties.get(KuneProperties.UPLOAD_GALLERY_PERMITTED_EXTS)); - data.setMaxFileSizeInMb(kuneProperties.get(KuneProperties.UPLOAD_MAX_FILE_SIZE)); - return mapper.map(data, InitDataDTO.class); + data.setLicenses(licenseManager.getAll()); + data.setLanguages(languageManager.getAll()); + data.setCountries(countryManager.getAll()); + data.setTimezones(TimeZone.getAvailableIDs()); + data.setUserInfo(userInfoService.buildInfo(userManager.find(userSession.getUser().getId()), userSession + .getHash())); + data.setChatHttpBase(chatProperties.getHttpBase()); + data.setChatDomain(chatProperties.getDomain()); + data.setSiteDomain(kuneProperties.get(KuneProperties.SITE_DOMAIN)); + data.setChatRoomHost(chatProperties.getRoomHost()); + data.setWsThemes(this.kuneProperties.get(KuneProperties.WS_THEMES).split(",")); + data.setDefaultWsTheme(this.kuneProperties.get(KuneProperties.WS_THEMES_DEF)); + data.setSiteLogoUrl(kuneProperties.get(KuneProperties.SITE_LOGO_URL)); + data.setGalleryPermittedExtensions(kuneProperties.get(KuneProperties.UPLOAD_GALLERY_PERMITTED_EXTS)); + data.setMaxFileSizeInMb(kuneProperties.get(KuneProperties.UPLOAD_MAX_FILE_SIZE)); + data.setUserTools(serverToolRegistry.getToolsForUsers()); + data.setGroupTools(serverToolRegistry.getToolsForGroups()); + return mapper.map(data, InitDataDTO.class); } private UserSession getUserSession() { - return userSessionProvider.get(); + return userSessionProvider.get(); } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2008-10-16 14:34:33 UTC (rev 913) @@ -55,74 +55,74 @@ @Inject public UserRPC(final Provider<SessionService> sessionServiceProvider, - final Provider<UserSession> userSessionProvider, final UserManager userManager, - final GroupManager groupManager, final UserInfoService userInfoService, final Mapper mapper) { + final Provider<UserSession> userSessionProvider, final UserManager userManager, + final GroupManager groupManager, final UserInfoService userInfoService, final Mapper mapper) { - this.sessionServiceProvider = sessionServiceProvider; - this.userSessionProvider = userSessionProvider; - this.userManager = userManager; - this.groupManager = groupManager; - this.userInfoService = userInfoService; - this.mapper = mapper; + this.sessionServiceProvider = sessionServiceProvider; + this.userSessionProvider = userSessionProvider; + this.userManager = userManager; + this.groupManager = groupManager; + this.userInfoService = userInfoService; + this.mapper = mapper; } @Transactional(type = TransactionType.READ_WRITE, rollbackOn = DefaultException.class) - public UserInfoDTO createUser(final UserDTO userDTO) throws DefaultException { - final User user = userManager.createUser(userDTO.getShortName(), userDTO.getName(), userDTO.getEmail(), userDTO - .getPassword(), userDTO.getLanguage().getCode(), userDTO.getCountry().getCode(), userDTO.getTimezone() - .getId()); - groupManager.createUserGroup(user); - return loginUser(user); + public UserInfoDTO createUser(final UserDTO userDTO, boolean wantPersonalHomepage) throws DefaultException { + final User user = userManager.createUser(userDTO.getShortName(), userDTO.getName(), userDTO.getEmail(), userDTO + .getPassword(), userDTO.getLanguage().getCode(), userDTO.getCountry().getCode(), userDTO.getTimezone() + .getId()); + groupManager.createUserGroup(user, wantPersonalHomepage); + return loginUser(user); } @Transactional(type = TransactionType.READ_ONLY) public UserInfoDTO login(final String nickOrEmail, final String passwd) throws DefaultException { - final SessionService sessionService = sessionServiceProvider.get(); - sessionService.getNewSession(); - final User user = userManager.login(nickOrEmail, passwd); - return loginUser(user); + final SessionService sessionService = sessionServiceProvider.get(); + sessionService.getNewSession(); + final User user = userManager.login(nickOrEmail, passwd); + return loginUser(user); } @Authenticated @Transactional(type = TransactionType.READ_ONLY) public void logout(final String userHash) throws DefaultException { - getUserSession().logout(); - final SessionService sessionService = sessionServiceProvider.get(); - sessionService.getNewSession(); + getUserSession().logout(); + final SessionService sessionService = sessionServiceProvider.get(); + sessionService.getNewSession(); } @Authenticated(mandatory = false) @Transactional(type = TransactionType.READ_ONLY) public void onlyCheckSession(final String userHash) throws DefaultException { - // Do nothing @Authenticated checks user session + // Do nothing @Authenticated checks user session } @Authenticated @Transactional(type = TransactionType.READ_ONLY) public UserInfoDTO reloadUserInfo(final String userHash) throws DefaultException { - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - return loadUserInfo(user); + final UserSession userSession = getUserSession(); + final User user = userSession.getUser(); + return loadUserInfo(user); }; private UserSession getUserSession() { - return userSessionProvider.get(); + return userSessionProvider.get(); } private UserInfoDTO loadUserInfo(final User user) throws DefaultException { - final UserInfo userInfo = userInfoService.buildInfo(user, getUserSession().getHash()); - final UserInfoDTO map = mapper.map(userInfo, UserInfoDTO.class); - return map; + final UserInfo userInfo = userInfoService.buildInfo(user, getUserSession().getHash()); + final UserInfoDTO map = mapper.map(userInfo, UserInfoDTO.class); + return map; } private UserInfoDTO loginUser(final User user) throws DefaultException { - if (user != null) { - // Maybe use terracotta.org for http session clustering - getUserSession().login(user, UUID.randomUUID().toString()); - return loadUserInfo(user); - } else { - throw new UserAuthException(); - } + if (user != null) { + // Maybe use terracotta.org for http session clustering + getUserSession().login(user, UUID.randomUUID().toString()); + return loadUserInfo(user); + } else { + throw new UserAuthException(); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/State.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/State.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/State.java 2008-10-16 14:34:33 UTC (rev 913) @@ -65,235 +65,245 @@ private SocialNetwork groupMembers; private ParticipationData participation; private StateToken stateToken; + private List<String> enabledTools; public State() { } public AccessLists getAccessLists() { - return accessLists; + return accessLists; } public List<User> getAuthors() { - return authors; + return authors; } public Container getContainer() { - return container; + return container; } public AccessRights getContainerRights() { - return containerRights; + return containerRights; } public String getContent() { - return content; + return content; } public AccessRights getContentRights() { - return contentRights; + return contentRights; } public Double getCurrentUserRate() { - return currentUserRate; + return currentUserRate; } public String getDocumentId() { - return documentId; + return documentId; } + public List<String> getEnabledTools() { + return enabledTools; + } + public Group getGroup() { - return group; + return group; } public SocialNetwork getGroupMembers() { - return groupMembers; + return groupMembers; } public AccessRights getGroupRights() { - return groupRights; + return groupRights; } public List<TagResult> getGroupTags() { - return groupTags; + return groupTags; } public I18nLanguage getLanguage() { - return language; + return language; } public License getLicense() { - return license; + return license; } public BasicMimeType getMimeType() { - return mimeType; + return mimeType; } public ParticipationData getParticipation() { - return participation; + return participation; } public Date getPublishedOn() { - return publishedOn; + return publishedOn; } public Double getRate() { - return rate; + return rate; } public Integer getRateByUsers() { - return rateByUsers; + return rateByUsers; } public Container getRootContainer() { - return rootContainer; + return rootContainer; } public StateToken getStateToken() { - return stateToken; + return stateToken; } public ContentStatus getStatus() { - return status; + return status; } public String getTags() { - return tags; + return tags; } public String getTitle() { - return title; + return title; } public String getToolName() { - return toolName; + return toolName; } public String getTypeId() { - return typeId; + return typeId; } public boolean isRateable() { - return isRateable; + return isRateable; } public void setAccessLists(final AccessLists accessLists) { - this.accessLists = accessLists; + this.accessLists = accessLists; } public void setAuthors(final List<User> authors) { - this.authors = authors; + this.authors = authors; } public void setContainer(final Container container) { - this.container = container; + this.container = container; } public void setContainerRights(final AccessRights containerRights) { - this.containerRights = containerRights; + this.containerRights = containerRights; } public void setContent(final String content) { - this.content = content; + this.content = content; } public void setContentRights(final AccessRights accessRights) { - this.contentRights = accessRights; + this.contentRights = accessRights; } public void setCurrentUserRate(final Double currentUserRate) { - this.currentUserRate = currentUserRate; + this.currentUserRate = currentUserRate; } public void setDocumentId(final String docRef) { - this.documentId = docRef; + this.documentId = docRef; } + public void setEnabledTools(List<String> enabledTools) { + this.enabledTools = enabledTools; + } + public void setGroup(final Group group) { - this.group = group; + this.group = group; } public void setGroupMembers(final SocialNetwork groupMembers) { - this.groupMembers = groupMembers; + this.groupMembers = groupMembers; } public void setGroupRights(final AccessRights groupRights) { - this.groupRights = groupRights; + this.groupRights = groupRights; } public void setGroupTags(final List<TagResult> groupTags) { - this.groupTags = groupTags; + this.groupTags = groupTags; } public void setIsRateable(final boolean isRateable) { - this.isRateable = isRateable; + this.isRateable = isRateable; } public void setLanguage(final I18nLanguage language) { - this.language = language; + this.language = language; } public void setLicense(final License license) { - this.license = license; + this.license = license; } public void setMimeType(final BasicMimeType mimeType) { - this.mimeType = mimeType; + this.mimeType = mimeType; } public void setParticipation(final ParticipationData participation) { - this.participation = participation; + this.participation = participation; } public void setPublishedOn(final Date publishedOn) { - this.publishedOn = publishedOn; + this.publishedOn = publishedOn; } public void setRate(final Double rate) { - if (rate != null) { - this.rate = rate; - } else { - this.rate = 0d; - } + if (rate != null) { + this.rate = rate; + } else { + this.rate = 0d; + } } public void setRateByUsers(final Long rateByUsers) { - if (rateByUsers != null) { - this.rateByUsers = rateByUsers.intValue(); - } else { - this.rateByUsers = 0; - } + if (rateByUsers != null) { + this.rateByUsers = rateByUsers.intValue(); + } else { + this.rateByUsers = 0; + } } public void setRootContainer(final Container rootContainer) { - this.rootContainer = rootContainer; + this.rootContainer = rootContainer; } public void setStateToken(final StateToken stateToken) { - this.stateToken = stateToken; + this.stateToken = stateToken; } public void setStatus(final ContentStatus status) { - this.status = status; + this.status = status; } public void setTags(final String tags) { - this.tags = tags; + this.tags = tags; } public void setTitle(final String title) { - this.title = title; + this.title = title; } public void setToolName(final String toolName) { - this.toolName = toolName; + this.toolName = toolName; } public void setTypeId(final String typeId) { - this.typeId = typeId; + this.typeId = typeId; } + @Override public String toString() { - return "State[" + stateToken + "/" + typeId + "]"; + return "State[" + stateToken + "/" + typeId + "]"; } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java 2008-10-16 14:34:33 UTC (rev 913) @@ -23,6 +23,7 @@ import org.ourproject.kune.platf.server.access.Access; import org.ourproject.kune.platf.server.domain.Container; import org.ourproject.kune.platf.server.domain.Content; +import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.domain.License; import org.ourproject.kune.platf.server.domain.Revision; @@ -32,54 +33,55 @@ public class StateServiceDefault implements StateService { public State create(final Access access) { - final Content content = access.getContent(); - final Container container = access.getContainer(); - final State state = new State(); + final Content content = access.getContent(); + final Container container = access.getContainer(); + final State state = new State(); - final Long documentId = content.getId(); - if (documentId != null) { - state.setTypeId(content.getTypeId()); - state.setMimeType(content.getMimeType()); - state.setDocumentId(documentId.toString()); - state.setIsRateable(true); - state.setLanguage(content.getLanguage()); - state.setPublishedOn(content.getPublishedOn()); - state.setAuthors(content.getAuthors()); - state.setTags(content.getTagsAsString()); - state.setStatus(content.getStatus()); - state.setStateToken(content.getStateToken()); - } else { - state.setTypeId(container.getTypeId()); - state.setDocumentId(null); - state.setIsRateable(false); - state.setLanguage(container.getLanguage()); - state.setStateToken(container.getStateToken()); - } - if (!container.isRoot()) { - state.setRootContainer(container.getAbsolutePath().get(0)); - } else { - state.setRootContainer(container); - } - final Revision revision = content.getLastRevision(); - final char[] text = revision.getBody(); - state.setContent(text == null ? null : new String(text)); - if (documentId != null) { - state.setTitle(revision.getTitle()); - } else { - state.setTitle(container.getName()); - } - state.setToolName(container.getToolName()); - state.setGroup(container.getOwner()); - state.setContainer(container); - state.setAccessLists(access.getContentAccessLists()); - state.setContentRights(access.getContentRights()); - state.setContainerRights(access.getContainerRights()); - state.setGroupRights(access.getGroupRights()); - License contentLicense = content.getLicense(); - if (contentLicense == null) { - contentLicense = container.getOwner().getDefaultLicense(); - } - state.setLicense(contentLicense); - return state; + final Long documentId = content.getId(); + if (documentId != null) { + state.setTypeId(content.getTypeId()); + state.setMimeType(content.getMimeType()); + state.setDocumentId(documentId.toString()); + state.setIsRateable(true); + state.setLanguage(content.getLanguage()); + state.setPublishedOn(content.getPublishedOn()); + state.setAuthors(content.getAuthors()); + state.setTags(content.getTagsAsString()); + state.setStatus(content.getStatus()); + state.setStateToken(content.getStateToken()); + } else { + state.setTypeId(container.getTypeId()); + state.setDocumentId(null); + state.setIsRateable(false); + state.setLanguage(container.getLanguage()); + state.setStateToken(container.getStateToken()); + } + if (!container.isRoot()) { + state.setRootContainer(container.getAbsolutePath().get(0)); + } else { + state.setRootContainer(container); + } + final Revision revision = content.getLastRevision(); + final char[] text = revision.getBody(); + state.setContent(text == null ? null : new String(text)); + if (documentId != null) { + state.setTitle(revision.getTitle()); + } else { + state.setTitle(container.getName()); + } + state.setToolName(container.getToolName()); + Group group = container.getOwner(); + state.setGroup(group); + state.setContainer(container); + state.setAccessLists(access.getContentAccessLists()); + state.setContentRights(access.getContentRights()); + state.setContainerRights(access.getContainerRights()); + state.setGroupRights(access.getGroupRights()); + License contentLicense = content.getLicense(); + if (contentLicense == null) { + contentLicense = group.getDefaultLicense(); + } + state.setLicense(contentLicense); + return state; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerTool.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerTool.java 2008-10-16 14:34:33 UTC (rev 913) @@ -26,20 +26,24 @@ import org.ourproject.kune.platf.server.domain.User; /** - * ATENCIÓN: las tools hay que registrarlas en el módulo correspondiente - * marcándolas como asEagerSingleton!! y el método register tiene que tener la - * anotacion de Inject * + * Tools must have a corresponding module and must be marked asEagerSingleton. + * The register method must have the @Inject annotation + * */ public interface ServerTool { - public void onCreateContainer(Container container, Container parent, String typeId); + String getName(); - public void onCreateContent(Content content, Container parent); + String getRootName(); - public void register(ToolRegistry registry); + Group initGroup(User user, Group group); - String getName(); + void onCreateContainer(Container container, Container parent, String typeId); - Group initGroup(User user, Group group); + void onCreateContent(Content content, Container parent); + + void register(ServerToolRegistry registry); + + ServerToolTarget getTarget(); } Copied: trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerToolRegistry.java (from rev 909, trunk/src/main/java/org/ourproject/kune/platf/server/tool/ToolRegistry.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/tool/ToolRegistry.java 2008-10-14 13:39:30 UTC (rev 909) +++ trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerToolRegistry.java 2008-10-16 14:34:33 UTC (rev 913) @@ -0,0 +1,104 @@ +/* + * + * Copyright (C) 2007-2008 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +package org.ourproject.kune.platf.server.tool; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.google.inject.Singleton; + +@Singleton +public class ServerToolRegistry { + static Log log = LogFactory.getLog(ServerToolRegistry.class); + + public static Collection<String> emptyToolList = new ArrayList<String>(); + + private final HashMap<String, ServerTool> tools; + // private final List<ToolSimple> toolsForGroupsList; + // private final List<ToolSimple> toolsForUsersList; + private final HashMap<String, ToolSimple> toolsForUsersMap; + private final HashMap<String, ToolSimple> toolsForGroupsMap; + + public ServerToolRegistry() { + tools = new HashMap<String, ServerTool>(); + toolsForUsersMap = new HashMap<String, ToolSimple>(); + toolsForGroupsMap = new HashMap<String, ToolSimple>(); + // toolsForGroupsList = new ArrayList<ToolSimple>(); + // toolsForUsersList = new ArrayList<ToolSimple>(); + } + + public Collection<ServerTool> all() { + return tools.values(); + } + + public ServerTool get(final String toolName) { + return tools.get(toolName); + } + + // + // public List<ToolSimple> getToolsForGroupsList() { + // return toolsForGroupsList; + // } + + public Collection<ToolSimple> getToolsForGroups() { + return toolsForGroupsMap.values(); + } + + public Collection<String> getToolsForGroupsKeys() { + return toolsForGroupsMap.keySet(); + } + + public Collection<String> getToolsForUserKeys() { + return toolsForUsersMap.keySet(); + } + + public Collection<ToolSimple> getToolsForUsers() { + return toolsForUsersMap.values(); + } + + // public List<ToolSimple> getToolsForUsersList() { + // return toolsForUsersList; + // } + + public void register(final ServerTool tool) { + String name = tool.getName(); + String rootName = tool.getRootName(); + tools.put(name, tool); + switch (tool.getTarget()) { + case forGroups: + toolsForGroupsMap.put(name, new ToolSimple(name, rootName)); + break; + case forUsers: + // toolsForUsersList.add(new ToolSimple(name, rootName)); + toolsForUsersMap.put(name, new ToolSimple(name, rootName)); + break; + case forBoth: + toolsForGroupsMap.put(name, new ToolSimple(name, rootName)); + toolsForUsersMap.put(name, new ToolSimple(name, rootName)); + // toolsForUsersList.add(new ToolSimple(name, rootName)); + break; + } + } +} Property changes on: trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerToolRegistry.java ___________________________________________________________________ Name: svn:mergeinfo + Added: trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerToolTarget.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerToolTarget.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerToolTarget.java 2008-10-16 14:34:33 UTC (rev 913) @@ -0,0 +1,5 @@ +package org.ourproject.kune.platf.server.tool; + +public enum ServerToolTarget { + forUsers, forGroups, forBoth +} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/tool/ToolRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/tool/ToolRegistry.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/tool/ToolRegistry.java 2008-10-16 14:34:33 UTC (rev 913) @@ -1,55 +0,0 @@ -/* - * - * Copyright (C) 2007-2008 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -package org.ourproject.kune.platf.server.tool; - -import java.util.Collection; -import java.util.concurrent.ConcurrentHashMap; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import com.google.inject.Singleton; - -@Singleton -public class ToolRegistry { - static Log log = LogFactory.getLog(ToolRegistry.class); - - // TODO: ConcurrentHashMap, sure? - private final ConcurrentHashMap<String, ServerTool> tools; - - public ToolRegistry() { - this.tools = new ConcurrentHashMap<String, ServerTool>(); - } - - public void register(final ServerTool tool) { - tools.put(tool.getName(), tool); - } - - public Collection<ServerTool> all() { - return tools.values(); - } - - public ServerTool get(final String toolName) { - return tools.get(toolName); - - } - -} Added: trunk/src/main/java/org/ourproject/kune/platf/server/tool/ToolSimple.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/tool/ToolSimple.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/platf/server/tool/ToolSimple.java 2008-10-16 14:34:33 UTC (rev 913) @@ -0,0 +1,59 @@ +package org.ourproject.kune.platf.server.tool; + +public class ToolSimple { + + private final String name; + private final String rootName; + + public ToolSimple(String name, String rootName) { + this.name = name; + this.rootName = rootName; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + ToolSimple other = (ToolSimple) obj; + if (name == null) { + if (other.name != null) { + return false; + } + } else if (!name.equals(other.name)) { + return false; + } + if (rootName == null) { + if (other.rootName != null) { + return false; + } + } else if (!rootName.equals(other.rootName)) { + return false; + } + return true; + } + + public String getName() { + return name; + } + + public String getRootName() { + return rootName; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((rootName == null) ? 0 : rootName.hashCode()); + return result; + } + +} 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java 2008-10-16 14:34:33 UTC (rev 913) @@ -47,124 +47,124 @@ private final Provider<GroupServiceAsync> groupServiceProvider; public NewGroupPresenter(final I18nTranslationService i18n, final Session session, final StateManager stateManager, - final Provider<GroupServiceAsync> groupServiceProvider) { - this.i18n = i18n; - this.session = session; - this.stateManager = stateManager; - this.groupServiceProvider = groupServiceProvider; - stateManager.addSiteToken(SiteToken.newgroup.toString(), new Listener<StateToken>() { - public void onEvent(final StateToken previousStateToken) { - doNewGroup(previousStateToken); - } - }); + final Provider<GroupServiceAsync> groupServiceProvider) { + this.i18n = i18n; + this.session = session; + this.stateManager = stateManager; + this.groupServiceProvider = groupServiceProvider; + stateManager.addSiteToken(SiteToken.newgroup.toString(), new Listener<StateToken>() { + public void onEvent(final StateToken previousStateToken) { + doNewGroup(previousStateToken); + } + }); } public void doNewGroup(final StateToken previousToken) { - this.previousToken = previousToken; - session.check(new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - if (session.isLogged()) { - Site.showProgressProcessing(); - view.show(); - view.center(); - Site.hideProgress(); - } else { - stateManager.gotoToken(previousToken); - Site.info(i18n.t("Sign in or register to create a group")); - } - } - }); + this.previousToken = previousToken; + session.check(new AsyncCallbackSimple<Object>() { + public void onSuccess(final Object result) { + if (session.isLogged()) { + Site.showProgressProcessing(); + view.show(); + view.center(); + Site.hideProgress(); + } else { + stateManager.gotoToken(previousToken); + Site.info(i18n.t("Sign in or register to create a group")); + } + } + }); } public View getView() { - return view; + return view; } public void init(final NewGroupView view) { - this.view = view; + this.view = view; } public void onBack() { - view.setEnabledBackButton(false); - view.setEnabledFinishButton(false); - view.setEnabledNextButton(true); - view.showNewGroupInitialDataForm(); + view.setEnabledBackButton(false); + view.setEnabledFinishButton(false); + view.setEnabledNextButton(true); + view.showNewGroupInitialDataForm(); } public void onCancel() { - view.hide(); - reset(); - stateManager.gotoToken(previousToken); + view.hide(); + reset(); + stateManager.gotoToken(previousToken); } public void onClose() { - reset(); - stateManager.gotoToken(previousToken); + reset(); + stateManager.gotoToken(previousToken); } public void onFinish() { - view.maskProcessing(); - final String shortName = view.getShortName(); - final String longName = view.getLongName(); - final String publicDesc = view.getPublicDesc(); - final LicenseDTO license = view.getLicense(); - final GroupDTO group = new GroupDTO(shortName, longName, publicDesc, getTypeOfGroup()); - group.setDefaultLicense(license); - group.setTags(view.getTags()); + view.maskProcessing(); + final String shortName = view.getShortName(); + final String longName = view.getLongName(); + final String publicDesc = view.getPublicDesc(); + final LicenseDTO license = view.getLicense(); + final GroupDTO group = new GroupDTO(shortName, longName, getTypeOfGroup()); + group.setDefaultLicense(license); - final AsyncCallback<StateToken> callback = new AsyncCallback<StateToken>() { - public void onFailure(final Throwable caught) { - try { - throw caught; - } catch (final GroupNameInUseException e) { - onBack(); - view.unMask(); - setMessage(i18n.t("This name in already in use, try with a different name."), SiteErrorType.error); - } catch (final Throwable e) { - onBack(); // The messageP is in first page of wizard :-/ - view.unMask(); - setMessage(i18n.t("Error creating group"), SiteErrorType.error); - GWT.log("Other kind of exception in group registration", null); - throw new RuntimeException(); - } - } + final AsyncCallback<StateToken> callback = new AsyncCallback<StateToken>() { + public void onFailure(final Throwable caught) { + try { + throw caught; + } catch (final GroupNameInUseException e) { + onBack(); + view.unMask(); + setMessage(i18n.t("This name in already in use, try with a different name."), SiteErrorType.error); + } catch (final Throwable e) { + onBack(); // The messageP is in first page of wizard :-/ + view.unMask(); + setMessage(i18n.t("Error creating group"), SiteErrorType.error); + GWT.log("Other kind of exception in group registration", null); + throw new RuntimeException(); + } + } - public void onSuccess(final StateToken token) { - stateManager.gotoToken(token); - view.hide(); - reset(); - view.unMask(); - } - }; - groupServiceProvider.get().createNewGroup(session.getUserHash(), group, callback); + public void onSuccess(final StateToken token) { + stateManager.gotoToken(token); + view.hide(); + reset(); + view.unMask(); + } + }; + groupServiceProvider.get().createNewGroup(session.getUserHash(), group, publicDesc, view.getTags(), null, + callback); } public void onNext() { - if (view.isFormValid()) { - view.setEnabledBackButton(true); - view.setEnabledFinishButton(true); - view.setEnabledNextButton(false); - view.showLicenseForm(); - } + if (view.isFormValid()) { + view.setEnabledBackButton(true); + view.setEnabledFinishButton(true); + view.setEnabledNextButton(false); + view.showLicenseForm(); + } } public void setMessage(final String message, final SiteErrorType type) { - view.setMessage(message, type); + view.setMessage(message, type); } private GroupType getTypeOfGroup() { - if (view.isProject()) { - return GroupType.PROJECT; - } else if (view.isOrphanedProject()) { - return GroupType.ORPHANED_PROJECT; - } else if (view.isOrganization()) { - return GroupType.ORGANIZATION; - } else { - return GroupType.COMMUNITY; - } + if (view.isProject()) { + return GroupType.PROJECT; + } else if (view.isOrphanedProject()) { + return GroupType.ORPHANED_PROJECT; + } else if (view.isOrganization()) { + return GroupType.ORGANIZATION; + } else { + return GroupType.COMMUNITY; + } } private void reset() { - view.clearData(); + view.clearData(); } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2008-10-16 14:34:33 UTC (rev 913) @@ -6,6 +6,8 @@ import com.gwtext.client.data.SimpleStore; import com.gwtext.client.data.Store; import com.gwtext.client.widgets.form.ComboBox; +import com.gwtext.client.widgets.form.FieldSet; +import com.gwtext.client.widgets.form.Radio; import com.gwtext.client.widgets.form.TextField; import com.gwtext.client.widgets.form.VType; import com.gwtext.client.widgets.form.ValidationException; @@ -23,6 +25,8 @@ private static final String LANG_FIELD = "kune-urf-lang-f"; private static final String COUNTRY_FIELD = "kune-urf-country-f"; private static final String TIMEZONE_FIELD = "kune-urf-timezone-f"; + private static final String WANNAPERSONALHOMEPAGE_FIELD = "kune-urf-wphp-f"; + private static final String NOPERSONALHOMEPAGE_FIELD = "kune-urf-nphp-f"; private final TextField shortNameRegField; private final TextField longNameRegField; @@ -32,14 +36,18 @@ private final ComboBox languageCombo; private final ComboBox countryCombo; private final ComboBox timezoneCombo; + private final Radio wantPersonalHomePage; + private final Radio noPersonalHomePage; + private final I18nUITranslationService i18n; public RegisterForm(final SignInPresenter presenter, final I18nUITranslationService i18n) { + this.i18n = i18n; super.addStyleName("kune-Margin-Large-l"); shortNameRegField = new TextField(); shortNameRegField.setFieldLabel(i18n.t("Nickname")); shortNameRegField.setName(NICK_FIELD); - shortNameRegField.setWidth(DEF_FIELD_WIDTH); + shortNameRegField.setWidth(DEF_SMALL_FIELD_WIDTH); shortNameRegField.setAllowBlank(false); shortNameRegField.setMinLength(3); shortNameRegField.setMaxLength(15); @@ -67,7 +75,7 @@ passwdRegField.setPassword(true); passwdRegField.setAllowBlank(false); passwdRegField.setMaxLength(40); - passwdRegField.setWidth(DEF_FIELD_WIDTH); + passwdRegField.setWidth(DEF_MEDIUM_FIELD_WIDTH); passwdRegField.setValidationEvent(false); passwdRegField.setId(PASSWORD_FIELD); add(passwdRegField); @@ -79,7 +87,7 @@ passwdRegFieldDup.setAllowBlank(false); passwdRegFieldDup.setMinLength(6); passwdRegFieldDup.setMaxLength(40); - passwdRegFieldDup.setWidth(DEF_FIELD_WIDTH); + passwdRegFieldDup.setWidth(DEF_MEDIUM_FIELD_WIDTH); passwdRegFieldDup.setInvalidText(i18n.t("Passwords do not match")); passwdRegFieldDup.setValidator(new Validator() { public boolean validate(final String value) throws ValidationException { @@ -94,7 +102,7 @@ emailRegField.setFieldLabel(i18n.t("Email")); emailRegField.setName(EMAIL_FIELD); emailRegField.setVtype(VType.EMAIL); - emailRegField.setWidth(DEF_FIELD_WIDTH); + emailRegField.setWidth(DEF_MEDIUM_FIELD_WIDTH); emailRegField.setAllowBlank(false); emailRegField.setValidationEvent(false); emailRegField.setId(EMAIL_FIELD); @@ -116,7 +124,7 @@ languageCombo.setTypeAhead(true); languageCombo.setTypeAheadDelay(1000); languageCombo.setSelectOnFocus(false); - languageCombo.setWidth(186); + languageCombo.setWidth(DEF_MEDIUM_FIELD_WIDTH); languageCombo.setAllowBlank(false); languageCombo.setValueField("abbr"); languageCombo.setValue(presenter.getCurrentLanguage().getCode()); @@ -142,7 +150,7 @@ countryCombo.setTypeAhead(true); countryCombo.setTypeAheadDelay(1000); countryCombo.setSelectOnFocus(false); - countryCombo.setWidth(186); + countryCombo.setWidth(DEF_MEDIUM_FIELD_WIDTH); countryCombo.setAllowBlank(false); countryCombo.setValueField("abbr"); countryCombo.setPageSize(7); @@ -167,7 +175,7 @@ timezoneCombo.setTypeAhead(true); timezoneCombo.setTypeAheadDelay(1000); timezoneCombo.setSelectOnFocus(false); - timezoneCombo.setWidth(186); + timezoneCombo.setWidth(DEF_MEDIUM_FIELD_WIDTH); timezoneCombo.setAllowBlank(false); timezoneCombo.setValueField("id"); timezoneCombo.setPageSize(7); @@ -175,6 +183,17 @@ timezoneCombo.setValidationEvent(false); timezoneCombo.setId(TIMEZONE_FIELD); add(timezoneCombo); + + final FieldSet personalSpaceFieldSet = new FieldSet(i18n.t("Do you want a personal homepage?")); + wantPersonalHomePage = new Radio(); + noPersonalHomePage = new Radio(); + personalSpaceFieldSet.setCollapsible(false); + createRadio(personalSpaceFieldSet, wantPersonalHomePage, i18n + .t("Yes, I want a homepage for publish my contents."), WANNAPERSONALHOMEPAGE_FIELD); + wantPersonalHomePage.setChecked(true); + createRadio(personalSpaceFieldSet, noPersonalHomePage, i18n.t("No, I don't want. Maybe in the future."), + NOPERSONALHOMEPAGE_FIELD); + add(personalSpaceFieldSet); } public String getCountry() { @@ -209,4 +228,17 @@ return timezoneCombo.getValueAsString(); } + public boolean wantPersonalHomepage() { + return wantPersonalHomePage.getValue(); + } + + private void createRadio(final FieldSet fieldSet, final Radio radio, final String radioLabel, final String radioId) { + radio.setName(radioId); + radio.setBoxLabel(i18n.t(radioLabel)); + radio.setAutoCreate(true); + radio.setHideLabel(true); + radio.setId(radioId); + fieldSet.add(radio); + } + } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java 2008-10-16 14:34:33 UTC (rev 913) @@ -13,38 +13,38 @@ private final TextField loginPassField; public SignInForm(final I18nTranslationService i18n) { - super.addStyleName("kune-Margin-Large-trbl"); + super.addStyleName("kune-Margin-Large-trbl"); - loginNickOrEmailField = new TextField(); - loginNickOrEmailField.setFieldLabel(i18n.t("Nickname or email")); - loginNickOrEmailField.setName(NICKOREMAIL_FIELD); - loginNickOrEmailField.setWidth(DEF_FIELD_WIDTH); - loginNickOrEmailField.setAllowBlank(false); - loginNickOrEmailField.setValidationEvent(false); - loginNickOrEmailField.setId(NICKOREMAIL_FIELD); - super.add(loginNickOrEmailField); + loginNickOrEmailField = new TextField(); + loginNickOrEmailField.setFieldLabel(i18n.t("Nickname or email")); + loginNickOrEmailField.setName(NICKOREMAIL_FIELD); + loginNickOrEmailField.setWidth(DEF_SMALL_FIELD_WIDTH); + loginNickOrEmailField.setAllowBlank(false); + loginNickOrEmailField.setValidationEvent(false); + loginNickOrEmailField.setId(NICKOREMAIL_FIELD); + super.add(loginNickOrEmailField); - loginPassField = new TextField(); - loginPassField.setFieldLabel(i18n.t("Password")); - loginPassField.setName(PASSWORD_FIELD); - loginPassField.setWidth(DEF_FIELD_WIDTH); - loginPassField.setPassword(true); - loginPassField.setAllowBlank(false); - loginPassField.setValidationEvent(false); - loginPassField.setId(PASSWORD_FIELD); - super.add(loginPassField); + loginPassField = new TextField(); + loginPassField.setFieldLabel(i18n.t("Password")); + loginPassField.setName(PASSWORD_FIELD); + loginPassField.setWidth(DEF_MEDIUM_FIELD_WIDTH); + loginPassField.setPassword(true); + loginPassField.setAllowBlank(false); + loginPassField.setValidationEvent(false); + loginPassField.setId(PASSWORD_FIELD); + super.add(loginPassField); } public void focusLogin() { - loginNickOrEmailField.focus(); + loginNickOrEmailField.focus(); } public String getLoginPassword() { - return loginPassField.getValueAsString(); + return loginPassField.getValueAsString(); } public String getNickOrEmail() { - return loginNickOrEmailField.getValueAsString(); + return loginNickOrEmailField.getValueAsString(); } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java 2008-10-16 14:34:33 UTC (rev 913) @@ -35,50 +35,51 @@ import com.google.gwt.user.client.Cookies; import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.core.EventObject; -import com.gwtext.client.core.RegionPosition; import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.TabPanel; +import com.gwtext.client.widgets.Toolbar; import com.gwtext.client.widgets.event.ButtonListenerAdapter; import com.gwtext.client.widgets.event.PanelListenerAdapter; import com.gwtext.client.widgets.event.WindowListenerAdapter; import com.gwtext.client.widgets.form.Field; -import com.gwtext.client.widgets.layout.BorderLayout; -import com.gwtext.client.widgets.layout.BorderLayoutData; import com.gwtext.client.widgets.layout.FitLayout; public class SignInPanel implements SignInView { private class MessagePanel extends Panel { - private static final String SIGNIN_MESSAGE_PANEL = "kune-sip-mp"; - private final SimpleMessagePanel messagesPanel; + private static final String SIGNIN_MESSAGE_PANEL = "kune-sip-mp"; + private final SimpleMessagePanel messagesPanel; - public MessagePanel() { - setPaddings(10); - setBorder(false); - setHeight(60); - messagesPanel = new SimpleMessagePanel(); - messagesPanel.ensureDebugId(SIGNIN_MESSAGE_PANEL); - messagesPanel.setMessage("", SiteErrorType.info, SiteErrorType.error); - add(messagesPanel); - } + public MessagePanel() { + setPaddings(10); + setBorder(false); + setHeight(60); + messagesPanel = new SimpleMessagePanel(); + messagesPanel.ensureDebugId(SIGNIN_MESSAGE_PANEL); + messagesPanel.setMessage("", SiteErrorType.info, SiteErrorType.error); + add(messagesPanel); + } - public void hide() { - messagesPanel.hide(); - super.hide(); - } + @Override + public void hide() { + messagesPanel.hide(); + super.hide(); + } - public void setMessage(final String message, final SiteErrorType lastMessageType, final SiteErrorType type) { - messagesPanel.setMessage(message, lastMessageType, type); - } + public void setMessage(final String message, final SiteErrorType lastMessageType, final SiteErrorType type) { + messagesPanel.setMessage(message, lastMessageType, type); + } - public void show() { - messagesPanel.show(); - super.show(); - } + @Override + public void show() { + messagesPanel.show(); + super.show(); + } } private static final String USER_SIGN_IN_PANEL = "kune-sip-usp"; @@ -96,275 +97,300 @@ private TabPanel centerPanel; private MessagePanel messagesRegisterPanel; private final I18nUITranslationService i18n; + private Label errorLabel; public SignInPanel(final SignInPresenter presenter, final I18nUITranslationService i18n, final WorkspaceSkeleton ws) { - this.i18n = i18n; - Field.setMsgTarget("side"); - this.presenter = presenter; - createPanel(); + this.i18n = i18n; + Field.setMsgTarget("side"); + this.presenter = presenter; + createPanel(); } public void center() { - dialog.center(); + dialog.center(); } public String getCountry() { - return registerForm.getCountry(); + return registerForm.getCountry(); } public String getEmail() { - return registerForm.getEmail(); + return registerForm.getEmail(); } public String getLanguage() { - return registerForm.getLanguage(); + return registerForm.getLanguage(); } public String getLoginPassword() { - return signInForm.getLoginPassword(); + return signInForm.getLoginPassword(); } public String getLongName() { - return registerForm.getLongName(); + return registerForm.getLongName(); } public String getNickOrEmail() { - return signInForm.getNickOrEmail(); + return signInForm.getNickOrEmail(); } public String getRegisterPassword() { - return registerForm.getRegisterPassword(); + return registerForm.getRegisterPassword(); } public String getRegisterPasswordDup() { - return registerForm.getRegisterPasswordDup(); + return registerForm.getRegisterPasswordDup(); } public String getShortName() { - return registerForm.getShortName(); + return registerForm.getShortName(); } public String getTimezone() { - return registerForm.getTimezone(); + return registerForm.getTimezone(); } public void hide() { - dialog.hide(); + dialog.hide(); } public void hideMessages() { - messagesSignInPanel.hide(); - if (messagesRegisterPanel != null) { - messagesRegisterPanel.hide(); - } - renderDialogIfNeeded(); + errorLabel.setText(""); + messagesSignInPanel.hide(); + if (messagesRegisterPanel != null) { + messagesRegisterPanel.hide(); + } + renderDialogIfNeeded(); } public boolean isRegisterFormValid() { - return registerForm.isValid(); + return registerForm.isValid(); } public boolean isSignInFormValid() { - return signInForm.isValid(); + return signInForm.isValid(); } public void mask(final String message) { - dialog.getEl().mask(message, "x-mask-loading"); + dialog.getEl().mask(message, "x-mask-loading"); } public void maskProcessing() { - mask(i18n.t("Processing")); + mask(i18n.t("Processing")); } public void reset() { - DeferredCommand.addCommand(new Command() { - public void execute() { - signInForm.reset(); - if (registerForm != null) { - registerForm.reset(); - } - } - }); + DeferredCommand.addCommand(new Command() { + public void execute() { + signInForm.reset(); + if (registerForm != null) { + registerForm.reset(); + } + } + }); } public void setCookie(final String userHash) { - // http://code.google.com/p/google-web-toolkit-incubator/wiki/LoginSecurityFAQ - final long duration = Session.SESSION_DURATION; - final Date expires = new Date(System.currentTimeMillis() + duration); - Cookies.setCookie(Site.USERHASH, userHash, expires, null, "/", false); - GWT.log("Received hash: " + userHash, null); + // http://code.google.com/p/google-web-toolkit-incubator/wiki/LoginSecurityFAQ + final long duration = Session.SESSION_DURATION; + final Date expires = new Date(System.currentTimeMillis() + duration); + Cookies.setCookie(Site.USERHASH, userHash, expires, null, "/", false); + GWT.log("Received hash: " + userHash, null); } public void setRegisterMessage(final String message, final SiteErrorType type) { - messagesRegisterPanel.setMessage(message, type, type); - messagesRegisterPanel.show(); - renderDialogIfNeeded(); + messagesRegisterPanel.setMessage(message, type, type); + messagesRegisterPanel.show(); + renderDialogIfNeeded(); } public void setSignInMessage(final String message, final SiteErrorType type) { - messagesSignInPanel.setMessage(message, type, type); - messagesSignInPanel.show(); - renderDialogIfNeeded(); + errorLabel.setText(message); + messagesSignInPanel.setMessage(message, type, type); + messagesSignInPanel.show(); + renderDialogIfNeeded(); } public void show() { - centerPanel.activate(0); - dialog.setVisible(true); - dialog.show(); - Site.hideProgress(); - dialog.focus(); - signInForm.focusLogin(); + centerPanel.activate(0); + dialog.setVisible(true); + dialog.show(); + Site.hideProgress(); + dialog.focus(); + signInForm.focusLogin(); } public void showWelcolmeDialog() { - if (welcomeDialog == null) { - welcomeDialog = new InfoDialog(i18n.t("Welcome"), i18n.t("Thanks for registering"), i18n - .t("Now you can participate more actively in this site with other people and groups. " - + "You can also use your personal space to publish contents. " - + "Your email is not verified, please follow the instructions you will receive by email."), - i18n.t("Ok"), true, true, 400, 270); - } - welcomeDialog.show(); + if (welcomeDialog == null) { + welcomeDialog = new InfoDialog(i18n.t("Welcome"), i18n.t("Thanks for registering"), i18n + .t("Now you can participate more actively in this site with other people and groups. " + + "You can also use your personal space to publish contents. " + + "Your email is not verified, please follow the instructions you will receive by email."), + i18n.t("Ok"), true, true, 400, 270); + } + welcomeDialog.show(); } public void unMask() { - dialog.getEl().unmask(); + dialog.getEl().unmask(); } + public boolean wantPersonalHomepage() { + return registerForm.wantPersonalHomepage(); + } + private void confPanel(final Panel panel) { - // panel.setLayout(new FormLayout()); - // panel.setAutoWidth(true); - // anel.setAutoHeight(true); + // panel.setLayout(new FormLayout()); + // panel.setAutoWidth(true); + // anel.setAutoHeight(true); + panel.setAutoScroll(true); } private Panel createNoAccountRegister() { - final Panel noAccRegisterPanel = new Panel(); - noAccRegisterPanel.setBorder(false); - noAccRegisterPanel.setMargins(0, 90, 0, 0); - final Label dontHaveAccountLabel = new Label(i18n.t("Don't have an account?")); - final Label registerLabel = new Label(i18n.t("Create one.")); - registerLabel.addClickListener(new ClickListener() { - public void onClick(final Widget arg0) { - centerPanel.activate(1); - } - }); - registerLabel.addStyleName("kune-Margin-Medium-l"); - registerLabel.addStyleName("kune-link"); - noAccRegisterPanel.add(dontHaveAccountLabel); - noAccRegisterPanel.add(registerLabel); - return noAccRegisterPanel; + final Panel noAccRegisterPanel = new Panel(); + noAccRegisterPanel.setBorder(false); + noAccRegisterPanel.setMargins(0, 20, 0, 0); + HorizontalPanel hp = new HorizontalPanel(); + final Label dontHaveAccountLabel = new Label(i18n.t("Don't have an account?")); + final Label registerLabel = new Label(i18n.t("Create one.")); + registerLabel.addClickListener(new ClickListener() { + public void onClick(final Widget arg0) { + centerPanel.activate(1); + } + }); + registerLabel.addStyleName("kune-Margin-Medium-l"); + registerLabel.addStyleName("kune-link"); + hp.add(dontHaveAccountLabel); + hp.add(registerLabel); + noAccRegisterPanel.add(hp); + return noAccRegisterPanel; } private void createPanel() { - dialog = new BasicDialog(i18n.t("Sign in"), true, false, 370, 400); - dialog.setLayout(new FitLayout()); - final Panel dialogPanel = new Panel(); - dialogPanel.setLayout(new BorderLayout()); - // dialog.setAutoHeight(false); - // dialog.setAutoWidth(false); - // dialog.setAutoHeight(true); - // dialog.setAutoWidth(true); - dialogPanel.setHeight("100%"); - dialogPanel.setWidth("auto"); - // dialog.setCollapsible(false); + dialog = new BasicDialog(i18n.t("Sign in"), true, false, 370, 400); + dialog.setLayout(new FitLayout()); + final Panel dialogPanel = new Panel(); + dialogPanel.setLayout(new FitLayout()); + dialogPanel.setBorder(false); + // dialog.setAutoHeight(false); + // dialog.setAutoWidth(false); + // dialog.setAutoHeight(true); + // dialog.setAutoWidth(true); + dialogPanel.setHeight("100%"); + dialogPanel.setWidth("auto"); + // dialog.setCollapsible(false); - centerPanel = new TabPanel(); - centerPanel.setActiveTab(0); - // centerPanel.setAutoWidth(true); - // centerPanel.setAutoHeight(true); - centerPanel.setClosable(false); + centerPanel = new TabPanel(); + centerPanel.setBorder(false); + centerPanel.setActiveTab(0); + // centerPanel.setAutoWidth(true); + // centerPanel.setAutoHeight(true); + centerPanel.setClosable(false); - final Panel signInPanel = new Panel(i18n.t("Sign in")); - confPanel(signInPanel); - signInForm = new SignInForm(i18n); - signInPanel.add(signInForm.getForm()); - signInPanel.setCls(USER_SIGN_IN_PANEL); - signInPanel.add(createNoAccountRegister()); - messagesSignInPanel = new MessagePanel(); - signInPanel.add(messagesSignInPanel); + final Panel signInPanel = new Panel(i18n.t("Sign in")); + signInPanel.setBorder(false); + signInPanel.setMargins(20); + confPanel(signInPanel); + signInForm = new SignInForm(i18n); + signInPanel.add(signInForm.getForm()); + signInPanel.setCls(USER_SIGN_IN_PANEL); + signInPanel.add(createNoAccountRegister()); + messagesSignInPanel = new MessagePanel(); + signInPanel.add(messagesSignInPanel); - final Panel registerPanel = new Panel(i18n.t("Register")); - registerPanel.setCls(USER_REGISTER_PANEL); - confPanel(registerPanel); + final Panel registerPanel = new Panel(i18n.t("Register")); + signInPanel.setBorder(false); + registerPanel.setCls(USER_REGISTER_PANEL); + confPanel(registerPanel); - centerPanel.add(signInPanel); - centerPanel.add(registerPanel); - dialogPanel.add(centerPanel, new BorderLayoutData(RegionPosition.CENTER)); - dialog.add(dialogPanel); + centerPanel.add(signInPanel); + centerPanel.add(registerPanel); + dialogPanel.add(centerPanel); + errorLabel = new Label(""); + Toolbar messageToolbar = new Toolbar(); + messageToolbar.addElement(errorLabel.getElement()); + dialog.setBottomToolbar(messageToolbar); + dialog.add(dialogPanel); - final Button signInBtn = new Button(i18n.t("Sign in")); - signInBtn.addListener(new ButtonListenerAdapter() { - public void onClick(final Button button, final EventObject e) { - signInForm.validate(); - if (signInForm.isValid()) { - presenter.onFormSignIn(); - } - } - }); - signInBtn.setId(SIGN_IN_BUTTON_ID); - dialog.addButton(signInBtn); + final Button signInBtn = new Button(i18n.t("Sign in")); + signInBtn.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + signInForm.validate(); + if (signInForm.isValid()) { + presenter.onFormSignIn(); + } + } + }); + signInBtn.setId(SIGN_IN_BUTTON_ID); + dialog.addButton(signInBtn); - final Button registerBtn = new Button(i18n.t("Register")); - registerBtn.addListener(new ButtonListenerAdapter() { - public void onClick(final Button button, final EventObject e) { - registerForm.validate(); - if (registerForm.isValid()) { - presenter.onFormRegister(); - } - } - }); - dialog.addButton(registerBtn); - registerBtn.setId(REGISTER_BUTTON_ID); - registerBtn.hide(); + final Button registerBtn = new Button(i18n.t("Register")); + registerBtn.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + registerForm.validate(); + if (registerForm.isValid()) { + presenter.onFormRegister(); + } + } + }); + dialog.addButton(registerBtn); + registerBtn.setId(REGISTER_BUTTON_ID); + registerBtn.hide(); - final Button cancel = new Button(); - cancel.setId(CANCEL_BUTTON_ID); - dialog.addButton(cancel); - cancel.setText(i18n.tWithNT("Cancel", "used in button")); - cancel.addListener(new ButtonListenerAdapter() { - public void onClick(final Button button, final EventObject e) { - presenter.onCancel(); - } - }); + final Button cancel = new Button(); + cancel.setId(CANCEL_BUTTON_ID); + dialog.addButton(cancel); + cancel.setText(i18n.tWithNT("Cancel", "used in button")); + cancel.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + presenter.onCancel(); + } + }); - signInPanel.addListener(new PanelListenerAdapter() { - public void onActivate(final Panel panel) { - dialog.setTitle(i18n.t("Sign in")); - registerBtn.hide(); - signInBtn.show(); - } - }); + signInPanel.addListener(new PanelListenerAdapter() { + @Override + public void onActivate(final Panel panel) { + dialog.setTitle(i18n.t("Sign in")); + registerBtn.hide(); + signInBtn.show(); + } + }); - registerPanel.addListener(new PanelListenerAdapter() { - public void onActivate(final Panel panel) { - if (registerForm == null) { - maskProcessing(); - registerForm = new RegisterForm(presenter, i18n); - registerPanel.add(registerForm.getForm()); - messagesRegisterPanel = new MessagePanel(); - registerPanel.add(messagesRegisterPanel); - messagesRegisterPanel.hide(); - renderDialogIfNeeded(); - unMask(); - } - dialog.setTitle(i18n.t("Register")); - signInBtn.hide(); - registerBtn.show(); - } - }); + registerPanel.addListener(new PanelListenerAdapter() { + @Override + public void onActivate(final Panel panel) { + if (registerForm == null) { + maskProcessing(); + registerForm = new RegisterForm(presenter, i18n); + registerPanel.add(registerForm.getForm()); + messagesRegisterPanel = new MessagePanel(); + registerPanel.add(messagesRegisterPanel); + messagesRegisterPanel.hide(); + renderDialogIfNeeded(); + unMask(); + } + dialog.setTitle(i18n.t("Register")); + signInBtn.hide(); + registerBtn.show(); + } + }); - dialog.addListener(new WindowListenerAdapter() { - public void onHide(final Component component) { - presenter.onClose(); - } - }); - hideMessages(); - renderDialogIfNeeded(); + dialog.addListener(new WindowListenerAdapter() { + @Override + public void onHide(final Component component) { + presenter.onClose(); + } + }); + hideMessages(); + renderDialogIfNeeded(); } private void renderDialogIfNeeded() { - if (dialog.isRendered()) { - dialog.doLayout(); - } + if (dialog.isRendered()) { + dialog.doLayout(); + } } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java 2008-10-16 14:34:33 UTC (rev 913) @@ -50,159 +50,161 @@ private StateToken previousStateToken; public SignInPresenter(final Session session, final StateManager stateManager, final I18nUITranslationService i18n, - final UserServiceAsync userService) { - this.session = session; - this.stateManager = stateManager; - this.userService = userService; - this.i18n = i18n; + final UserServiceAsync userService) { + this.session = session; + this.stateManager = stateManager; + this.userService = userService; + this.i18n = i18n; } public void doSignIn(final StateToken previousStateToken) { - this.previousStateToken = previousStateToken; - if (!session.isLogged()) { - Site.showProgressProcessing(); - view.show(); - view.center(); - Site.hideProgress(); - } else { - stateManager.gotoToken(previousStateToken); - } + this.previousStateToken = previousStateToken; + if (!session.isLogged()) { + Site.showProgressProcessing(); + view.show(); + view.center(); + Site.hideProgress(); + } else { + stateManager.gotoToken(previousStateToken); + } } public Object[][] getCountries() { - return session.getCountriesArray(); + return session.getCountriesArray(); } public I18nLanguageDTO getCurrentLanguage() { - return session.getCurrentLanguage(); + return session.getCurrentLanguage(); } public Object[][] getLanguages() { - return session.getLanguagesArray(); + return session.getLanguagesArray(); } public Object[][] getTimezones() { - return session.getTimezones(); + return session.getTimezones(); } public void init(final SignInView loginview) { - this.view = loginview; + this.view = loginview; } public void onCancel() { - resetMessages(); - reset(); - view.hide(); - stateManager.gotoToken(previousStateToken); + resetMessages(); + reset(); + view.hide(); + stateManager.gotoToken(previousStateToken); } public void onClose() { - reset(); - view.hideMessages(); - if (!session.isLogged()) { - stateManager.gotoToken(previousStateToken); - } + reset(); + view.hideMessages(); + if (!session.isLogged()) { + stateManager.gotoToken(previousStateToken); + } } public void onFormRegister() { - if (view.isRegisterFormValid()) { - view.maskProcessing(); + if (view.isRegisterFormValid()) { + view.maskProcessing(); - final I18nLanguageDTO language = new I18nLanguageDTO(); - language.setCode(view.getLanguage()); + final I18nLanguageDTO language = new I18nLanguageDTO(); + language.setCode(view.getLanguage()); - final I18nCountryDTO country = new I18nCountryDTO(); - country.setCode(view.getCountry()); + final I18nCountryDTO country = new I18nCountryDTO(); + country.setCode(view.getCountry()); - final TimeZoneDTO timezone = new TimeZoneDTO(); - timezone.setId(view.getTimezone()); + final TimeZoneDTO timezone = new TimeZoneDTO(); + timezone.setId(view.getTimezone()); - final UserDTO user = new UserDTO(view.getLongName(), view.getShortName(), view.getRegisterPassword(), view - .getEmail(), language, country, timezone, null, true, SubscriptionMode.manual, "blue"); - final AsyncCallback<UserInfoDTO> callback = new AsyncCallback<UserInfoDTO>() { - public void onFailure(final Throwable caught) { - view.unMask(); - try { - throw caught; - } catch (final EmailAddressInUseException e) { - view.setRegisterMessage(i18n.t("This email in in use by other person, try with another."), - SiteErrorType.error); - } catch (final GroupNameInUseException e) { - view.setRegisterMessage(i18n.t("This name in already in use, try with a different name."), - SiteErrorType.error); - } catch (final Throwable e) { - view.setRegisterMessage(i18n.t("Error during registration."), SiteErrorType.error); - GWT.log("Other kind of exception in user registration" + e.getMessage() + ", " - + e.getLocalizedMessage(), null); - e.printStackTrace(); - throw new RuntimeException(); - } - } + boolean wantPersonalHomepage = view.wantPersonalHomepage(); - public void onSuccess(final UserInfoDTO userInfoDTO) { - stateManager.gotoToken(userInfoDTO.getHomePage()); - onSignIn(userInfoDTO); - view.hide(); - view.unMask(); - view.showWelcolmeDialog(); - } - }; - userService.createUser(user, callback); - } + final UserDTO user = new UserDTO(view.getLongName(), view.getShortName(), view.getRegisterPassword(), view + .getEmail(), language, country, timezone, null, true, SubscriptionMode.manual, "blue"); + final AsyncCallback<UserInfoDTO> callback = new AsyncCallback<UserInfoDTO>() { + public void onFailure(final Throwable caught) { + view.unMask(); + try { + throw caught; + } catch (final EmailAddressInUseException e) { + view.setRegisterMessage(i18n.t("This email in in use by other person, try with another."), + SiteErrorType.error); + } catch (final GroupNameInUseException e) { + view.setRegisterMessage(i18n.t("This name in already in use, try with a different name."), + SiteErrorType.error); + } catch (final Throwable e) { + view.setRegisterMessage(i18n.t("Error during registration."), SiteErrorType.error); + GWT.log("Other kind of exception in user registration" + e.getMessage() + ", " + + e.getLocalizedMessage(), null); + e.printStackTrace(); + throw new RuntimeException(); + } + } + + public void onSuccess(final UserInfoDTO userInfoDTO) { + stateManager.gotoToken(userInfoDTO.getHomePage()); + onSignIn(userInfoDTO); + view.hide(); + view.unMask(); + view.showWelcolmeDialog(); + } + }; + userService.createUser(user, wantPersonalHomepage, callback); + } } protected void onFormSignIn() { - if (view.isSignInFormValid()) { - view.maskProcessing(); + if (view.isSignInFormValid()) { + view.maskProcessing(); - final String nickOrEmail = view.getNickOrEmail(); - final String passwd = view.getLoginPassword(); + final String nickOrEmail = view.getNickOrEmail(); + final String passwd = view.getLoginPassword(); - final UserDTO user = new UserDTO(); - user.setShortName(nickOrEmail); - user.setPassword(passwd); + final UserDTO user = new UserDTO(); + user.setShortName(nickOrEmail); + user.setPassword(passwd); - final AsyncCallback<UserInfoDTO> callback = new AsyncCallback<UserInfoDTO>() { - public void onFailure(final Throwable caught) { - view.unMask(); - Site.hideProgress(); - try { - throw caught; - } catch (final UserAuthException e) { - view.setSignInMessage(i18n.t("Incorrect nickname/email or password"), SiteErrorType.error); - } catch (final Throwable e) { - view.setSignInMessage("Error in login", SiteErrorType.error); - Log.error("Other kind of exception in LoginFormPresenter/doLogin"); - } - } + final AsyncCallback<UserInfoDTO> callback = new AsyncCallback<UserInfoDTO>() { + public void onFailure(final Throwable caught) { + view.unMask(); + Site.hideProgress(); + try { + throw caught; + } catch (final UserAuthException e) { + view.setSignInMessage(i18n.t("Incorrect nickname/email or password"), SiteErrorType.error); + } catch (final Throwable e) { + view.setSignInMessage("Error in login", SiteErrorType.error); + Log.error("Other kind of exception in LoginFormPresenter/doLogin"); + } + } - public void onSuccess(final UserInfoDTO userInfoDTO) { - onSignIn(userInfoDTO); - stateManager.gotoToken(previousStateToken); - view.hide(); - view.unMask(); - } - }; - userService.login(user.getShortName(), user.getPassword(), callback); - } + public void onSuccess(final UserInfoDTO userInfoDTO) { + onSignIn(userInfoDTO); + stateManager.gotoToken(previousStateToken); + view.hide(); + view.unMask(); + } + }; + userService.login(user.getShortName(), user.getPassword(), callback); + } } private void onSignIn(final UserInfoDTO userInfoDTO) { - final String userHash = userInfoDTO.getUserHash(); - view.setCookie(userHash); - session.setUserHash(userHash); - session.setCurrentUserInfo(userInfoDTO); - final I18nLanguageDTO language = userInfoDTO.getLanguage(); - i18n.changeCurrentLanguage(language.getCode()); - session.setCurrentLanguage(language); + final String userHash = userInfoDTO.getUserHash(); + view.setCookie(userHash); + session.setUserHash(userHash); + session.setCurrentUserInfo(userInfoDTO); + final I18nLanguageDTO language = userInfoDTO.getLanguage(); + i18n.changeCurrentLanguage(language.getCode()); + session.setCurrentLanguage(language); } private void reset() { - view.reset(); + view.reset(); } private void resetMessages() { - view.hideMessages(); + view.hideMessages(); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java 2008-10-16 14:34:33 UTC (rev 913) @@ -64,6 +64,8 @@ public void unMask(); + public boolean wantPersonalHomepage(); + void setCookie(String userHash); void setRegisterMessage(String message, SiteErrorType type); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/rpc/UserService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/site/rpc/UserService.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/rpc/UserService.java 2008-10-16 14:34:33 UTC (rev 913) @@ -28,7 +28,7 @@ public interface UserService extends RemoteService { - UserInfoDTO createUser(UserDTO user) throws DefaultException; + UserInfoDTO createUser(UserDTO user, boolean wantPersonalHomepage) throws DefaultException; UserInfoDTO login(String nickOrEmail, String passwd) throws DefaultException; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/rpc/UserServiceAsync.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/site/rpc/UserServiceAsync.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/rpc/UserServiceAsync.java 2008-10-16 14:34:33 UTC (rev 913) @@ -26,14 +26,14 @@ public interface UserServiceAsync { + void createUser(UserDTO user, boolean wantPersonalHomepage, AsyncCallback<UserInfoDTO> asyncCallback); + void login(String nickOrEmail, String passwd, AsyncCallback<UserInfoDTO> callback); void logout(String userHash, AsyncCallback<?> callback); - void createUser(UserDTO user, AsyncCallback<UserInfoDTO> asyncCallback); + void onlyCheckSession(String userHash, AsyncCallback<?> asyncCallback); void reloadUserInfo(String userHash, AsyncCallback<UserInfoDTO> asyncCallback); - void onlyCheckSession(String userHash, AsyncCallback<?> asyncCallback); - } Modified: trunk/src/main/resources/dozerBeanMapping.xml =================================================================== --- trunk/src/main/resources/dozerBeanMapping.xml 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/main/resources/dozerBeanMapping.xml 2008-10-16 14:34:33 UTC (rev 913) @@ -2,439 +2,448 @@ <!DOCTYPE mappings PUBLIC "-//DOZER//DTD MAPPINGS//EN" "http://dozer.sourceforge.net/dtd/dozerbeanmapping.dtd"> <mappings> - <configuration> - <stop-on-errors>true</stop-on-errors> - <date-format>dd/mm/yyyy</date-format> - <wildcard>true</wildcard> - </configuration> + <configuration> + <stop-on-errors>true</stop-on-errors> + <date-format>dd/mm/yyyy</date-format> + <wildcard>true</wildcard> + </configuration> - <mapping> - <class-a> - org.ourproject.kune.platf.client.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> - </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> - </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> - </field> - </mapping> + <mapping> + <class-a> + org.ourproject.kune.platf.client.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> + </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> + </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> + </field> + </mapping> - <mapping> - <class-a>org.ourproject.kune.platf.client.dto.GroupDTO</class-a> - <class-b>org.ourproject.kune.platf.server.domain.Group</class-b> - </mapping> + <mapping> + <class-a>org.ourproject.kune.platf.client.dto.GroupDTO</class-a> + <class-b>org.ourproject.kune.platf.server.domain.Group</class-b> + </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.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> - </field> - <field - custom-converter="org.ourproject.kune.platf.server.mapper.GroupListModeConverter"> - <a>mode</a> - <b>mode</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> + <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> + </field> + <field + custom-converter="org.ourproject.kune.platf.server.mapper.GroupListModeConverter"> + <a>mode</a> + <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> - <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> - </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> - </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> - </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> + <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> + </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> + </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> + </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> - </mapping> + <mapping> + <class-a> + org.ourproject.kune.platf.client.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.StateDTO</class-a> - <class-b>org.ourproject.kune.platf.server.state.State</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> - </field> - <field> - <a>groupTags</a> - <b>groupTags</b> - <a-hint> - org.ourproject.kune.platf.client.dto.TagResultDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.TagResult - </b-hint> - </field> - </mapping> + <mapping> + <class-a>org.ourproject.kune.platf.client.dto.StateDTO</class-a> + <class-b>org.ourproject.kune.platf.server.state.State</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> + </field> + <field> + <a>groupTags</a> + <b>groupTags</b> + <a-hint> + org.ourproject.kune.platf.client.dto.TagResultDTO + </a-hint> + <b-hint> + org.ourproject.kune.platf.server.domain.TagResult + </b-hint> + </field> + </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.StateToken - </class-a> - <class-b> - org.ourproject.kune.platf.client.dto.StateToken - </class-b> - <field> - <a>encoded</a> - <b>encoded</b> - </field> - </mapping> + <mapping> + <class-a> + org.ourproject.kune.platf.client.dto.StateToken + </class-a> + <class-b> + org.ourproject.kune.platf.client.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> - </mapping> + <mapping> + <class-a> + org.ourproject.kune.platf.client.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> - </mapping> + <mapping> + <class-a> + org.ourproject.kune.platf.client.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> - <field> - <a get-method="getStateToken">stateToken</a> - <b>stateToken</b> - </field> - </mapping> + <mapping> + <class-a> + org.ourproject.kune.platf.client.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> - <field> - <a>title</a> - <b>lastRevision.title</b> - </field> - <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> + <field> + <a>title</a> + <b>lastRevision.title</b> + </field> + <field> + <a get-method="getStateToken">stateToken</a> + <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> - <field> - <a>lastRevision.title</a> - <b>longName</b> - </field> - <field> - <a>container.owner.shortName</a> - <b>shortName</b> - </field> - <field> - <a get-method="getStateTokenEncoded">link</a> - <b>link</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> + <field> + <a>lastRevision.title</a> + <b>longName</b> + </field> + <field> + <a>container.owner.shortName</a> + <b>shortName</b> + </field> + <field> + <a get-method="getStateTokenEncoded">link</a> + <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> - <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> - </field> + <mapping> + <class-a> + org.ourproject.kune.platf.client.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> + </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> - </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> + </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> - </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> + </field> - <field> - <a get-method="getStateToken">stateToken</a> - <b>stateToken</b> - </field> - </mapping> + <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> - <field> - <a>language</a> - <b>language</b> - <a-hint> - org.ourproject.kune.platf.client.dto.I18nLanguageDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.I18nLanguage - </b-hint> - </field> - <field> - <a>country</a> - <b>country</b> - <a-hint> - org.ourproject.kune.platf.client.dto.I18nCountryDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.I18nCountry - </b-hint> - </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> + <field> + <a>language</a> + <b>language</b> + <a-hint> + org.ourproject.kune.platf.client.dto.I18nLanguageDTO + </a-hint> + <b-hint> + org.ourproject.kune.platf.server.domain.I18nLanguage + </b-hint> + </field> + <field> + <a>country</a> + <b>country</b> + <a-hint> + org.ourproject.kune.platf.client.dto.I18nCountryDTO + </a-hint> + <b-hint> + org.ourproject.kune.platf.server.domain.I18nCountry + </b-hint> + </field> + </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.ParticipationDataDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.ParticipationData - </class-b> - </mapping> + <mapping> + <class-a> + org.ourproject.kune.platf.client.dto.ParticipationDataDTO + </class-a> + <class-b> + org.ourproject.kune.platf.server.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> - </mapping> + <mapping> + <class-a> + org.ourproject.kune.platf.client.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> - </mapping> + <mapping> + <class-a> + org.ourproject.kune.platf.client.dto.I18nCountryDTO + </class-a> + <class-b> + org.ourproject.kune.platf.server.domain.I18nCountry + </class-b> + </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.UserSimpleDTO - </class-a> - <class-b>org.ourproject.kune.platf.server.domain.User</class-b> - </mapping> + <mapping> + <class-a> + org.ourproject.kune.platf.client.dto.UserSimpleDTO + </class-a> + <class-b>org.ourproject.kune.platf.server.domain.User</class-b> + </mapping> - <mapping> - <class-a>org.ourproject.kune.platf.client.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.TagDTO</class-a> + <class-b>org.ourproject.kune.platf.server.domain.Tag</class-b> + </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.TagResultDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.TagResult - </class-b> - </mapping> + <mapping> + <class-a> + org.ourproject.kune.platf.client.dto.TagResultDTO + </class-a> + <class-b> + org.ourproject.kune.platf.server.domain.TagResult + </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> - <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> - </field> + <mapping> + <class-a> + org.ourproject.kune.platf.server.domain.Comment + </class-a> + <class-b> + org.ourproject.kune.platf.client.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> + </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> - </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> + </field> - <field type="one-way"> - <a get-method="getPositiveVotersCount"> - positiveVotersCount - </a> - <b>positiveVotersCount</b> - </field> + <field type="one-way"> + <a get-method="getPositiveVotersCount"> + positiveVotersCount + </a> + <b>positiveVotersCount</b> + </field> - <field type="one-way"> - <a get-method="getNegativeVotersCount"> - negativeVotersCount - </a> - <b>negativeVotersCount</b> - </field> + <field type="one-way"> + <a get-method="getNegativeVotersCount"> + negativeVotersCount + </a> + <b>negativeVotersCount</b> + </field> - <field type="one-way"> - <a get-method="getAbuseInformersCount"> - abuseInformersCount - </a> - <b>abuseInformersCount</b> - </field> - </mapping> + <field type="one-way"> + <a get-method="getAbuseInformersCount"> + abuseInformersCount + </a> + <b>abuseInformersCount</b> + </field> + </mapping> - <mapping> - <class-a>org.ourproject.kune.platf.client.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.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> - </mapping> + <mapping> + <class-a> + org.ourproject.kune.platf.client.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.ContentStatusDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.ContentStatus - </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> + </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.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.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> + </mapping> + </mappings> \ No newline at end of file Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java 2008-10-16 14:34:33 UTC (rev 913) @@ -4,6 +4,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import java.util.List; + import org.junit.Before; import org.junit.Test; import org.ourproject.kune.chat.server.ChatServerTool; @@ -36,39 +38,44 @@ @Before public void init() { - new IntegrationTestHelper(this); - defaultGroup = groupManager.getDefaultGroup(); + new IntegrationTestHelper(this); + defaultGroup = groupManager.getDefaultGroup(); } @Test public void testDefaultContentAndLicenses() { - assertNotNull(defaultGroup.getDefaultContent()); - assertTrue(licenseManager.getAll().size() > 0); - assertNotNull(defaultGroup.getDefaultLicense()); + assertNotNull(defaultGroup.getDefaultContent()); + assertTrue(licenseManager.getAll().size() > 0); + assertNotNull(defaultGroup.getDefaultLicense()); } @Test public void testDefaultDocumentContent() { - final Content content = defaultGroup.getDefaultContent(); - assertEquals(DocumentServerTool.TYPE_DOCUMENT, content.getTypeId()); - final Container rootDocFolder = content.getContainer(); - assertEquals(true, rootDocFolder.isRoot()); + final Content content = defaultGroup.getDefaultContent(); + assertEquals(DocumentServerTool.TYPE_DOCUMENT, content.getTypeId()); + final Container rootDocFolder = content.getContainer(); + assertEquals(true, rootDocFolder.isRoot()); } @Test public void testI18n() { - assertNotNull(countryManager.find(new Long(75))); - assertNotNull(languageManager.findByCode("en")); - assertNotNull(languageManager.find(new Long(1819))); + assertNotNull(countryManager.find(new Long(75))); + assertNotNull(languageManager.findByCode("en")); + assertNotNull(languageManager.find(new Long(1819))); } @Test public void testToolConfiguration() { - assertNotNull(defaultGroup); - final ToolConfiguration docToolConfig = defaultGroup.getToolConfiguration(DocumentServerTool.NAME); - assertNotNull(docToolConfig); - final ToolConfiguration chatToolConfig = defaultGroup.getToolConfiguration(ChatServerTool.NAME); - assertNotNull(chatToolConfig); + assertNotNull(defaultGroup); + final ToolConfiguration docToolConfig = defaultGroup.getToolConfiguration(DocumentServerTool.NAME); + assertNotNull(docToolConfig); + assertTrue(docToolConfig.isEnabled()); + final ToolConfiguration chatToolConfig = defaultGroup.getToolConfiguration(ChatServerTool.NAME); + assertNotNull(chatToolConfig); + assertTrue(chatToolConfig.isEnabled()); + List<String> enabledTools = groupManager.findEnabledTools(defaultGroup.getId()); + assertNotNull(enabledTools); + assertTrue(enabledTools.size() > 0); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java 2008-10-16 14:34:33 UTC (rev 913) @@ -18,26 +18,26 @@ public class IntegrationTestHelper { public static Injector createInjector() { - final Injector injector = Guice.createInjector(new PlatformServerModule(), new DocumentServerModule(), - new ChatServerModule(), new AbstractModule() { - @Override - protected void configure() { - bindScope(SessionScoped.class, Scopes.SINGLETON); - // test: use memory - // test_db: use mysql - bindConstant().annotatedWith(JpaUnit.class).to("test"); - bindConstant().annotatedWith(PropertiesFileName.class).to("kune.properties"); - bind(HttpServletRequest.class).to(HttpServletRequestMocked.class); - } - }); - return injector; + final Injector injector = Guice.createInjector(new PlatformServerModule(), new DocumentServerModule(), + new ChatServerModule(), new AbstractModule() { + @Override + protected void configure() { + bindScope(SessionScoped.class, Scopes.SINGLETON); + // test: use memory + // test_db: use mysql + bindConstant().annotatedWith(JpaUnit.class).to("test"); + bindConstant().annotatedWith(PropertiesFileName.class).to("kune.properties"); + bind(HttpServletRequest.class).to(HttpServletRequestMocked.class); + } + }); + return injector; } public IntegrationTestHelper(final Object... tests) { - final Injector injector = createInjector(); - injector.getInstance(KunePersistenceService.class).start(); - for (final Object test : tests) { - injector.injectMembers(test); - } + final Injector injector = createInjector(); + injector.getInstance(KunePersistenceService.class).start(); + for (final Object test : tests) { + injector.injectMembers(test); + } } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java 2008-10-16 14:34:33 UTC (rev 913) @@ -30,104 +30,97 @@ @Test public void createCommunity() throws Exception { - doLogin(); + doLogin(); - final GroupDTO group = new GroupDTO("ysei", "Yellow Submarine Environmental Initiative", "Public Desc", - GroupType.COMMUNITY); + final GroupDTO group = new GroupDTO("ysei", "Yellow Submarine Environmental Initiative", GroupType.COMMUNITY); - final LicenseDTO license = new LicenseDTO(); - license.setShortName("by-sa"); - group.setDefaultLicense(license); - service.createNewGroup(session.getHash(), group); + final LicenseDTO license = new LicenseDTO(); + license.setShortName("by-sa"); + group.setDefaultLicense(license); + service.createNewGroup(session.getHash(), group, "Public desc", "tag1 tag2", null); - final Group groupCreated = groupFinder.findByShortName("ysei"); - assertEquals(groupCreated.getShortName(), group.getShortName()); - assertEquals(groupCreated.getLongName(), group.getLongName()); - assertEquals(groupCreated.getPublicDesc(), group.getPublicDesc()); - assertEquals(groupCreated.getAdmissionType(), AdmissionType.Open); - assertEquals(groupCreated.getType(), GroupType.COMMUNITY); + final Group groupCreated = groupFinder.findByShortName("ysei"); + assertEquals(groupCreated.getShortName(), group.getShortName()); + assertEquals(groupCreated.getLongName(), group.getLongName()); + + assertEquals(groupCreated.getAdmissionType(), AdmissionType.Open); + assertEquals(groupCreated.getType(), GroupType.COMMUNITY); } @Test(expected = Exception.class) public void createGroupNotLogged() throws Exception { - final GroupDTO group = new GroupDTO("ysei", "Yellow Submarine Environmental Initiative", "Public Desc", - GroupType.PROJECT); - service.createNewGroup(session.getHash(), group); + final GroupDTO group = new GroupDTO("ysei", "Yellow Submarine Environmental Initiative", GroupType.PROJECT); + service.createNewGroup(session.getHash(), group, "Public desc", "tag1 tag2", null); } @Test(expected = UserMustBeLoggedException.class) public void createGroupNullUserHash() throws Exception { - doLogin(); - final GroupDTO group = new GroupDTO("ysei", "Yellow Submarine Environmental Initiative", "Public Desc", - GroupType.PROJECT); - service.createNewGroup(null, group); + doLogin(); + final GroupDTO group = new GroupDTO("ysei", "Yellow Submarine Environmental Initiative", GroupType.PROJECT); + service.createNewGroup(null, group, "Public desc", "tag1 tag2", null); } @Test public void createGroupUserLogged() throws Exception { - doLogin(); + doLogin(); - final GroupDTO group = new GroupDTO("ysei", "Yellow Submarine Environmental Initiative", "Public Desc", - GroupType.PROJECT); + final GroupDTO group = new GroupDTO("ysei", "Yellow Submarine Environmental Initiative", GroupType.PROJECT); - final LicenseDTO license = new LicenseDTO(); - license.setShortName("by-sa"); - group.setDefaultLicense(license); - service.createNewGroup(session.getHash(), group); + final LicenseDTO license = new LicenseDTO(); + license.setShortName("by-sa"); + group.setDefaultLicense(license); + service.createNewGroup(session.getHash(), group, "Public desc", "tag1 tag2", null); - final Group groupCreated = groupFinder.findByShortName("ysei"); - assertEquals(groupCreated.getShortName(), group.getShortName()); - assertEquals(groupCreated.getLongName(), group.getLongName()); - assertEquals(groupCreated.getPublicDesc(), group.getPublicDesc()); - assertEquals(groupCreated.getAdmissionType(), AdmissionType.Moderated); - assertEquals(groupCreated.getType(), GroupType.PROJECT); + final Group groupCreated = groupFinder.findByShortName("ysei"); + assertEquals(groupCreated.getShortName(), group.getShortName()); + assertEquals(groupCreated.getLongName(), group.getLongName()); + + assertEquals(groupCreated.getAdmissionType(), AdmissionType.Moderated); + assertEquals(groupCreated.getType(), GroupType.PROJECT); } @Test public void createOrganization() throws Exception { - doLogin(); + doLogin(); - final GroupDTO group = new GroupDTO("ysei", "Yellow Submarine Environmental Initiative", "Public Desc", - GroupType.ORGANIZATION); + final GroupDTO group = new GroupDTO("ysei", "Yellow Submarine Environmental Initiative", GroupType.ORGANIZATION); - final LicenseDTO license = new LicenseDTO(); - license.setShortName("by-sa"); - group.setDefaultLicense(license); - service.createNewGroup(session.getHash(), group); + final LicenseDTO license = new LicenseDTO(); + license.setShortName("by-sa"); + group.setDefaultLicense(license); + service.createNewGroup(session.getHash(), group, "Public desc", "tag1 tag2", null); - final Group groupCreated = groupFinder.findByShortName("ysei"); - assertEquals(groupCreated.getShortName(), group.getShortName()); - assertEquals(groupCreated.getLongName(), group.getLongName()); - assertEquals(groupCreated.getPublicDesc(), group.getPublicDesc()); - assertEquals(groupCreated.getAdmissionType(), AdmissionType.Moderated); - assertEquals(groupCreated.getType(), GroupType.ORGANIZATION); + final Group groupCreated = groupFinder.findByShortName("ysei"); + assertEquals(groupCreated.getShortName(), group.getShortName()); + assertEquals(groupCreated.getLongName(), group.getLongName()); + assertEquals(groupCreated.getAdmissionType(), AdmissionType.Moderated); + assertEquals(groupCreated.getType(), GroupType.ORGANIZATION); } @Test public void createOrphanedProject() throws Exception { - doLogin(); + doLogin(); - final GroupDTO group = new GroupDTO("ysei", "Yellow Submarine Environmental Initiative", "Public Desc", - GroupType.ORPHANED_PROJECT); + final GroupDTO group = new GroupDTO("ysei", "Yellow Submarine Environmental Initiative", + GroupType.ORPHANED_PROJECT); - final LicenseDTO license = new LicenseDTO(); - license.setShortName("by-sa"); - group.setDefaultLicense(license); - service.createNewGroup(session.getHash(), group); + final LicenseDTO license = new LicenseDTO(); + license.setShortName("by-sa"); + group.setDefaultLicense(license); + service.createNewGroup(session.getHash(), group, "Public desc", "tag1 tag2", null); - final Group groupCreated = groupFinder.findByShortName("ysei"); - assertEquals(groupCreated.getShortName(), group.getShortName()); - assertEquals(groupCreated.getLongName(), group.getLongName()); - assertEquals(groupCreated.getPublicDesc(), group.getPublicDesc()); - assertEquals(groupCreated.getAdmissionType(), AdmissionType.Open); - assertEquals(groupCreated.getType(), GroupType.ORPHANED_PROJECT); - assertEquals(0, groupCreated.getSocialNetwork().getAccessLists().getAdmins().getList().size()); - assertEquals(0, groupCreated.getSocialNetwork().getAccessLists().getEditors().getList().size()); + final Group groupCreated = groupFinder.findByShortName("ysei"); + assertEquals(groupCreated.getShortName(), group.getShortName()); + assertEquals(groupCreated.getLongName(), group.getLongName()); + assertEquals(groupCreated.getAdmissionType(), AdmissionType.Open); + assertEquals(groupCreated.getType(), GroupType.ORPHANED_PROJECT); + assertEquals(0, groupCreated.getSocialNetwork().getAccessLists().getAdmins().getList().size()); + assertEquals(0, groupCreated.getSocialNetwork().getAccessLists().getEditors().getList().size()); } @Before public void init() { - new IntegrationTestHelper(this); + new IntegrationTestHelper(this); } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java 2008-10-16 14:34:33 UTC (rev 913) @@ -50,77 +50,77 @@ @Test(expected = EmailAddressInUseException.class) public void createUserExistingEmailFails() throws Exception { - assertNull(session.getUser().getId()); - final UserDTO user = new UserDTO("test", "test", "123456", properties.getAdminEmail(), lang, country, timezone, - null, true, SubscriptionMode.manual, "blue"); - userService.createUser(user); + assertNull(session.getUser().getId()); + final UserDTO user = new UserDTO("test", "test", "123456", properties.getAdminEmail(), lang, country, timezone, + null, true, SubscriptionMode.manual, "blue"); + userService.createUser(user, false); } @Test(expected = GroupNameInUseException.class) public void createUserExistingNameFails() throws Exception { - assertNull(session.getUser().getId()); - final UserDTO user = new UserDTO("test", properties.getAdminShortName(), "123456", "example(a)example.com", lang, - country, timezone, null, true, SubscriptionMode.manual, "blue"); - userService.createUser(user); + assertNull(session.getUser().getId()); + final UserDTO user = new UserDTO("test", properties.getAdminShortName(), "123456", "example(a)example.com", lang, + country, timezone, null, true, SubscriptionMode.manual, "blue"); + userService.createUser(user, false); } @Before public void init() { - new IntegrationTestHelper(this); - lang = new I18nLanguageDTO(); - country = new I18nCountryDTO(); - timezone = new TimeZoneDTO(); - lang.setCode("en"); - country.setCode("GB"); - timezone.setId("GMT"); + new IntegrationTestHelper(this); + lang = new I18nLanguageDTO(); + country = new I18nCountryDTO(); + timezone = new TimeZoneDTO(); + lang.setCode("en"); + country.setCode("GB"); + timezone.setId("GMT"); } @Test(expected = SessionExpiredException.class) public void testReloadUserInfoNotLogged() throws Exception { - assertNull(session.getUser().getId()); - userService.reloadUserInfo("AndOldUserHash"); + assertNull(session.getUser().getId()); + userService.reloadUserInfo("AndOldUserHash"); } @Test public void testSiteEmailLogin() throws Exception { - assertNull(session.getUser().getId()); - userService.login(properties.getAdminEmail(), properties.getAdminPassword()); - assertNotNull(session.getUser().getId()); + assertNull(session.getUser().getId()); + userService.login(properties.getAdminEmail(), properties.getAdminPassword()); + assertNotNull(session.getUser().getId()); } @Test public void testSiteNameLogin() throws Exception { - assertNull(session.getUser().getId()); - userService.login(properties.getAdminShortName(), properties.getAdminPassword()); - assertNotNull(session.getUser().getId()); + assertNull(session.getUser().getId()); + userService.login(properties.getAdminShortName(), properties.getAdminPassword()); + assertNotNull(session.getUser().getId()); } @Test public void testUserInfo() throws Exception { - doLogin(); - final UserInfo userInfo = userInfoService.buildInfo(session.getUser(), session.getHash()); + doLogin(); + final UserInfo userInfo = userInfoService.buildInfo(session.getUser(), session.getHash()); - final UserInfoDTO userInfoDTO = mapper.map(userInfo, UserInfoDTO.class); - assertEquals(userInfo.getName(), userInfoDTO.getName()); - assertEquals(userInfo.getChatName(), userInfoDTO.getChatName()); - assertEquals(userInfo.getChatPassword(), userInfoDTO.getChatPassword()); - final List<Group> adminsGroup = userInfo.getGroupsIsAdmin(); - final List<GroupDTO> adminsGroupDTO = userInfoDTO.getGroupsIsAdmin(); - assertEqualGroupLists(adminsGroupDTO, adminsGroup); + final UserInfoDTO userInfoDTO = mapper.map(userInfo, UserInfoDTO.class); + assertEquals(userInfo.getName(), userInfoDTO.getName()); + assertEquals(userInfo.getChatName(), userInfoDTO.getChatName()); + assertEquals(userInfo.getChatPassword(), userInfoDTO.getChatPassword()); + final List<Group> adminsGroup = userInfo.getGroupsIsAdmin(); + final List<GroupDTO> adminsGroupDTO = userInfoDTO.getGroupsIsAdmin(); + assertEqualGroupLists(adminsGroupDTO, adminsGroup); } private void assertEqualGroupLists(final List<GroupDTO> listDTO, final List<Group> list) { - assertEquals(listDTO.size(), list.size()); - for (int i = 0; i < listDTO.size(); i++) { - final Object object = listDTO.get(i); - assertEquals(GroupDTO.class, object.getClass()); - final GroupDTO d = (GroupDTO) object; - final Group l = list.get(i); - assertNotNull(d); - assertNotNull(l); - final GroupDTO map = mapper.map(l, GroupDTO.class); - assertEquals(map.getShortName(), d.getShortName()); - } + assertEquals(listDTO.size(), list.size()); + for (int i = 0; i < listDTO.size(); i++) { + final Object object = listDTO.get(i); + assertEquals(GroupDTO.class, object.getClass()); + final GroupDTO d = (GroupDTO) object; + final Group l = list.get(i); + assertNotNull(d); + assertNotNull(l); + final GroupDTO map = mapper.map(l, GroupDTO.class); + assertEquals(map.getShortName(), d.getShortName()); + } } } Modified: trunk/src/test/java/org/ourproject/kune/platf/server/PersistenceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/PersistenceTest.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/test/java/org/ourproject/kune/platf/server/PersistenceTest.java 2008-10-16 14:34:33 UTC (rev 913) @@ -17,52 +17,52 @@ private final String propetiesFileName; public PersistenceTest() { - // test: use memory - // test_db: use mysql - this("test", "kune.properties"); + // test: use memory + // test_db: use mysql + this("test", "kune.properties"); } public PersistenceTest(final String persistenceUnit, final String propetiesFileName) { - this.persistenceUnit = persistenceUnit; - this.propetiesFileName = propetiesFileName; + this.persistenceUnit = persistenceUnit; + this.propetiesFileName = propetiesFileName; } public void closeTransaction() { - getManager().getTransaction().commit(); + getManager().getTransaction().commit(); } public EntityTransaction getTransaction() { - return getManager().getTransaction(); + return getManager().getTransaction(); } public EntityManager openTransaction() { - final EntityManager manager = getManager(); - final EntityTransaction transaction = manager.getTransaction(); - transaction.begin(); - return manager; + final EntityManager manager = getManager(); + final EntityTransaction transaction = manager.getTransaction(); + transaction.begin(); + return manager; } public void persist(final Object... entities) { - for (final Object entity : entities) { - getManager().persist(entity); - } + for (final Object entity : entities) { + getManager().persist(entity); + } } @Before public void prepare() { - final Injector injector = TestHelper.create(new PlatformServerModule(), persistenceUnit, propetiesFileName); - final PersistenceService persistence = injector.getInstance(PersistenceService.class); - // To Debug insert breakpoint here - persistence.start(); - injector.injectMembers(this); + final Injector injector = TestHelper.create(new PlatformServerModule(), persistenceUnit, propetiesFileName); + final PersistenceService persistence = injector.getInstance(PersistenceService.class); + // To Debug insert breakpoint here + persistence.start(); + injector.injectMembers(this); } public void rollbackTransaction() { - getManager().getTransaction().rollback(); + getManager().getTransaction().rollback(); } private EntityManager getManager() { - return provider.get(); + return provider.get(); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java 2008-10-16 14:34:33 UTC (rev 913) @@ -45,47 +45,47 @@ private License defLicense; public ContentManagerTest() { - // Testing with mysql because utf-8 normally fails with mysql and not in - // memory - super("test_db", "kune.properties"); + // Testing with mysql because utf-8 normally fails with mysql and not in + // memory + super("test_db", "kune.properties"); } @After public void close() { - if (getTransaction().isActive()) { - getTransaction().rollback(); - } + if (getTransaction().isActive()) { + getTransaction().rollback(); + } } @Before public void insertData() throws Exception { - openTransaction(); - assertEquals(0, userFinder.getAll().size()); - assertEquals(0, groupFinder.getAll().size()); - assertEquals(0, licenseFinder.getAll().size()); - final I18nLanguage english = new I18nLanguage(new Long(1819), "English", "English", "en"); - languageManager.persist(english); - final I18nCountry gb = new I18nCountry(new Long(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", - "western", ","); - countryManager.persist(gb); - user = userManager.createUser("username", "the user name", "email(a)example.com", "userPassword", "en", "GB", - TimeZone.getDefault().getID()); - defLicense = new License("by-sa", "Creative Commons Attribution-ShareAlike", "", - "http://creativecommons.org/licenses/by-sa/3.0/", true, true, false, "", ""); - licenseManager.persist(defLicense); - groupManager.createUserGroup(user); + openTransaction(); + assertEquals(0, userFinder.getAll().size()); + assertEquals(0, groupFinder.getAll().size()); + assertEquals(0, licenseFinder.getAll().size()); + final I18nLanguage english = new I18nLanguage(new Long(1819), "English", "English", "en"); + languageManager.persist(english); + final I18nCountry gb = new I18nCountry(new Long(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", + "western", ","); + countryManager.persist(gb); + user = userManager.createUser("username", "the user name", "email(a)example.com", "userPassword", "en", "GB", + TimeZone.getDefault().getID()); + defLicense = new License("by-sa", "Creative Commons Attribution-ShareAlike", "", + "http://creativecommons.org/licenses/by-sa/3.0/", true, true, false, "", ""); + licenseManager.persist(defLicense); + groupManager.createUserGroup(user, true); } @Test public void testBasicMimePersist() { - final String mimetype = "application/pdf"; - createContentWithMime(mimetype); + final String mimetype = "application/pdf"; + createContentWithMime(mimetype); } @Test public void testBasicMimePersistWithoutSubtype() { - final String mimetype = "application"; - createContentWithMime(mimetype); + final String mimetype = "application"; + createContentWithMime(mimetype); } /** @@ -94,18 +94,18 @@ */ @Test public void testUTF8Persist() { - final Container container = Mockito.mock(Container.class); - final Content cnt = contentManager.createContent("汉语/漢語", "汉语/漢語", user, container); - final Content newCnt = contentManager.find(cnt.getId()); - assertEquals("汉语/漢語", newCnt.getTitle()); + final Container container = Mockito.mock(Container.class); + final Content cnt = contentManager.createContent("汉语/漢語", "汉语/漢語", user, container); + final Content newCnt = contentManager.find(cnt.getId()); + assertEquals("汉语/漢語", newCnt.getTitle()); } private void createContentWithMime(final String mimetype) { - final Container container = Mockito.mock(Container.class); - final Content cnt = contentManager.createContent("title", "body", user, container); - cnt.setMimeType(new BasicMimeType(mimetype)); - persist(cnt); - final Content newCnt = contentManager.find(cnt.getId()); - assertEquals(mimetype, newCnt.getMimeType().toString()); + final Container container = Mockito.mock(Container.class); + final Content cnt = contentManager.createContent("title", "body", user, container); + cnt.setMimeType(new BasicMimeType(mimetype)); + persist(cnt); + final Content newCnt = contentManager.find(cnt.getId()); + assertEquals(mimetype, newCnt.getMimeType().toString()); } } 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 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java 2008-10-16 14:34:33 UTC (rev 913) @@ -48,168 +48,168 @@ @After public void close() { - if (getTransaction().isActive()) { - getTransaction().rollback(); - } + if (getTransaction().isActive()) { + getTransaction().rollback(); + } } @Test public void createdGroupShoudHaveValidSocialNetwork() throws Exception { - final Group group = new Group("short", "longName", defLicense, GroupType.PROJECT); - groupManager.createGroup(group, user); - final SocialNetwork socialNetwork = group.getSocialNetwork(); - final AccessLists lists = socialNetwork.getAccessLists(); - assertTrue(lists.getAdmins().includes(user.getUserGroup())); - assertTrue(lists.getEditors().isEmpty()); - assertTrue(lists.getViewers().isEmpty()); - closeTransaction(); + final Group group = new Group("short", "longName", defLicense, GroupType.PROJECT); + groupManager.createGroup(group, user); + final SocialNetwork socialNetwork = group.getSocialNetwork(); + final AccessLists lists = socialNetwork.getAccessLists(); + assertTrue(lists.getAdmins().includes(user.getUserGroup())); + assertTrue(lists.getEditors().isEmpty()); + assertTrue(lists.getViewers().isEmpty()); + closeTransaction(); } @Test public void createGroup() throws Exception { - final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, - GroupType.PROJECT); - groupManager.createGroup(group, user); - final Group otherGroup = groupManager.findByShortName("ysei"); + final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, + GroupType.PROJECT); + groupManager.createGroup(group, user); + final Group otherGroup = groupManager.findByShortName("ysei"); - assertEquals(group.getLongName(), otherGroup.getLongName()); - assertEquals(group.getShortName(), otherGroup.getShortName()); - closeTransaction(); + assertEquals(group.getLongName(), otherGroup.getLongName()); + assertEquals(group.getShortName(), otherGroup.getShortName()); + closeTransaction(); } @Test public void createGroupAndSearch() throws Exception, ParseException { - final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, - GroupType.PROJECT); - groupManager.createGroup(group, user); - groupManager.reIndex(); - final SearchResult<Group> result = groupManager.search("ysei"); - assertEquals(1, (long) result.getSize()); - assertEquals("ysei", result.getList().get(0).getShortName()); - rollbackTransaction(); + final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, + GroupType.PROJECT); + groupManager.createGroup(group, user); + groupManager.reIndex(); + final SearchResult<Group> result = groupManager.search("ysei"); + assertEquals(1, (long) result.getSize()); + assertEquals("ysei", result.getList().get(0).getShortName()); + rollbackTransaction(); } @Test(expected = GroupNameInUseException.class) public void createGroupWithExistingLongName() throws Exception { - final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, - GroupType.PROJECT); - groupManager.createGroup(group, user); + final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, + GroupType.PROJECT); + groupManager.createGroup(group, user); - final Group group2 = new Group("ysei2", "Yellow Submarine Environmental Initiative", defLicense, - GroupType.PROJECT); - group2.setDefaultLicense(defLicense); - groupManager.createGroup(group2, user); + final Group group2 = new Group("ysei2", "Yellow Submarine Environmental Initiative", defLicense, + GroupType.PROJECT); + group2.setDefaultLicense(defLicense); + groupManager.createGroup(group2, user); - rollbackTransaction(); + rollbackTransaction(); } @Test(expected = GroupNameInUseException.class) public void createGroupWithExistingShortName() throws Exception { - final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, - GroupType.PROJECT); - groupManager.createGroup(group, user); + final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, + GroupType.PROJECT); + groupManager.createGroup(group, user); - final Group group2 = new Group("ysei", "Yellow Submarine Environmental Initiative 2", defLicense, - GroupType.PROJECT); - groupManager.createGroup(group2, user); + final Group group2 = new Group("ysei", "Yellow Submarine Environmental Initiative 2", defLicense, + GroupType.PROJECT); + groupManager.createGroup(group2, user); - rollbackTransaction(); + rollbackTransaction(); } @Test(expected = EmailAddressInUseException.class) public void createUserExistingEmail() throws I18nNotFoundException, GroupNameInUseException, - EmailAddressInUseException { - final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); - groupManager.createUserGroup(user1); - final User user2 = userManager.createUser("test2", "test 2 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); - groupManager.createUserGroup(user2); + EmailAddressInUseException { + final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", + "GB", "GMT"); + groupManager.createUserGroup(user1); + final User user2 = userManager.createUser("test2", "test 2 name", "test1(a)example.com", "some password", "en", + "GB", "GMT"); + groupManager.createUserGroup(user2); } @Test(expected = GroupNameInUseException.class) public void createUserExistingLongName() throws I18nNotFoundException, GroupNameInUseException, - EmailAddressInUseException { - final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); - groupManager.createUserGroup(user1); - final User user2 = userManager.createUser("test2", "test 1 name", "test2(a)example.com", "some password", "en", - "GB", "GMT"); - groupManager.createUserGroup(user2); + EmailAddressInUseException { + final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", + "GB", "GMT"); + groupManager.createUserGroup(user1); + final User user2 = userManager.createUser("test2", "test 1 name", "test2(a)example.com", "some password", "en", + "GB", "GMT"); + groupManager.createUserGroup(user2); } @Test(expected = GroupNameInUseException.class) public void createUserExistingShortName() throws I18nNotFoundException, GroupNameInUseException, - EmailAddressInUseException { - final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", - "GB", "GMT"); - groupManager.createUserGroup(user1); - final User user2 = userManager.createUser("test", "test 2 name", "test2(a)example.com", "some password", "en", - "GB", "GMT"); - groupManager.createUserGroup(user2); + EmailAddressInUseException { + final User user1 = userManager.createUser("test", "test 1 name", "test1(a)example.com", "some password", "en", + "GB", "GMT"); + groupManager.createUserGroup(user1); + final User user2 = userManager.createUser("test", "test 2 name", "test2(a)example.com", "some password", "en", + "GB", "GMT"); + groupManager.createUserGroup(user2); } @Test(expected = EmailAddressInUseException.class) public void createUserWithExistingEmail() throws Exception { - final User user2 = userManager.createUser("username2", "the user name 2", "email(a)example.com", "userPassword", - "en", "GB", TimeZone.getDefault().getID()); - groupManager.createUserGroup(user2); - rollbackTransaction(); + final User user2 = userManager.createUser("username2", "the user name 2", "email(a)example.com", "userPassword", + "en", "GB", TimeZone.getDefault().getID()); + groupManager.createUserGroup(user2); + rollbackTransaction(); } @Test(expected = GroupNameInUseException.class) public void createUserWithExistingLongName() throws Exception { - final User user2 = userManager.createUser("username2", "the user name", "email2(a)example.com", "userPassword", - "en", "GB", TimeZone.getDefault().getID()); - groupManager.createUserGroup(user2); - rollbackTransaction(); + final User user2 = userManager.createUser("username2", "the user name", "email2(a)example.com", "userPassword", + "en", "GB", TimeZone.getDefault().getID()); + groupManager.createUserGroup(user2); + rollbackTransaction(); } @Test(expected = GroupNameInUseException.class) public void createUserWithExistingShortName() throws Exception { - final User user2 = userManager.createUser("username", "the user name 2", "email2(a)example.com", "userPassword", - "en", "GB", TimeZone.getDefault().getID()); - groupManager.createUserGroup(user2); - rollbackTransaction(); + final User user2 = userManager.createUser("username", "the user name 2", "email2(a)example.com", "userPassword", + "en", "GB", TimeZone.getDefault().getID()); + groupManager.createUserGroup(user2); + rollbackTransaction(); } @Test public void groupSearchPagination() throws Exception, ParseException { - for (int i = 1; i < 10; i++) { - createTestGroup(i); - } - groupManager.reIndex(); - final SearchResult<Group> result = groupManager.search("Yellow", 0, 5); - assertEquals(9, (long) result.getSize()); - assertEquals(5, result.getList().size()); - final SearchResult<Group> result2 = groupManager.search("Yellow", 5, 5); - assertEquals(9, (long) result2.getSize()); - assertEquals(4, result2.getList().size()); - rollbackTransaction(); + for (int i = 1; i < 10; i++) { + createTestGroup(i); + } + groupManager.reIndex(); + final SearchResult<Group> result = groupManager.search("Yellow", 0, 5); + assertEquals(9, (long) result.getSize()); + assertEquals(5, result.getList().size()); + final SearchResult<Group> result2 = groupManager.search("Yellow", 5, 5); + assertEquals(9, (long) result2.getSize()); + assertEquals(4, result2.getList().size()); + rollbackTransaction(); } @Before public void insertData() throws Exception { - openTransaction(); - assertEquals(0, userFinder.getAll().size()); - assertEquals(0, groupFinder.getAll().size()); - assertEquals(0, licenseFinder.getAll().size()); - final I18nLanguage english = new I18nLanguage(new Long(1819), "English", "English", "en"); - languageManager.persist(english); - final I18nCountry gb = new I18nCountry(new Long(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", - "western", ","); - countryManager.persist(gb); - user = userManager.createUser("username", "the user name", "email(a)example.com", "userPassword", "en", "GB", - TimeZone.getDefault().getID()); - defLicense = new License("by-sa", "Creative Commons Attribution-ShareAlike", "", - "http://creativecommons.org/licenses/by-sa/3.0/", true, true, false, "", ""); - licenseManager.persist(defLicense); - groupManager.createUserGroup(user); + openTransaction(); + assertEquals(0, userFinder.getAll().size()); + assertEquals(0, groupFinder.getAll().size()); + assertEquals(0, licenseFinder.getAll().size()); + final I18nLanguage english = new I18nLanguage(new Long(1819), "English", "English", "en"); + languageManager.persist(english); + final I18nCountry gb = new I18nCountry(new Long(75), "GB", "GBP", ".", "£%n", "", ".", "United Kingdom", + "western", ","); + countryManager.persist(gb); + user = userManager.createUser("username", "the user name", "email(a)example.com", "userPassword", "en", "GB", + TimeZone.getDefault().getID()); + defLicense = new License("by-sa", "Creative Commons Attribution-ShareAlike", "", + "http://creativecommons.org/licenses/by-sa/3.0/", true, true, false, "", ""); + licenseManager.persist(defLicense); + groupManager.createUserGroup(user); } private void createTestGroup(final int number) throws Exception { - final Group g = new Group("ysei" + number, "Yellow Submarine Environmental Initiative " + number, defLicense, - GroupType.PROJECT); - groupManager.createGroup(g, user); + final Group g = new Group("ysei" + number, "Yellow Submarine Environmental Initiative " + number, defLicense, + GroupType.PROJECT); + groupManager.createGroup(g, user); } } Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java 2008-10-15 17:33:40 UTC (rev 912) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java 2008-10-16 14:34:33 UTC (rev 913) @@ -2,7 +2,9 @@ import org.easymock.EasyMock; import org.junit.Before; -import org.junit.Test; +import org.junit.Ignore; +import org.mockito.Mockito; +import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; public class TextEditorPresenterTest { private TextEditorPresenter presenter; @@ -10,97 +12,99 @@ @Before public void createObjects() { - presenter = new TextEditorPresenter(true, null, null); - view = EasyMock.createStrictMock(TextEditorView.class); + I18nUITranslationService i18n = Mockito.mock(I18nUITranslationService.class); + // ActionToolbar toolbar = Mockito.mock(ActionToolbar.class); + presenter = new TextEditorPresenter(true, null, i18n); + view = EasyMock.createStrictMock(TextEditorView.class); } - @Test + @Ignore public void testSave() { - viewInit(); - // view.setEnabledSaveButton(true); - view.scheduleSave(10000); - EasyMock.expect(view.getHTML()).andReturn("foo"); - viewReset(); - EasyMock.replay(view); - // listener.onSave("foo"); - // EasyMock.replay(listener); - presenter.init(view); - presenter.onEdit(); - presenter.onSave(); - presenter.onSaved(); - EasyMock.verify(view); - // EasyMock.verify(listener); + viewInit(); + // view.setEnabledSaveButton(true); + view.scheduleSave(10000); + EasyMock.expect(view.getHTML()).andReturn("foo"); + viewReset(); + EasyMock.replay(view); + // listener.onSave("foo"); + // EasyMock.replay(listener); + presenter.init(view); + presenter.onEdit(); + presenter.onSave(); + presenter.onSaved(); + EasyMock.verify(view); + // EasyMock.verify(listener); } - @Test + @Ignore public void testSavePending() { - viewInit(); - // view.setEnabledSaveButton(true); - view.scheduleSave(10000); - EasyMock.replay(view); - presenter.init(view); - presenter.onEdit(); - EasyMock.verify(view); + viewInit(); + // view.setEnabledSaveButton(true); + view.scheduleSave(10000); + EasyMock.replay(view); + presenter.init(view); + presenter.onEdit(); + EasyMock.verify(view); } - @Test + @Ignore public void testSavePendingCancel() { - viewInit(); - // view.setEnabledSaveButton(true); - view.scheduleSave(10000); - view.saveTimerCancel(); - view.showSaveBeforeDialog(); - EasyMock.expect(view.getHTML()).andReturn("foo"); - viewReset(); - EasyMock.replay(view); - // listener.onSave("foo"); - // listener.onEditCancelled(); - // EasyMock.replay(listener); - presenter.init(view); - presenter.onEdit(); - presenter.onCancel(); - presenter.onSaveAndClose(); - presenter.onSaved(); - EasyMock.verify(view); - // EasyMock.verify(listener); + viewInit(); + // view.setEnabledSaveButton(true); + view.scheduleSave(10000); + view.saveTimerCancel(); + view.showSaveBeforeDialog(); + EasyMock.expect(view.getHTML()).andReturn("foo"); + viewReset(); + EasyMock.replay(view); + // listener.onSave("foo"); + // listener.onEditCancelled(); + // EasyMock.replay(listener); + presenter.init(view); + presenter.onEdit(); + presenter.onCancel(); + presenter.onSaveAndClose(); + presenter.onSaved(); + EasyMock.verify(view); + // EasyMock.verify(listener); } - @Test + @Ignore public void testSavePendingCancelSaveFails() { - viewInit(); - // view.setEnabledSaveButton(true); - view.scheduleSave(10000); - view.saveTimerCancel(); - view.showSaveBeforeDialog(); - EasyMock.expect(view.getHTML()).andReturn("foo"); - view.scheduleSave(20000); - EasyMock.replay(view); - // listener.onSave("foo"); - // EasyMock.replay(listener); - presenter.init(view); - presenter.onEdit(); - presenter.onCancel(); - presenter.onSaveAndClose(); - presenter.onSaveFailed(); - EasyMock.verify(view); - // EasyMock.verify(listener); + viewInit(); + // view.setEnabledSaveButton(true); + view.scheduleSave(10000); + view.saveTimerCancel(); + view.showSaveBeforeDialog(); + EasyMock.expect(view.getHTML()).andReturn("foo"); + view.scheduleSave(20000); + EasyMock.replay(view); + // listener.onSave("foo"); + // EasyMock.replay(listener); + presenter.init(view); + presenter.onEdit(); + presenter.onCancel(); + presenter.onSaveAndClose(); + presenter.onSaveFailed(); + EasyMock.verify(view); + // EasyMock.verify(listener); } - @Test + @Ignore public void testViewInitialization() { - viewInit(); - EasyMock.replay(view); - presenter.init(view); - EasyMock.verify(view); + viewInit(); + EasyMock.replay(view); + presenter.init(view); + EasyMock.verify(view); } private void viewInit() { - // view.setEnabledSaveButton(false); - view.setEnabled(true); + // view.setEnabledSaveButton(false); + view.setEnabled(true); } private void viewReset() { - view.saveTimerCancel(); - // view.setEnabledSaveButton(false); + view.saveTimerCancel(); + // view.setEnabledSaveButton(false); } }

1 0

r912 - in trunk/src/main: java/org/ourproject/kune/platf/client/services java/org/ourproject/kune/platf/client/ui java/org/ourproject/kune/platf/server/manager/impl java/org/ourproject/kune/workspace/client/ctxnav resources
by vjrj 15 Oct '08

15 Oct '08

Author: vjrj Date: 2008-10-15 19:33:40 +0200 (Wed, 15 Oct 2008) New Revision: 912 Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneUiUtils.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.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/resources/kune.properties Log: Complete - task Image thumbs/icons in client Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-15 14:12:54 UTC (rev 911) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-15 17:33:40 UTC (rev 912) @@ -92,294 +92,326 @@ @Override public void onLoad() { - register(Singleton.class, new Factory<Session>(Session.class) { - public Session create() { - return new SessionDefault(Cookies.getCookie(Site.USERHASH), $$(UserServiceAsync.class)); - } - }, new Factory<I18nServiceAsync>(I18nServiceAsync.class) { - public I18nServiceAsync create() { - final I18nServiceAsync service = (I18nServiceAsync) GWT.create(I18nService.class); - ((ServiceDefTarget) service).setServiceEntryPoint(GWT.getModuleBaseURL() + "I18nService"); - return service; - } - }, new Factory<UserServiceAsync>(UserServiceAsync.class) { - public UserServiceAsync create() { - final UserServiceAsync service = (UserServiceAsync) GWT.create(UserService.class); - ((ServiceDefTarget) service).setServiceEntryPoint(GWT.getModuleBaseURL() + "UserService"); - return service; - } - }, new Factory<SocialNetworkServiceAsync>(SocialNetworkServiceAsync.class) { - public SocialNetworkServiceAsync create() { - final SocialNetworkServiceAsync snServiceAsync = (SocialNetworkServiceAsync) GWT - .create(SocialNetworkService.class); - ((ServiceDefTarget) snServiceAsync).setServiceEntryPoint(GWT.getModuleBaseURL() - + "SocialNetworkService"); - return snServiceAsync; - } - }, new Factory<GroupServiceAsync>(GroupServiceAsync.class) { - public GroupServiceAsync create() { - final GroupServiceAsync groupServiceAsync = (GroupServiceAsync) GWT.create(GroupService.class); - ((ServiceDefTarget) groupServiceAsync).setServiceEntryPoint(GWT.getModuleBaseURL() + "GroupService"); - return groupServiceAsync; - } - }, new Factory<ContentServiceAsync>(ContentServiceAsync.class) { - public ContentServiceAsync create() { - final ContentServiceAsync contentServiceAsync = (ContentServiceAsync) GWT.create(ContentService.class); - ((ServiceDefTarget) contentServiceAsync) - .setServiceEntryPoint(GWT.getModuleBaseURL() + "ContentService"); - return contentServiceAsync; - } - }); + register(Singleton.class, new Factory<Session>(Session.class) { + @Override + public Session create() { + return new SessionDefault(Cookies.getCookie(Site.USERHASH), $$(UserServiceAsync.class)); + } + }, new Factory<I18nServiceAsync>(I18nServiceAsync.class) { + @Override + public I18nServiceAsync create() { + final I18nServiceAsync service = (I18nServiceAsync) GWT.create(I18nService.class); + ((ServiceDefTarget) service).setServiceEntryPoint(GWT.getModuleBaseURL() + "I18nService"); + return service; + } + }, new Factory<UserServiceAsync>(UserServiceAsync.class) { + @Override + public UserServiceAsync create() { + final UserServiceAsync service = (UserServiceAsync) GWT.create(UserService.class); + ((ServiceDefTarget) service).setServiceEntryPoint(GWT.getModuleBaseURL() + "UserService"); + return service; + } + }, new Factory<SocialNetworkServiceAsync>(SocialNetworkServiceAsync.class) { + @Override + public SocialNetworkServiceAsync create() { + final SocialNetworkServiceAsync snServiceAsync = (SocialNetworkServiceAsync) GWT + .create(SocialNetworkService.class); + ((ServiceDefTarget) snServiceAsync).setServiceEntryPoint(GWT.getModuleBaseURL() + + "SocialNetworkService"); + return snServiceAsync; + } + }, new Factory<GroupServiceAsync>(GroupServiceAsync.class) { + @Override + public GroupServiceAsync create() { + final GroupServiceAsync groupServiceAsync = (GroupServiceAsync) GWT.create(GroupService.class); + ((ServiceDefTarget) groupServiceAsync).setServiceEntryPoint(GWT.getModuleBaseURL() + "GroupService"); + return groupServiceAsync; + } + }, new Factory<ContentServiceAsync>(ContentServiceAsync.class) { + @Override + public ContentServiceAsync create() { + final ContentServiceAsync contentServiceAsync = (ContentServiceAsync) GWT.create(ContentService.class); + ((ServiceDefTarget) contentServiceAsync) + .setServiceEntryPoint(GWT.getModuleBaseURL() + "ContentService"); + return contentServiceAsync; + } + }); - register(Singleton.class, new Factory<I18nUITranslationService>(I18nUITranslationService.class) { - public I18nUITranslationService create() { - final I18nUITranslationService i18n = new I18nUITranslationService(); - i18n.init($(I18nServiceAsync.class), $(Session.class), new Listener0() { - public void onEvent() { - onI18nReady(); - } - }); - return i18n; - } - }); + register(Singleton.class, new Factory<I18nUITranslationService>(I18nUITranslationService.class) { + @Override + public I18nUITranslationService create() { + final I18nUITranslationService i18n = new I18nUITranslationService(); + i18n.init($(I18nServiceAsync.class), $(Session.class), new Listener0() { + public void onEvent() { + onI18nReady(); + } + }); + return i18n; + } + }); - $(I18nUITranslationService.class); + $(I18nUITranslationService.class); } private void onI18nReady() { - final I18nUITranslationService i18n = $(I18nUITranslationService.class); + final I18nUITranslationService i18n = $(I18nUITranslationService.class); - if (container.hasProvider(I18nTranslationService.class)) { - container.removeProvider(I18nTranslationService.class); - } + if (container.hasProvider(I18nTranslationService.class)) { + container.removeProvider(I18nTranslationService.class); + } - register(Singleton.class, new Factory<I18nTranslationService>(I18nTranslationService.class) { - public I18nTranslationService create() { - return i18n; - } - }); + register(Singleton.class, new Factory<I18nTranslationService>(I18nTranslationService.class) { + @Override + public I18nTranslationService create() { + return i18n; + } + }); - register(Singleton.class, new Factory<HistoryWrapper>(HistoryWrapper.class) { - public HistoryWrapper create() { - return new HistoryWrapperDefault(); - } - }, new Factory<ContentProvider>(ContentProvider.class) { - public ContentProvider create() { - return new ContentProviderDefault($(ContentServiceAsync.class)); - } - }, new Factory<StateManager>(StateManager.class) { - public StateManager create() { - final StateManagerDefault stateManager = new StateManagerDefault($(ContentProvider.class), - $(Session.class), $(HistoryWrapper.class)); - History.addHistoryListener(stateManager); - return stateManager; - } - }); + register(Singleton.class, new Factory<HistoryWrapper>(HistoryWrapper.class) { + @Override + public HistoryWrapper create() { + return new HistoryWrapperDefault(); + } + }, new Factory<ContentProvider>(ContentProvider.class) { + @Override + public ContentProvider create() { + return new ContentProviderDefault($(ContentServiceAsync.class)); + } + }, new Factory<StateManager>(StateManager.class) { + @Override + public StateManager create() { + final StateManagerDefault stateManager = new StateManagerDefault($(ContentProvider.class), + $(Session.class), $(HistoryWrapper.class)); + History.addHistoryListener(stateManager); + return stateManager; + } + }); - register(Singleton.class, new Factory<KuneErrorHandler>(KuneErrorHandler.class) { - public KuneErrorHandler create() { - return new KuneErrorHandler($(Session.class), i18n, $$(WorkspaceSkeleton.class), $$(StateManager.class)); - } - }); + register(Singleton.class, new Factory<KuneErrorHandler>(KuneErrorHandler.class) { + @Override + public KuneErrorHandler create() { + return new KuneErrorHandler($(Session.class), i18n, $$(WorkspaceSkeleton.class), $$(StateManager.class)); + } + }); - register(Singleton.class, new Factory<Images>(Images.class) { - public Images create() { - return Images.App.getInstance(); - } - }, new Factory<ImageUtils>(ImageUtils.class) { - public ImageUtils create() { - return new ImageUtils(); - } - }); + register(Singleton.class, new Factory<Images>(Images.class) { + @Override + public Images create() { + return Images.App.getInstance(); + } + }, new Factory<ImageUtils>(ImageUtils.class) { + @Override + public ImageUtils create() { + return new ImageUtils(); + } + }); - AsyncCallbackSimple.init($(KuneErrorHandler.class)); + AsyncCallbackSimple.init($(KuneErrorHandler.class)); - register(Singleton.class, new Factory<Application>(Application.class) { - public Application create() { - return new ApplicationDefault($(Session.class)); - } + register(Singleton.class, new Factory<Application>(Application.class) { + @Override + public Application create() { + return new ApplicationDefault($(Session.class)); + } - @Override - public void onAfterCreated(final Application instance) { - } - }); + @Override + public void onAfterCreated(final Application instance) { + } + }); - register(Singleton.class, new Factory<SiteSearcher>(SiteSearcher.class) { - public SiteSearcher create() { - final SiteSearcherPresenter presenter = new SiteSearcherPresenter($$(StateManager.class)); - final SiteSearcherView view = new SiteSearcherPanel(presenter, i18n, $(WorkspaceSkeleton.class)); - presenter.init(view); - return presenter; - } - }); + register(Singleton.class, new Factory<SiteSearcher>(SiteSearcher.class) { + @Override + public SiteSearcher create() { + final SiteSearcherPresenter presenter = new SiteSearcherPresenter($$(StateManager.class)); + final SiteSearcherView view = new SiteSearcherPanel(presenter, i18n, $(WorkspaceSkeleton.class)); + presenter.init(view); + return presenter; + } + }); - register(Singleton.class, new Factory<I18nTranslator>(I18nTranslator.class) { - public I18nTranslator create() { - final I18nTranslatorPresenter presenter = new I18nTranslatorPresenter($(Session.class), - $(I18nServiceAsync.class), i18n); - final I18nTranslatorView view = new I18nTranslatorPanel(presenter, i18n, $(LanguageSelector.class), - $(WorkspaceSkeleton.class)); - presenter.init(view); - return presenter; - } - }); + register(Singleton.class, new Factory<I18nTranslator>(I18nTranslator.class) { + @Override + public I18nTranslator create() { + final I18nTranslatorPresenter presenter = new I18nTranslatorPresenter($(Session.class), + $(I18nServiceAsync.class), i18n); + final I18nTranslatorView view = new I18nTranslatorPanel(presenter, i18n, $(LanguageSelector.class), + $(WorkspaceSkeleton.class)); + presenter.init(view); + return presenter; + } + }); - register(Singleton.class, new Factory<SignIn>(SignIn.class) { - public SignIn create() { - final SignInPresenter presenter = new SignInPresenter($(Session.class), $(StateManager.class), i18n, - $(UserServiceAsync.class)); - final SignInPanel view = new SignInPanel(presenter, i18n, $(WorkspaceSkeleton.class)); - presenter.init(view); - return presenter; - } - }); + register(Singleton.class, new Factory<SignIn>(SignIn.class) { + @Override + public SignIn create() { + final SignInPresenter presenter = new SignInPresenter($(Session.class), $(StateManager.class), i18n, + $(UserServiceAsync.class)); + final SignInPanel view = new SignInPanel(presenter, i18n, $(WorkspaceSkeleton.class)); + presenter.init(view); + return presenter; + } + }); - register(Singleton.class, new Factory<LicenseChoose>(LicenseChoose.class) { - public LicenseChoose create() { - final LicenseChoosePresenter presenter = new LicenseChoosePresenter($(Session.class)); - final LicenseChoosePanel view = new LicenseChoosePanel(presenter, i18n); - presenter.init(view); - return presenter; - } - }); + register(Singleton.class, new Factory<LicenseChoose>(LicenseChoose.class) { + @Override + public LicenseChoose create() { + final LicenseChoosePresenter presenter = new LicenseChoosePresenter($(Session.class)); + final LicenseChoosePanel view = new LicenseChoosePanel(presenter, i18n); + presenter.init(view); + return presenter; + } + }); - register(Singleton.class, new Factory<NewGroup>(NewGroup.class) { - public NewGroup create() { - final NewGroupPresenter presenter = new NewGroupPresenter(i18n, $(Session.class), - $(StateManager.class), $$(GroupServiceAsync.class)); - final NewGroupPanel view = new NewGroupPanel(presenter, i18n, $$(LicenseChoose.class)); - presenter.init(view); - return presenter; - } - }); + register(Singleton.class, new Factory<NewGroup>(NewGroup.class) { + @Override + public NewGroup create() { + final NewGroupPresenter presenter = new NewGroupPresenter(i18n, $(Session.class), + $(StateManager.class), $$(GroupServiceAsync.class)); + final NewGroupPanel view = new NewGroupPanel(presenter, i18n, $$(LicenseChoose.class)); + presenter.init(view); + return presenter; + } + }); - register(Singleton.class, new Factory<UserLiveSearcher>(UserLiveSearcher.class) { - public UserLiveSearcher create() { - final UserLiveSearcherPresenter presenter = new UserLiveSearcherPresenter(); - final EntityLiveSearcherView view = new UserLiveSearcherPanel(presenter, i18n); - presenter.init(view); - return presenter; - } - }); + register(Singleton.class, new Factory<UserLiveSearcher>(UserLiveSearcher.class) { + @Override + public UserLiveSearcher create() { + final UserLiveSearcherPresenter presenter = new UserLiveSearcherPresenter(); + final EntityLiveSearcherView view = new UserLiveSearcherPanel(presenter, i18n); + presenter.init(view); + return presenter; + } + }); - register(Singleton.class, new Factory<GroupLiveSearcher>(GroupLiveSearcher.class) { - public GroupLiveSearcher create() { - final GroupLiveSearcherPresenter presenter = new GroupLiveSearcherPresenter(); - final EntityLiveSearcherView view = new GroupLiveSearchPanel(presenter, i18n); - presenter.init(view); - return presenter; - } - }); + register(Singleton.class, new Factory<GroupLiveSearcher>(GroupLiveSearcher.class) { + @Override + public GroupLiveSearcher create() { + final GroupLiveSearcherPresenter presenter = new GroupLiveSearcherPresenter(); + final EntityLiveSearcherView view = new GroupLiveSearchPanel(presenter, i18n); + presenter.init(view); + return presenter; + } + }); - register(Singleton.class, new Factory<ToolSelector>(ToolSelector.class) { - public ToolSelector create() { - final ToolSelectorPresenter presenter = new ToolSelectorPresenter($(StateManager.class), - $(WsThemePresenter.class)); - return presenter; - } - }); + register(Singleton.class, new Factory<ToolSelector>(ToolSelector.class) { + @Override + public ToolSelector create() { + final ToolSelectorPresenter presenter = new ToolSelectorPresenter($(StateManager.class), + $(WsThemePresenter.class)); + return presenter; + } + }); - register(Singleton.class, new Factory<TextEditor>(TextEditor.class) { - public TextEditor create() { - final ActionToolbarPanel<StateToken> contentNavigatorToolbar = new ActionToolbarPanel<StateToken>( - ActionToolbarPanel.Position.content, $$(ActionManager.class), $(WorkspaceSkeleton.class)); - final ActionToolbar<StateToken> toolbar = new ActionToolbarPresenter<StateToken>( - contentNavigatorToolbar); + register(Singleton.class, new Factory<TextEditor>(TextEditor.class) { + @Override + public TextEditor create() { + final ActionToolbarPanel<StateToken> contentNavigatorToolbar = new ActionToolbarPanel<StateToken>( + ActionToolbarPanel.Position.content, $$(ActionManager.class), $(WorkspaceSkeleton.class)); + final ActionToolbar<StateToken> toolbar = new ActionToolbarPresenter<StateToken>( + contentNavigatorToolbar); - final TextEditorPresenter presenter = new TextEditorPresenter(true, toolbar, - $(I18nUITranslationService.class)); - final TextEditorPanel panel = new TextEditorPanel(presenter, $(I18nTranslationService.class), - $(WorkspaceSkeleton.class), $(ColorWebSafePalette.class)); - presenter.init(panel); - return presenter; - } - }); + final TextEditorPresenter presenter = new TextEditorPresenter(true, toolbar, + $(I18nUITranslationService.class)); + final TextEditorPanel panel = new TextEditorPanel(presenter, $(I18nTranslationService.class), + $(WorkspaceSkeleton.class), $(ColorWebSafePalette.class)); + presenter.init(panel); + return presenter; + } + }); - register(Singleton.class, new Factory<LanguageSelector>(LanguageSelector.class) { - public LanguageSelector create() { - final LanguageSelectorPresenter presenter = new LanguageSelectorPresenter($(Session.class)); - final LanguageSelectorView view = new LanguageSelectorPanel(presenter, i18n); - presenter.init(view); - return presenter; - } - }); + register(Singleton.class, new Factory<LanguageSelector>(LanguageSelector.class) { + @Override + public LanguageSelector create() { + final LanguageSelectorPresenter presenter = new LanguageSelectorPresenter($(Session.class)); + final LanguageSelectorView view = new LanguageSelectorPanel(presenter, i18n); + presenter.init(view); + return presenter; + } + }); - register(Singleton.class, new Factory<ActionManager>(ActionManager.class) { - public ActionManager create() { - return new ActionManager($(WorkspaceSkeleton.class)); - } - }); + register(Singleton.class, new Factory<ActionManager>(ActionManager.class) { + @Override + public ActionManager create() { + return new ActionManager($(WorkspaceSkeleton.class)); + } + }); - register(Singleton.class, new Factory<ContextActionRegistry>(ContextActionRegistry.class) { - public ContextActionRegistry create() { - return new ContextActionRegistry(); - } - }); + register(Singleton.class, new Factory<ContextActionRegistry>(ContextActionRegistry.class) { + @Override + public ContextActionRegistry create() { + return new ContextActionRegistry(); + } + }); - register(Singleton.class, new Factory<ContentActionRegistry>(ContentActionRegistry.class) { - public ContentActionRegistry create() { - return new ContentActionRegistry(); - } - }); + register(Singleton.class, new Factory<ContentActionRegistry>(ContentActionRegistry.class) { + @Override + public ContentActionRegistry create() { + return new ContentActionRegistry(); + } + }); - register(Singleton.class, new Factory<DragDropContentRegistry>(DragDropContentRegistry.class) { - public DragDropContentRegistry create() { - return new DragDropContentRegistry(); - } - }); + register(Singleton.class, new Factory<DragDropContentRegistry>(DragDropContentRegistry.class) { + @Override + public DragDropContentRegistry create() { + return new DragDropContentRegistry(); + } + }); - register(Singleton.class, new Factory<ContentIconsRegistry>(ContentIconsRegistry.class) { - public ContentIconsRegistry create() { - return new ContentIconsRegistry(); - } - }); + register(Singleton.class, new Factory<ContentIconsRegistry>(ContentIconsRegistry.class) { + @Override + public ContentIconsRegistry create() { + return new ContentIconsRegistry(); + } + }); - register(Singleton.class, new Factory<ContextNavigator>(ContextNavigator.class) { - public ContextNavigator create() { - final ActionToolbarPanel<StateToken> contextNavigatorToolbar = new ActionToolbarPanel<StateToken>( - ActionToolbarPanel.Position.context, $$(ActionManager.class), $(WorkspaceSkeleton.class)); - final ActionToolbar<StateToken> toolbar = new ActionToolbarPresenter<StateToken>( - contextNavigatorToolbar); + register(Singleton.class, new Factory<ContextNavigator>(ContextNavigator.class) { + @Override + public ContextNavigator create() { + final ActionToolbarPanel<StateToken> contextNavigatorToolbar = new ActionToolbarPanel<StateToken>( + ActionToolbarPanel.Position.context, $$(ActionManager.class), $(WorkspaceSkeleton.class)); + final ActionToolbar<StateToken> toolbar = new ActionToolbarPresenter<StateToken>( + contextNavigatorToolbar); - final ContextNavigatorPresenter presenter = new ContextNavigatorPresenter($(StateManager.class), - $(Session.class), $$(ContentServiceAsync.class), i18n, $(EntityTitle.class), - $(ContentIconsRegistry.class), $(DragDropContentRegistry.class), toolbar, - $(ContextActionRegistry.class)); - final ContextNavigatorPanel panel = new ContextNavigatorPanel(presenter, i18n, - $(WorkspaceSkeleton.class), $(ActionManager.class)); - presenter.init(panel); - return presenter; - } - }); + final ContextNavigatorPresenter presenter = new ContextNavigatorPresenter($(StateManager.class), + $(Session.class), $$(ContentServiceAsync.class), i18n, $(EntityTitle.class), + $(ContentIconsRegistry.class), $(DragDropContentRegistry.class), toolbar, + $(ContextActionRegistry.class), $$(FileDownloadUtils.class), true); + final ContextNavigatorPanel panel = new ContextNavigatorPanel(presenter, i18n, + $(WorkspaceSkeleton.class), $(ActionManager.class)); + presenter.init(panel); + return presenter; + } + }); - register(Singleton.class, new Factory<FileDownloadUtils>(FileDownloadUtils.class) { - public FileDownloadUtils create() { - return new FileDownloadUtils($(Session.class)); - } - }); + register(Singleton.class, new Factory<FileDownloadUtils>(FileDownloadUtils.class) { + @Override + public FileDownloadUtils create() { + return new FileDownloadUtils($(Session.class)); + } + }); - // Register of tokens like "signin", "newgroup", "translate" etcetera - $(StateManager.class).addSiteToken(SiteToken.signin.toString(), new Listener<StateToken>() { - public void onEvent(final StateToken previousStateToken) { - $(SignIn.class).doSignIn(previousStateToken); - } - }); + // Register of tokens like "signin", "newgroup", "translate" etcetera + $(StateManager.class).addSiteToken(SiteToken.signin.toString(), new Listener<StateToken>() { + public void onEvent(final StateToken previousStateToken) { + $(SignIn.class).doSignIn(previousStateToken); + } + }); - $(StateManager.class).addSiteToken(SiteToken.newgroup.toString(), new Listener<StateToken>() { - public void onEvent(final StateToken previousStateToken) { - $(NewGroup.class).doNewGroup(previousStateToken); - } - }); + $(StateManager.class).addSiteToken(SiteToken.newgroup.toString(), new Listener<StateToken>() { + public void onEvent(final StateToken previousStateToken) { + $(NewGroup.class).doNewGroup(previousStateToken); + } + }); - $(StateManager.class).addSiteToken(SiteToken.translate.toString(), new Listener<StateToken>() { - public void onEvent(final StateToken previousStateToken) { - $(I18nTranslator.class).doShowTranslator(); - } - }); + $(StateManager.class).addSiteToken(SiteToken.translate.toString(), new Listener<StateToken>() { + public void onEvent(final StateToken previousStateToken) { + $(I18nTranslator.class).doShowTranslator(); + } + }); - $(ApplicationComponentGroup.class).createAll(); - $(ToolGroup.class).createAll(); - $(Application.class).start(); + $(ApplicationComponentGroup.class).createAll(); + $(ToolGroup.class).createAll(); + $(Application.class).start(); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneUiUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneUiUtils.java 2008-10-15 14:12:54 UTC (rev 911) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneUiUtils.java 2008-10-15 17:33:40 UTC (rev 912) @@ -28,12 +28,26 @@ public class KuneUiUtils { - public static void setQuickTip(final Widget widget, final String tip) { - setQuickTip(widget.getElement(), tip); + public static String genQuickTipLabel(final String labelText, final String tipTitle, final String tipText, + final AbstractImagePrototype icon) { + // FIXME: get this from emite + String tipHtml = "<span style=\"vertical-align: middle;\" ext:qtip=\"" + tipText + "\""; + if (tipTitle != null && tipTitle.length() > 0) { + tipHtml += " ext:qtitle=\"" + tipTitle + "\""; + } + tipHtml += ">"; + tipHtml += labelText; + tipHtml += " "; + Image iconImg = new Image(); + icon.applyTo(iconImg); + setQuickTip(iconImg, tipText, tipTitle); + tipHtml += iconImg.toString(); + tipHtml += "</span>"; + return tipHtml; } - public static void setQuickTip(final Widget widget, final String tip, final String tipTitle) { - setQuickTip(widget.getElement(), tip, tipTitle); + public static String genQuickTipWithImage(String imageResizedUrl) { + return new Image(imageResizedUrl).toString(); } /** @@ -68,22 +82,12 @@ } } - public static String genQuickTipLabel(final String labelText, final String tipTitle, final String tipText, - final AbstractImagePrototype icon) { - // FIXME: get this from emite - String tipHtml = "<span style=\"vertical-align: middle;\" ext:qtip=\"" + tipText + "\""; - if (tipTitle != null && tipTitle.length() > 0) { - tipHtml += " ext:qtitle=\"" + tipTitle + "\""; - } - tipHtml += ">"; - tipHtml += labelText; - tipHtml += " "; - Image iconImg = new Image(); - icon.applyTo(iconImg); - setQuickTip(iconImg, tipText, tipTitle); - tipHtml += iconImg.toString(); - tipHtml += "</span>"; - return tipHtml; + public static void setQuickTip(final Widget widget, final String tip) { + setQuickTip(widget.getElement(), tip); } + public static void setQuickTip(final Widget widget, final String tip, final String tipTitle) { + setQuickTip(widget.getElement(), tip, tipTitle); + } + } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.java 2008-10-15 14:12:54 UTC (rev 911) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.java 2008-10-15 17:33:40 UTC (rev 912) @@ -80,7 +80,11 @@ if (mimeType.getType().equals("image")) { String imgsizePrefix = imgsize == null ? "" : "." + imgsize; String filenameWithoutExtension = FileUtils.getFileNameWithoutExtension(filename, extension); - filename = filenameWithoutExtension + imgsizePrefix + extension; + String filenameResized = filenameWithoutExtension + imgsizePrefix + extension; + if (new File(absDir + filenameResized).exists()) { + // thumb can fail + filename = filenameResized; + } } final String absFilename = absDir + filename; 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 2008-10-15 14:12:54 UTC (rev 911) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java 2008-10-15 17:33:40 UTC (rev 912) @@ -9,6 +9,7 @@ private final String parentId; private final String iconUrl; private final String text; + private final String tooltip; private final ContentStatusDTO contentStatusDTO; private final StateToken token; private final ActionItemCollection<StateToken> actionCollection; @@ -16,53 +17,58 @@ private final boolean allowDrop; public ContextNavigatorItem(final String id, final String parentId, final String iconUrl, final String text, - final ContentStatusDTO contentStatusDTO, final StateToken token, final boolean allowDrag, - final boolean allowDrop, final ActionItemCollection<StateToken> actionCollection) { - this.id = id; - this.parentId = parentId; - this.iconUrl = iconUrl; - this.text = text; - this.contentStatusDTO = contentStatusDTO; - this.token = token; - this.allowDrag = allowDrag; - this.allowDrop = allowDrop; - this.actionCollection = actionCollection; + final String tooltip, final ContentStatusDTO contentStatusDTO, final StateToken token, + final boolean allowDrag, final boolean allowDrop, final ActionItemCollection<StateToken> actionCollection) { + this.id = id; + this.parentId = parentId; + this.iconUrl = iconUrl; + this.text = text; + this.tooltip = tooltip; + this.contentStatusDTO = contentStatusDTO; + this.token = token; + this.allowDrag = allowDrag; + this.allowDrop = allowDrop; + this.actionCollection = actionCollection; } public ActionItemCollection<StateToken> getActionCollection() { - return actionCollection; + return actionCollection; } public ContentStatusDTO getContentStatus() { - return contentStatusDTO; + return contentStatusDTO; } public String getIconUrl() { - return iconUrl; + return iconUrl; } public String getId() { - return id; + return id; } public String getParentId() { - return parentId; + return parentId; } public StateToken getStateToken() { - return token; + return token; } public String getText() { - return text; + return text; } + public String getTooltip() { + return tooltip; + } + public boolean isDraggable() { - return allowDrag; + return allowDrag; } public boolean isDroppable() { - return allowDrop; + return allowDrop; } } 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 2008-10-15 14:12:54 UTC (rev 911) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2008-10-15 17:33:40 UTC (rev 912) @@ -90,6 +90,10 @@ child.setHref("#" + item.getStateToken().toString()); child.setAllowDrag(item.isDraggable()); child.setAllowDrop(item.isDroppable()); + final String tooltip = item.getTooltip(); + if (tooltip != null) { + child.setTooltip(tooltip); + } createItemMenu(nodeId, item.getActionCollection()); final TreeNode parent = treePanel.getNodeById(item.getParentId()); if (parent != null) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2008-10-15 14:12:54 UTC (rev 911) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2008-10-15 17:33:40 UTC (rev 912) @@ -43,6 +43,9 @@ 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.KuneUiUtils; +import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.site.Site; import org.ourproject.kune.workspace.client.title.EntityTitle; @@ -66,230 +69,253 @@ private final DragDropContentRegistry dragDropContentRegistry; private final ActionRegistry<StateToken> actionRegistry; private final ActionToolbar<StateToken> toolbar; + private final Provider<FileDownloadUtils> downloadUtilsProvider; + private final boolean useGenericImageIcon; public ContextNavigatorPresenter(final StateManager stateManager, final Session session, - final Provider<ContentServiceAsync> contentServiceProvider, final I18nUITranslationService i18n, - final EntityTitle entityTitle, final ContentIconsRegistry contentIconsRegistry, - final DragDropContentRegistry dragDropContentRegistry, final ActionToolbar<StateToken> toolbar, - final ActionRegistry<StateToken> actionRegistry) { - this.stateManager = stateManager; - this.session = session; - this.contentServiceProvider = contentServiceProvider; - this.i18n = i18n; - this.entityTitle = entityTitle; - this.contentIconsRegistry = contentIconsRegistry; - this.dragDropContentRegistry = dragDropContentRegistry; - this.actionRegistry = actionRegistry; - this.toolbar = toolbar; - actionsByItem = new HashMap<StateToken, ActionItemCollection<StateToken>>(); - editOnNextStateChange = false; + final Provider<ContentServiceAsync> contentServiceProvider, final I18nUITranslationService i18n, + final EntityTitle entityTitle, final ContentIconsRegistry contentIconsRegistry, + final DragDropContentRegistry dragDropContentRegistry, final ActionToolbar<StateToken> toolbar, + final ActionRegistry<StateToken> actionRegistry, Provider<FileDownloadUtils> downloadUtilsProvider, + boolean useGenericImageIcon) { + this.stateManager = stateManager; + this.session = session; + this.contentServiceProvider = contentServiceProvider; + this.i18n = i18n; + this.entityTitle = entityTitle; + this.contentIconsRegistry = contentIconsRegistry; + this.dragDropContentRegistry = dragDropContentRegistry; + this.actionRegistry = actionRegistry; + this.toolbar = toolbar; + this.downloadUtilsProvider = downloadUtilsProvider; + this.useGenericImageIcon = useGenericImageIcon; + actionsByItem = new HashMap<StateToken, ActionItemCollection<StateToken>>(); + editOnNextStateChange = false; } public void editItem(final StateToken stateToken) { - view.editItem(genId(stateToken)); + view.editItem(genId(stateToken)); } public StateToken getCurrentStateToken() { - return session.getCurrentState().getStateToken(); + return session.getCurrentState().getStateToken(); } public View getView() { - return view; + return view; } public void gotoToken(final String token) { - stateManager.gotoToken(token); + stateManager.gotoToken(token); } public void init(final ContextNavigatorView view) { - this.view = view; - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO parameter) { - clear(); - } - }); - session.onUserSignOut(new Listener0() { - public void onEvent() { - clear(); - } - }); + this.view = view; + session.onUserSignIn(new Listener<UserInfoDTO>() { + public void onEvent(final UserInfoDTO parameter) { + clear(); + } + }); + session.onUserSignOut(new Listener0() { + public void onEvent() { + clear(); + } + }); } public boolean isSelected(final StateToken stateToken) { - return view.isSelected(genId(stateToken)); + return view.isSelected(genId(stateToken)); } public boolean mustEditOnNextStateChange() { - return editOnNextStateChange; + return editOnNextStateChange; } public void onItemRename(final String token, final String newName, final String oldName) { - if (!newName.equals(oldName)) { - Site.showProgress(i18n.t("Renaming")); - final StateToken stateToken = new StateToken(token); - final AsyncCallback<String> asyncCallback = new AsyncCallback<String>() { - public void onFailure(final Throwable caught) { - view.setFireOnTextChange(false); - setItemText(stateToken, oldName); - view.setFireOnTextChange(true); - Site.error(i18n.t("Error renaming")); - Site.hideProgress(); - } + if (!newName.equals(oldName)) { + Site.showProgress(i18n.t("Renaming")); + final StateToken stateToken = new StateToken(token); + final AsyncCallback<String> asyncCallback = new AsyncCallback<String>() { + public void onFailure(final Throwable caught) { + view.setFireOnTextChange(false); + setItemText(stateToken, oldName); + view.setFireOnTextChange(true); + Site.error(i18n.t("Error renaming")); + Site.hideProgress(); + } - public void onSuccess(final String result) { - Site.hideProgress(); - if (session.getCurrentState().getStateToken().getEncoded().equals(token)) { - // I have to update EntityTitle - entityTitle.setContentTitle(newName); - } - } - }; - if (stateToken.isComplete()) { - contentServiceProvider.get().renameContent(session.getUserHash(), stateToken, newName, asyncCallback); - } else { - contentServiceProvider.get().renameContainer(session.getUserHash(), stateToken, newName, asyncCallback); - } - } + public void onSuccess(final String result) { + Site.hideProgress(); + if (session.getCurrentState().getStateToken().getEncoded().equals(token)) { + // I have to update EntityTitle + entityTitle.setContentTitle(newName); + } + } + }; + if (stateToken.isComplete()) { + contentServiceProvider.get().renameContent(session.getUserHash(), stateToken, newName, asyncCallback); + } else { + contentServiceProvider.get().renameContainer(session.getUserHash(), stateToken, newName, asyncCallback); + } + } } public void refresh(final StateToken stateToken) { - contentServiceProvider.get().getContent(session.getUserHash(), stateToken, new AsyncCallbackSimple<StateDTO>() { - public void onSuccess(final StateDTO result) { - setState(result, false); - } - }); + contentServiceProvider.get().getContent(session.getUserHash(), stateToken, new AsyncCallbackSimple<StateDTO>() { + public void onSuccess(final StateDTO result) { + setState(result, false); + } + }); } public void selectItem(final StateToken stateToken) { - view.selectItem(genId(stateToken)); - toolbar.disableMenusAndClearButtons(); - toolbar.setActions(actionsByItem.get(stateToken)); + view.selectItem(genId(stateToken)); + toolbar.disableMenusAndClearButtons(); + toolbar.setActions(actionsByItem.get(stateToken)); } public void setEditOnNextStateChange(final boolean edit) { - editOnNextStateChange = edit; + editOnNextStateChange = edit; } public void setItemText(final StateToken stateToken, final String name) { - view.setItemText(genId(stateToken), name); + view.setItemText(genId(stateToken), name); } public void setState(final StateDTO state, final boolean select) { - final ContainerDTO container = state.getContainer(); - final StateToken stateToken = state.getStateToken(); - final AccessRightsDTO containerRights = state.getContainerRights(); - AccessRightsDTO rights; + final ContainerDTO container = state.getContainer(); + final StateToken stateToken = state.getStateToken(); + final AccessRightsDTO containerRights = state.getContainerRights(); + AccessRightsDTO rights; - if (stateToken.hasAll()) { - rights = state.getContentRights(); - } else { - rights = containerRights; - } - view.setEditable(rights.isEditable()); + if (stateToken.hasAll()) { + rights = state.getContentRights(); + } else { + rights = containerRights; + } + view.setEditable(rights.isEditable()); - // If root sended (container is not a root folder) process root (add - // childs to view) - final ContainerDTO root = state.getRootContainer(); - if (root != null) { - view.setRootItem(genId(root.getStateToken()), i18n.t(root.getName()), root.getStateToken()); - createChildItems(root, containerRights); - } + // If root sended (container is not a root folder) process root (add + // childs to view) + final ContainerDTO root = state.getRootContainer(); + if (root != null) { + view.setRootItem(genId(root.getStateToken()), i18n.t(root.getName()), root.getStateToken()); + createChildItems(root, containerRights); + } - // Do the path to our current content - createTreePath(stateToken, container.getAbsolutePath(), containerRights); + // Do the path to our current content + createTreePath(stateToken, container.getAbsolutePath(), containerRights); - // Process our current content/container - final ActionItemCollection<StateToken> actionItems = new ActionItemCollection<StateToken>(); - if (state.hasDocument()) { - rights = state.getContentRights(); - final ActionItemCollection<StateToken> contentActions = addItem(state.getTitle(), state.getTypeId(), state - .getMimeType(), state.getStatus(), stateToken, container.getStateToken(), rights, false); - final ActionItemCollection<StateToken> containerActions = actionRegistry.getCurrentActions(container - .getStateToken(), container.getTypeId(), session.isLogged(), containerRights, true); - actionItems.addAll(containerActions); - actionItems.addAll(contentActions); + // Process our current content/container + final ActionItemCollection<StateToken> actionItems = new ActionItemCollection<StateToken>(); + if (state.hasDocument()) { + rights = state.getContentRights(); + final ActionItemCollection<StateToken> contentActions = addItem(state.getTitle(), state.getTypeId(), state + .getMimeType(), state.getStatus(), stateToken, container.getStateToken(), rights, false); + final ActionItemCollection<StateToken> containerActions = actionRegistry.getCurrentActions(container + .getStateToken(), container.getTypeId(), session.isLogged(), containerRights, true); + actionItems.addAll(containerActions); + actionItems.addAll(contentActions); - } else { - rights = containerRights; - final ActionItemCollection<StateToken> containerActions = addItem(container.getName(), container - .getTypeId(), null, ContentStatusDTO.publishedOnline, container.getStateToken(), container - .getStateToken().clone().setFolder(container.getParentFolderId()), containerRights, false); - actionItems.addAll(containerActions); - } + } else { + rights = containerRights; + final ActionItemCollection<StateToken> containerActions = addItem(container.getName(), container + .getTypeId(), null, ContentStatusDTO.publishedOnline, container.getStateToken(), container + .getStateToken().clone().setFolder(container.getParentFolderId()), containerRights, false); + actionItems.addAll(containerActions); + } - actionsByItem.put(stateToken, actionItems); - // Process container childs - createChildItems(container, containerRights); + actionsByItem.put(stateToken, actionItems); + // Process container childs + createChildItems(container, containerRights); - // Finaly - if (mustEditOnNextStateChange()) { - // Code smell - selectItem(stateToken); - editItem(stateToken); - setEditOnNextStateChange(false); - } else { - if (select) { - selectItem(stateToken); - } - } - toolbar.attach(); + // Finaly + if (mustEditOnNextStateChange()) { + // Code smell + selectItem(stateToken); + editItem(stateToken); + setEditOnNextStateChange(false); + } else { + if (select) { + selectItem(stateToken); + } + } + toolbar.attach(); } protected void clear() { - toolbar.clear(); - view.clear(); - actionsByItem.clear(); + toolbar.clear(); + view.clear(); + actionsByItem.clear(); } private ActionItemCollection<StateToken> addItem(final String title, final String contentTypeId, - final BasicMimeTypeDTO mimeType, final ContentStatusDTO status, final StateToken stateToken, - final StateToken parentStateToken, final AccessRightsDTO rights, final boolean isNodeSelected) { + final BasicMimeTypeDTO mimeType, final ContentStatusDTO status, final StateToken stateToken, + final StateToken parentStateToken, final AccessRightsDTO rights, final boolean isNodeSelected) { - final ActionItemCollection<StateToken> toolbarActions = actionRegistry.getCurrentActions(stateToken, - contentTypeId, session.isLogged(), rights, true); + final ActionItemCollection<StateToken> toolbarActions = actionRegistry.getCurrentActions(stateToken, + contentTypeId, session.isLogged(), rights, true); - final String contentTypeIcon = contentTypeId.equals(TYPE_FOLDER) ? null : contentIconsRegistry - .getContentTypeIcon(contentTypeId, mimeType); - final ContextNavigatorItem item = new ContextNavigatorItem(genId(stateToken), genId(parentStateToken), - contentTypeIcon, title, status, stateToken, dragDropContentRegistry.isDraggable(contentTypeId, rights - .isAdministrable()), dragDropContentRegistry.isDroppable(contentTypeId, rights - .isAdministrable()), actionRegistry.getCurrentActions(stateToken, contentTypeId, session - .isLogged(), rights, false)); - view.addItem(item); - return toolbarActions; + final String contentTypeIcon = getIcon(stateToken, contentTypeId, mimeType); + final String tooltip = getTooltip(stateToken, mimeType); + final ContextNavigatorItem item = new ContextNavigatorItem(genId(stateToken), genId(parentStateToken), + contentTypeIcon, title, tooltip, status, stateToken, dragDropContentRegistry.isDraggable(contentTypeId, + rights.isAdministrable()), dragDropContentRegistry.isDroppable(contentTypeId, rights + .isAdministrable()), actionRegistry.getCurrentActions(stateToken, contentTypeId, session + .isLogged(), rights, false)); + view.addItem(item); + return toolbarActions; } private void createChildItems(final ContainerDTO container, final AccessRightsDTO containerRights) { - for (final ContentSimpleDTO content : container.getContents()) { - addItem(content.getTitle(), content.getTypeId(), content.getMimeType(), content.getStatus(), content - .getStateToken(), content.getStateToken().clone().clearDocument(), content.getRights(), false); - } + for (final ContentSimpleDTO content : container.getContents()) { + addItem(content.getTitle(), content.getTypeId(), content.getMimeType(), content.getStatus(), content + .getStateToken(), content.getStateToken().clone().clearDocument(), content.getRights(), false); + } - for (final ContainerSimpleDTO siblingFolder : container.getChilds()) { - addItem(siblingFolder.getName(), siblingFolder.getTypeId(), null, ContentStatusDTO.publishedOnline, - siblingFolder.getStateToken(), siblingFolder.getStateToken().clone().setFolder( - siblingFolder.getParentFolderId()), containerRights, false); - } + for (final ContainerSimpleDTO siblingFolder : container.getChilds()) { + addItem(siblingFolder.getName(), siblingFolder.getTypeId(), null, ContentStatusDTO.publishedOnline, + siblingFolder.getStateToken(), siblingFolder.getStateToken().clone().setFolder( + siblingFolder.getParentFolderId()), containerRights, false); + } } private void createTreePath(final StateToken state, final ContainerSimpleDTO[] absolutePath, - final AccessRightsDTO rights) { - for (int i = 0; i < absolutePath.length; i++) { - final ContainerSimpleDTO folder = absolutePath[i]; - final StateToken folderStateToken = folder.getStateToken(); - final StateToken parentStateToken = state.clone().clearDocument().setFolder(folder.getParentFolderId()); + final AccessRightsDTO rights) { + for (final ContainerSimpleDTO folder : absolutePath) { + final StateToken folderStateToken = folder.getStateToken(); + final StateToken parentStateToken = state.clone().clearDocument().setFolder(folder.getParentFolderId()); - if (folder.getParentFolderId() != null) { - addItem(folder.getName(), folder.getTypeId(), null, ContentStatusDTO.publishedOnline, folderStateToken, - parentStateToken, rights, false); - } else { - // Root must be already created - } - } + if (folder.getParentFolderId() != null) { + addItem(folder.getName(), folder.getTypeId(), null, ContentStatusDTO.publishedOnline, folderStateToken, + parentStateToken, rights, false); + } else { + // Root must be already created + } + } } private String genId(final StateToken token) { - return "k-" + token.toString().replace(StateToken.SEPARATOR, "-"); + return "k-" + token.toString().replace(StateToken.SEPARATOR, "-"); } + private String getIcon(final StateToken token, final String contentTypeId, final BasicMimeTypeDTO mimeType) { + if (contentTypeId.equals(TYPE_FOLDER)) { + return null; + } else if (!useGenericImageIcon && mimeType != null && mimeType.getType().equals("image")) { + return downloadUtilsProvider.get().getImageResizedUrl(token, ImageSize.ico); + } else { + return contentIconsRegistry.getContentTypeIcon(contentTypeId, mimeType); + } + } + + private String getTooltip(StateToken token, BasicMimeTypeDTO mimeType) { + if (mimeType != null && mimeType.getType().equals("image")) { + return KuneUiUtils.genQuickTipWithImage(downloadUtilsProvider.get().getImageResizedUrl(token, + ImageSize.thumb)); + } else { + return null; + } + } + } Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2008-10-15 14:12:54 UTC (rev 911) +++ trunk/src/main/resources/kune.properties 2008-10-15 17:33:40 UTC (rev 912) @@ -33,5 +33,4 @@ kune.images.resizewidth = 400 kune.images.thumbsize = 100 kune.images.cropsize = 85 - kune.images.iconsize = 16

1 0

r911 - in trunk/src: main/java/org/ourproject/kune/docs/client main/java/org/ourproject/kune/docs/client/cnt/reader main/java/org/ourproject/kune/docs/client/cnt/reader/ui main/java/org/ourproject/kune/platf/client/ui/download main/java/org/ourproject/kune/platf/server/manager/impl main/java/org/ourproject/kune/workspace/client/entitylogo test/java/org/ourproject/kune/platf/server/manager/impl
by vjrj 15 Oct '08

15 Oct '08

Author: vjrj Date: 2008-10-15 16:12:54 +0200 (Wed, 15 Oct 2008) New Revision: 911 Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/ImageSize.java Removed: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderView.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/ui/DocumentReaderPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUtils.java trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoPanel.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUtilsTest.java Log: Incomplete - task Image thumbs/icons in client Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-10-15 14:12:54 UTC (rev 911) @@ -58,77 +58,84 @@ @Override public void onLoad() { - register(ToolGroup.class, new Factory<DocumentClientTool>(DocumentClientTool.class) { - public DocumentClientTool create() { - $(DocumentClientActions.class); - return new DocumentClientTool($(I18nUITranslationService.class), $(ToolSelector.class), - $(WsThemePresenter.class), $(WorkspaceSkeleton.class), $$(DocumentContext.class), - $$(ContentServiceAsync.class), $(ContentActionRegistry.class), - $(DragDropContentRegistry.class), $(ContentIconsRegistry.class)); - } - }); + register(ToolGroup.class, new Factory<DocumentClientTool>(DocumentClientTool.class) { + @Override + public DocumentClientTool create() { + $(DocumentClientActions.class); + return new DocumentClientTool($(I18nUITranslationService.class), $(ToolSelector.class), + $(WsThemePresenter.class), $(WorkspaceSkeleton.class), $$(DocumentContext.class), + $$(ContentServiceAsync.class), $(ContentActionRegistry.class), + $(DragDropContentRegistry.class), $(ContentIconsRegistry.class)); + } + }); - register(ToolGroup.class, new Factory<DocumentClientActions>(DocumentClientActions.class) { - public DocumentClientActions create() { - return new DocumentClientActions($(I18nUITranslationService.class), $(ContextNavigator.class), - $(Session.class), $(StateManager.class), $$(ContentServiceAsync.class), - $$(GroupServiceAsync.class), $$(FileUploader.class), $(ContentActionRegistry.class), - $(ContextActionRegistry.class), $$(FileDownloadUtils.class), $(EntityLogo.class), - $$(TextEditor.class), $(KuneErrorHandler.class), $(DocumentContent.class)); - } - }); + register(ToolGroup.class, new Factory<DocumentClientActions>(DocumentClientActions.class) { + @Override + public DocumentClientActions create() { + return new DocumentClientActions($(I18nUITranslationService.class), $(ContextNavigator.class), + $(Session.class), $(StateManager.class), $$(ContentServiceAsync.class), + $$(GroupServiceAsync.class), $$(FileUploader.class), $(ContentActionRegistry.class), + $(ContextActionRegistry.class), $$(FileDownloadUtils.class), $(EntityLogo.class), + $$(TextEditor.class), $(KuneErrorHandler.class), $(DocumentContent.class)); + } + }); - register(ToolGroup.class, new Factory<DocumentContent>(DocumentContent.class) { - public DocumentContent create() { - final ActionToolbarPanel<StateToken> contentNavigatorToolbar = new ActionToolbarPanel<StateToken>( - ActionToolbarPanel.Position.content, $$(ActionManager.class), $(WorkspaceSkeleton.class)); - final ActionToolbar<StateToken> toolbar = new ActionToolbarPresenter<StateToken>( - contentNavigatorToolbar); + register(ToolGroup.class, new Factory<DocumentContent>(DocumentContent.class) { + @Override + public DocumentContent create() { + final ActionToolbarPanel<StateToken> contentNavigatorToolbar = new ActionToolbarPanel<StateToken>( + ActionToolbarPanel.Position.content, $$(ActionManager.class), $(WorkspaceSkeleton.class)); + final ActionToolbar<StateToken> toolbar = new ActionToolbarPresenter<StateToken>( + contentNavigatorToolbar); - final DocumentContentPresenter presenter = new DocumentContentPresenter($(StateManager.class), - $(Session.class), $$(DocumentReader.class), $$(TextEditor.class), $$(FolderViewer.class), - toolbar, $(ContentActionRegistry.class)); - final DocumentContentPanel panel = new DocumentContentPanel($(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); + final DocumentContentPresenter presenter = new DocumentContentPresenter($(StateManager.class), + $(Session.class), $$(DocumentReader.class), $$(TextEditor.class), $$(FolderViewer.class), + toolbar, $(ContentActionRegistry.class)); + final DocumentContentPanel panel = new DocumentContentPanel($(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); - register(Singleton.class, new Factory<AdminContext>(AdminContext.class) { - public AdminContext create() { - final AdminContextPresenter presenter = new AdminContextPresenter($(Session.class), - $(StateManager.class), $$(TagsSummary.class), $$(ContentServiceAsync.class), - $(EntityTitle.class), $(EntitySubTitle.class)); - final AdminContextView view = new AdminContextPanel(presenter, $(I18nUITranslationService.class)); - presenter.init(view); - return presenter; - } - }); + register(Singleton.class, new Factory<AdminContext>(AdminContext.class) { + @Override + public AdminContext create() { + final AdminContextPresenter presenter = new AdminContextPresenter($(Session.class), + $(StateManager.class), $$(TagsSummary.class), $$(ContentServiceAsync.class), + $(EntityTitle.class), $(EntitySubTitle.class)); + final AdminContextView view = new AdminContextPanel(presenter, $(I18nUITranslationService.class)); + presenter.init(view); + return presenter; + } + }); - register(ToolGroup.class, new Factory<DocumentContext>(DocumentContext.class) { - public DocumentContext create() { - final DocumentContextPresenter presenter = new DocumentContextPresenter($(StateManager.class), - $$(ContextNavigator.class), $$(AdminContext.class)); - final DocumentContextPanel panel = new DocumentContextPanel($(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); + register(ToolGroup.class, new Factory<DocumentContext>(DocumentContext.class) { + @Override + public DocumentContext create() { + final DocumentContextPresenter presenter = new DocumentContextPresenter($(StateManager.class), + $$(ContextNavigator.class), $$(AdminContext.class)); + final DocumentContextPanel panel = new DocumentContextPanel($(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); - register(Singleton.class, new Factory<DocumentReader>(DocumentReader.class) { - public DocumentReader create() { - final DocumentReaderView view = new DocumentReaderPanel($(WorkspaceSkeleton.class)); - final DocumentReaderPresenter presenter = new DocumentReaderPresenter($(Session.class), view); - return presenter; - } - }); + register(Singleton.class, new Factory<DocumentReader>(DocumentReader.class) { + @Override + public DocumentReader create() { + final DocumentReaderView view = new DocumentReaderPanel($(WorkspaceSkeleton.class)); + final DocumentReaderPresenter presenter = new DocumentReaderPresenter(view, $$(FileDownloadUtils.class)); + return presenter; + } + }); - register(Singleton.class, new Factory<FolderViewer>(FolderViewer.class) { - public FolderViewer create() { - final FolderViewerView view = new FolderViewerPanel(); - final FolderViewerPresenter presenter = new FolderViewerPresenter(view); - return presenter; - } - }); + register(Singleton.class, new Factory<FolderViewer>(FolderViewer.class) { + @Override + public FolderViewer create() { + final FolderViewerView view = new FolderViewerPanel(); + final FolderViewerPresenter presenter = new FolderViewerPresenter(view); + return presenter; + } + }); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java 2008-10-15 14:12:54 UTC (rev 911) @@ -24,15 +24,18 @@ import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO; 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.download.ImageSize; +import com.calclab.suco.client.ioc.Provider; + public class DocumentReaderPresenter implements DocumentReader { private final DocumentReaderView view; - private final Session session; + private final Provider<FileDownloadUtils> downloadProvider; - public DocumentReaderPresenter(final Session session, final DocumentReaderView view) { - this.session = session; + public DocumentReaderPresenter(final DocumentReaderView view, final Provider<FileDownloadUtils> downloadProvider) { this.view = view; + this.downloadProvider = downloadProvider; } public View getView() { @@ -43,10 +46,10 @@ final BasicMimeTypeDTO mimeType) { if (typeId.equals(DocumentClientTool.TYPE_UPLOADEDFILE)) { if (mimeType != null) { - final String url = "/kune/servlets/FileDownloadManager?token=" + token + "&hash=" - + session.getUserHash(); + FileDownloadUtils fileDownloadUtils = downloadProvider.get(); if (mimeType.getType().equals("image")) { - view.setContent("<img src=\"" + url + "\">"); + view.showImage(fileDownloadUtils.getImageUrl(token), fileDownloadUtils.getImageResizedUrl(token, + ImageSize.sized)); } else if (mimeType.toString().equals("text/plain") || mimeType.toString().equals("application/pdf")) { view.setContent(text); } else { Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderView.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderView.java 2008-10-15 14:12:54 UTC (rev 911) @@ -26,4 +26,6 @@ public void setContent(String content); + public void showImage(String imageUrl, String imageResizedUrl); + } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/ui/DocumentReaderPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/ui/DocumentReaderPanel.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/ui/DocumentReaderPanel.java 2008-10-15 14:12:54 UTC (rev 911) @@ -23,20 +23,47 @@ import org.ourproject.kune.docs.client.cnt.reader.DocumentReaderView; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.Widget; public class DocumentReaderPanel implements DocumentReaderView { private final WorkspaceSkeleton ws; public DocumentReaderPanel(final WorkspaceSkeleton ws) { - this.ws = ws; + this.ws = ws; } public void setContent(final String content) { - final HTML html = new HTML(content); - html.setStyleName("kune-Content-Main"); - html.addStyleName("kune-Margin-7-trbl"); - ws.getEntityWorkspace().setContent(html); + final HTML html = new HTML(content); + setDefStyle(html); + ws.getEntityWorkspace().setContent(html); } + + public void showImage(String imageUrl, String imageResizedUrl) { + final Image imgOrig = new Image(imageUrl); + final Image imgResized = new Image(imageResizedUrl); + setDefStyle(imgOrig); + setDefStyle(imgResized); + imgOrig.addStyleName("kune-pointer"); + imgResized.addStyleName("kune-pointer"); + imgResized.addClickListener(new ClickListener() { + public void onClick(Widget sender) { + ws.getEntityWorkspace().setContent(imgOrig); + } + }); + imgOrig.addClickListener(new ClickListener() { + public void onClick(Widget sender) { + ws.getEntityWorkspace().setContent(imgResized); + } + }); + ws.getEntityWorkspace().setContent(imgResized); + } + + private void setDefStyle(final Widget widget) { + widget.setStyleName("kune-Content-Main"); + widget.addStyleName("kune-Margin-7-trbl"); + } } Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java 2008-10-15 14:12:54 UTC (rev 911) @@ -1,7 +0,0 @@ -package org.ourproject.kune.platf.client.ui.download; - -public interface FileConstants { - final String ICON_SUFFIX = ".ico."; - final String SIZED_SUFFIX = ".sized."; - final String THUMB_SUFFIX = ".thumb."; -} 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 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2008-10-15 14:12:54 UTC (rev 911) @@ -13,22 +13,26 @@ private final Session session; public FileDownloadUtils(final Session session) { - this.session = session; + this.session = session; } public void downloadFile(final StateToken token) { - final String url = calculateUrl(token, true); - DOM.setElementAttribute(RootPanel.get("__download").getElement(), "src", url); + final String url = calculateUrl(token, true); + DOM.setElementAttribute(RootPanel.get("__download").getElement(), "src", url); } + public String getImageResizedUrl(final StateToken token, ImageSize imageSize) { + return calculateUrl(token, false) + "&" + FileParams.IMGSIZE + "=" + imageSize; + } + public String getImageUrl(final StateToken token) { - return calculateUrl(token, false); + return calculateUrl(token, false); } private String calculateUrl(final StateToken token, final boolean download) { - final String url = DOWNLOADSERVLET + "?token=" + token + "&hash=" + session.getUserHash() + "&download=" - + (download ? "true" : "false"); - return url; + final String url = DOWNLOADSERVLET + "?" + FileParams.TOKEN + "=" + token + "&" + FileParams.HASH + "=" + + session.getUserHash() + "&" + FileParams.DOWNLOAD + "=" + (download ? "true" : "false"); + return url; } } Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java (from rev 910, trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java 2008-10-15 14:12:54 UTC (rev 911) @@ -0,0 +1,8 @@ +package org.ourproject.kune.platf.client.ui.download; + +public interface FileParams { + final String HASH = "hash"; + final String TOKEN = "token"; + final String DOWNLOAD = "download"; + final String IMGSIZE = "imgsize"; +} Property changes on: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java ___________________________________________________________________ Name: svn:mergeinfo + Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/ImageSize.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/ImageSize.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/ImageSize.java 2008-10-15 14:12:54 UTC (rev 911) @@ -0,0 +1,5 @@ +package org.ourproject.kune.platf.client.ui.download; + +public enum ImageSize { + sized, thumb, ico +} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileDownloadManager.java 2008-10-15 14:12:54 UTC (rev 911) @@ -15,6 +15,8 @@ import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.errors.ContentNotFoundException; +import org.ourproject.kune.platf.client.ui.download.FileParams; +import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.server.access.AccessRol; import org.ourproject.kune.platf.server.auth.ActionLevel; import org.ourproject.kune.platf.server.auth.Authenticated; @@ -42,67 +44,78 @@ KuneProperties kuneProperties; public void returnFile(final String filename, final OutputStream out) throws FileNotFoundException, IOException { - InputStream in = null; - try { - in = new BufferedInputStream(new FileInputStream(filename)); - final byte[] buf = new byte[4 * 1024]; // 4K buffer - int bytesRead; - while ((bytesRead = in.read(buf)) != -1) { - out.write(buf, 0, bytesRead); - } - } finally { - if (in != null) { - in.close(); - } - } + InputStream in = null; + try { + in = new BufferedInputStream(new FileInputStream(filename)); + final byte[] buf = new byte[4 * 1024]; // 4K buffer + int bytesRead; + while ((bytesRead = in.read(buf)) != -1) { + out.write(buf, 0, bytesRead); + } + } finally { + if (in != null) { + in.close(); + } + } } @Override protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, - IOException { + IOException { - final String userHash = req.getParameter("hash"); - final StateToken stateToken = new StateToken(req.getParameter("token")); - final String downloadS = req.getParameter("download"); - final boolean download = downloadS != null && downloadS.equals("true") ? true : false; - final Content cnt = getContentForDownload(userHash, stateToken); + final String userHash = req.getParameter(FileParams.HASH); + final StateToken stateToken = new StateToken(req.getParameter(FileParams.TOKEN)); + final String downloadS = req.getParameter(FileParams.DOWNLOAD); + String imageSizeS = req.getParameter(FileParams.IMGSIZE); + final ImageSize imgsize = imageSizeS == null ? null : ImageSize.valueOf(imageSizeS); + final boolean download = downloadS != null && downloadS.equals("true") ? true : false; - final String absDir = kuneProperties.get(KuneProperties.UPLOAD_LOCATION) + FileUtils.toDir(stateToken); - final String filename = cnt.getFilename(); - final String absFilename = absDir + filename; + final Content cnt = getContentForDownload(userHash, stateToken); - doBuildResp(resp, absFilename, cnt.getTitle(), cnt.getMimeType(), FileUtils - .getFileNameExtension(filename, true), download); + final String absDir = kuneProperties.get(KuneProperties.UPLOAD_LOCATION) + FileUtils.toDir(stateToken); + String filename = cnt.getFilename(); + String extension = FileUtils.getFileNameExtension(filename, true); + BasicMimeType mimeType = cnt.getMimeType(); + + if (mimeType.getType().equals("image")) { + String imgsizePrefix = imgsize == null ? "" : "." + imgsize; + String filenameWithoutExtension = FileUtils.getFileNameWithoutExtension(filename, extension); + filename = filenameWithoutExtension + imgsizePrefix + extension; + } + + final String absFilename = absDir + filename; + + doBuildResp(resp, absFilename, cnt.getTitle(), mimeType, extension, download); } private void doBuildResp(final HttpServletResponse resp, final String filename, final String otherName, - final BasicMimeType mimeType, final String extension, final boolean download) throws FileNotFoundException, - IOException { - final File file = new File(filename); + final BasicMimeType mimeType, final String extension, final boolean download) throws FileNotFoundException, + IOException { + final File file = new File(filename); - resp.setContentLength((int) file.length()); - if (mimeType == null || download) { - resp.setContentType("application/x-download"); - } else if (mimeType.getType().equals("image") || mimeType.toString().equals("text/plain")) { - resp.setContentType(mimeType.toString()); - } else { - resp.setContentType("application/x-download"); - } - resp.setHeader("Content-Disposition", "attachment; filename=\"" + otherName + extension + "\""); + resp.setContentLength((int) file.length()); + if (mimeType == null || download) { + resp.setContentType("application/x-download"); + } else if (mimeType.getType().equals("image")) { + resp.setContentType(mimeType.toString()); + } else { + resp.setContentType("application/x-download"); + } + resp.setHeader("Content-Disposition", "attachment; filename=\"" + otherName + extension + "\""); - final OutputStream out = resp.getOutputStream(); - returnFile(filename, out); + final OutputStream out = resp.getOutputStream(); + returnFile(filename, out); } @Authenticated(mandatory = false) @Authorizated(accessRolRequired = AccessRol.Viewer, actionLevel = ActionLevel.content) private Content getContentForDownload(final String userHash, final StateToken stateToken) throws ServletException { - try { - return contentManager.find(ContentUtils.parseId(stateToken.getDocument())); - } catch (final ContentNotFoundException e) { - // what response to send in this case ? - throw new ServletException(); - } + try { + return contentManager.find(ContentUtils.parseId(stateToken.getDocument())); + } catch (final ContentNotFoundException e) { + // what response to send in this case ? + throw new ServletException(); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java 2008-10-15 14:12:54 UTC (rev 911) @@ -24,7 +24,7 @@ import org.ourproject.kune.docs.server.DocumentServerTool; import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.services.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.download.FileConstants; +import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.client.ui.upload.FileUploader; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.access.AccessRol; @@ -70,7 +70,7 @@ @Override @SuppressWarnings( { "unchecked", "deprecation" }) - protected void doPost(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, + protected void doPost(final HttpServletRequest req, final HttpServletResponse response) throws ServletException, IOException { JSONObject jsonResponse = createSuccessResponse(); @@ -122,10 +122,13 @@ e.printStackTrace(); } - final Writer w = new OutputStreamWriter(resp.getOutputStream()); + final Writer w = new OutputStreamWriter(response.getOutputStream()); + response.setCharacterEncoding("utf-8"); + response.setContentType("text/html"); + // response.setContentType("text/json"); w.write(jsonResponse.toString()); w.close(); - resp.setStatus(HttpServletResponse.SC_OK); + response.setStatus(HttpServletResponse.SC_OK); } @Authenticated @@ -205,9 +208,9 @@ String fileOrig = absDir + filename; String withoutExtension = FileUtils.getFileNameWithoutExtension(filename, extension); - String resizeName = absDir + withoutExtension + FileConstants.SIZED_SUFFIX + extension; - String thumbName = absDir + withoutExtension + FileConstants.THUMB_SUFFIX + extension; - String iconName = absDir + withoutExtension + FileConstants.ICON_SUFFIX + extension; + String resizeName = absDir + withoutExtension + "." + ImageSize.sized + "." + extension; + String thumbName = absDir + withoutExtension + "." + ImageSize.thumb + "." + extension; + String iconName = absDir + withoutExtension + "." + ImageSize.ico + "." + extension; int resizeWidth = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_RESIZEWIDTH)); int thumbSize = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_THUMBSIZE)); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUtils.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUtils.java 2008-10-15 14:12:54 UTC (rev 911) @@ -16,59 +16,60 @@ * @return */ public static String getFileNameExtension(final String filename, final boolean withDot) { - // also we can use FilenameUtils - if (filename == null) { - return ""; - } - final int dotIndex = filename.lastIndexOf("."); - if (dotIndex == -1 || dotIndex == 0) { - return ""; - } else { - if (withDot) { - final String ext = filename.substring(dotIndex); - return ext.length() == 1 ? "" : ext; - } else { - return filename.substring(dotIndex + 1); - } - } + // also we can use FilenameUtils + if (filename == null) { + return ""; + } + final int dotIndex = filename.lastIndexOf("."); + if (dotIndex == -1 || dotIndex == 0) { + return ""; + } else { + if (withDot) { + final String ext = filename.substring(dotIndex); + return ext.length() == 1 ? "" : ext; + } else { + return filename.substring(dotIndex + 1); + } + } } public static String getFileNameWithoutExtension(final String fileName, final String extension) { - final int extlength = extension.length(); - if (extlength > 0) { - return fileName.substring(0, fileName.length() - extlength - 1); - } else { - return fileName; - } + final int extlength = extension.length(); + if (extlength > 0) { + boolean withDot = extension.charAt(0) == '.'; + return fileName.substring(0, fileName.length() - extlength - (withDot ? 0 : 1)); + } else { + return fileName; + } } public static String getNextSequentialFileName(final String fileName) { - final int lastSpace = fileName.lastIndexOf(" "); - if (lastSpace != -1) { - final String suffix = fileName.substring(lastSpace + 1); - try { - final Integer i = new Integer(suffix); - return fileName.substring(0, lastSpace + 1) + (i + 1); - } catch (final NumberFormatException e) { - } - } - return fileName + " 1"; + final int lastSpace = fileName.lastIndexOf(" "); + if (lastSpace != -1) { + final String suffix = fileName.substring(lastSpace + 1); + try { + final Integer i = new Integer(suffix); + return fileName.substring(0, lastSpace + 1) + (i + 1); + } catch (final NumberFormatException e) { + } + } + return fileName + " 1"; } public static String getNextSequentialFileName(final String fileName, boolean preserveExtension) { - if (!preserveExtension) { - return getNextSequentialFileName(fileName); - } - final int dotIndex = fileName.lastIndexOf("."); - if (dotIndex == -1 || dotIndex == 0) { - return getNextSequentialFileName(fileName); - } else { - final String ext = fileName.substring(dotIndex); - return getNextSequentialFileName(fileName.substring(0, dotIndex)) + ext; - } + if (!preserveExtension) { + return getNextSequentialFileName(fileName); + } + final int dotIndex = fileName.lastIndexOf("."); + if (dotIndex == -1 || dotIndex == 0) { + return getNextSequentialFileName(fileName); + } else { + final String ext = fileName.substring(dotIndex); + return getNextSequentialFileName(fileName.substring(0, dotIndex)) + ext; + } } public static String toDir(final StateToken stateToken) { - return SLASH + stateToken.getGroup() + SLASH + stateToken.getTool() + SLASH + stateToken.getFolder() + SLASH; + return SLASH + stateToken.getGroup() + SLASH + stateToken.getTool() + SLASH + stateToken.getFolder() + SLASH; } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoPanel.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entitylogo/EntityLogoPanel.java 2008-10-15 14:12:54 UTC (rev 911) @@ -42,59 +42,59 @@ public class EntityLogoPanel extends SimplePanel implements EntityLogoView { class EntityTextLogo extends VerticalPanel { - private static final int GROUP_NAME_LIMIT_SIZE = 90; - private static final String LOGO_SMALL_FONT_SIZE = "108%"; - private static final String LOGO_DEFAULT_FONT_SIZE = "167%"; - private final Label defTextLogoLabel; - private final Hyperlink defTextPutYourLogoHL; - private final HorizontalPanel putYourLogoHP; + private static final int GROUP_NAME_LIMIT_SIZE = 90; + private static final String LOGO_SMALL_FONT_SIZE = "108%"; + private static final String LOGO_DEFAULT_FONT_SIZE = "167%"; + private final Label defTextLogoLabel; + private final Hyperlink defTextPutYourLogoHL; + private final HorizontalPanel putYourLogoHP; - public EntityTextLogo() { - // Initialize - super(); - defTextLogoLabel = new Label(); - final HTML expandCell = new HTML("<b></b>"); - putYourLogoHP = new HorizontalPanel(); - defTextPutYourLogoHL = new Hyperlink(); + public EntityTextLogo() { + // Initialize + super(); + defTextLogoLabel = new Label(); + final HTML expandCell = new HTML("<b></b>"); + putYourLogoHP = new HorizontalPanel(); + defTextPutYourLogoHL = new Hyperlink(); - // Layout - add(defTextLogoLabel); - add(putYourLogoHP); - putYourLogoHP.add(expandCell); - putYourLogoHP.add(defTextPutYourLogoHL); + // Layout + add(defTextLogoLabel); + add(putYourLogoHP); + putYourLogoHP.add(expandCell); + putYourLogoHP.add(defTextPutYourLogoHL); - // Set properties - defTextPutYourLogoHL.setText(i18n.t("Put Your Logo Here")); - defTextPutYourLogoHL.addClickListener(new ClickListener() { - public void onClick(final Widget sender) { - final InfoDialog infoDialog = new InfoDialog( - "Configure your group logo", - "Howto configure your group logo", - "For configure your group's logo just add an image to your group contents and select it as your group's logo (see menu 'File'). Whe are working into a more direct way to do that.", - i18n.t("Ok"), false, false, 300, 200); - infoDialog.show(); - } - }); - expandCell.setWidth("100%"); - putYourLogoHP.setCellWidth(expandCell, "100%"); - // TODO: link to configure the logo - setStylePrimaryName("k-entitytextlogo"); - setDefaultText(""); - } + // Set properties + defTextPutYourLogoHL.setText(i18n.t("Put Your Logo Here")); + defTextPutYourLogoHL.addClickListener(new ClickListener() { + public void onClick(final Widget sender) { + final InfoDialog infoDialog = new InfoDialog( + "Configure your group logo", + "Howto configure your group logo", + "For configure your group's logo just add an image to your group contents and select it as your group's logo (see menu 'File'). Whe are working into a more direct way to do that.", + i18n.t("Ok"), false, false, 300, 200); + infoDialog.show(); + } + }); + expandCell.setWidth("100%"); + putYourLogoHP.setCellWidth(expandCell, "100%"); + // TODO: link to configure the logo + setStylePrimaryName("k-entitytextlogo"); + setDefaultText(""); + } - public void setDefaultText(final String text) { - if (text.length() > GROUP_NAME_LIMIT_SIZE) { - DOM.setStyleAttribute(defTextLogoLabel.getElement(), "fontSize", LOGO_SMALL_FONT_SIZE); - } else { - DOM.setStyleAttribute(defTextLogoLabel.getElement(), "fontSize", LOGO_DEFAULT_FONT_SIZE); - } - defTextLogoLabel.setText(text); + public void setDefaultText(final String text) { + if (text.length() > GROUP_NAME_LIMIT_SIZE) { + DOM.setStyleAttribute(defTextLogoLabel.getElement(), "fontSize", LOGO_SMALL_FONT_SIZE); + } else { + DOM.setStyleAttribute(defTextLogoLabel.getElement(), "fontSize", LOGO_DEFAULT_FONT_SIZE); + } + defTextLogoLabel.setText(text); - } + } - public void setPutYourLogoVisible(final boolean visible) { - putYourLogoHP.setVisible(visible); - } + public void setPutYourLogoVisible(final boolean visible) { + putYourLogoHP.setVisible(visible); + } } @@ -103,52 +103,52 @@ private EntityTextLogo entityTextLogo; private final I18nTranslationService i18n; - private final Provider<FileDownloadUtils> dowloadProvider; + private final Provider<FileDownloadUtils> downloadProvider; public EntityLogoPanel(final I18nTranslationService i18n, final WorkspaceSkeleton ws, - final Provider<FileDownloadUtils> dowloadProvider) { - this.i18n = i18n; - this.dowloadProvider = dowloadProvider; - ws.addToEntityMainHeader(this); + final Provider<FileDownloadUtils> dowloadProvider) { + this.i18n = i18n; + this.downloadProvider = dowloadProvider; + ws.addToEntityMainHeader(this); } public void setLogo(final StateToken stateToken, final boolean clipped) { - clear(); - final String imageUrl = dowloadProvider.get().getImageUrl(stateToken); - Image logo; - if (clipped) { - logo = new Image(imageUrl, 0, 0, LOGO_ICON_DEFAULT_WIDTH, LOGO_ICON_DEFAULT_HEIGHT); - } else { + clear(); + final String imageUrl = downloadProvider.get().getImageUrl(stateToken); + Image logo; + if (clipped) { + logo = new Image(imageUrl, 0, 0, LOGO_ICON_DEFAULT_WIDTH, LOGO_ICON_DEFAULT_HEIGHT); + } else { - logo = new Image(imageUrl); - logo.setWidth("" + LOGO_ICON_DEFAULT_WIDTH); - logo.setHeight("" + LOGO_ICON_DEFAULT_HEIGHT); - } - add(logo); + logo = new Image(imageUrl); + logo.setWidth("" + LOGO_ICON_DEFAULT_WIDTH); + logo.setHeight("" + LOGO_ICON_DEFAULT_HEIGHT); + } + add(logo); } public void setLogo(final String groupName) { - clear(); - add(getEntityTextLogo()); - entityTextLogo.setDefaultText(groupName); + clear(); + add(getEntityTextLogo()); + entityTextLogo.setDefaultText(groupName); } public void setPutYourLogoVisible(final boolean visible) { - getEntityTextLogo().setPutYourLogoVisible(visible); + getEntityTextLogo().setPutYourLogoVisible(visible); } public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { - if (oldTheme != null) { - getEntityTextLogo().removeStyleDependentName(oldTheme.toString()); - } - getEntityTextLogo().addStyleDependentName(newTheme.toString()); + if (oldTheme != null) { + getEntityTextLogo().removeStyleDependentName(oldTheme.toString()); + } + getEntityTextLogo().addStyleDependentName(newTheme.toString()); } private EntityTextLogo getEntityTextLogo() { - if (entityTextLogo == null) { - this.entityTextLogo = new EntityTextLogo(); - } - return entityTextLogo; + if (entityTextLogo == null) { + this.entityTextLogo = new EntityTextLogo(); + } + return entityTextLogo; } } Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUtilsTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUtilsTest.java 2008-10-15 03:14:33 UTC (rev 910) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/FileUtilsTest.java 2008-10-15 14:12:54 UTC (rev 911) @@ -11,88 +11,98 @@ @Test public void dotFileRetSeq1() { - assertEquals("." + SIMPLE_FILE_NAME + " 1", FileUtils.getNextSequentialFileName("." + SIMPLE_FILE_NAME, true)); + assertEquals("." + SIMPLE_FILE_NAME + " 1", FileUtils.getNextSequentialFileName("." + SIMPLE_FILE_NAME, true)); } @Test public void dotFileRetSeq1IgnoreExt() { - assertEquals("." + SIMPLE_FILE_NAME + " 1", FileUtils.getNextSequentialFileName("." + SIMPLE_FILE_NAME, false)); + assertEquals("." + SIMPLE_FILE_NAME + " 1", FileUtils.getNextSequentialFileName("." + SIMPLE_FILE_NAME, false)); } @Test public void getExtensionBasic() { - assertEquals("someext", FileUtils.getFileNameExtension("file.name.with.someext", false)); + assertEquals("someext", FileUtils.getFileNameExtension("file.name.with.someext", false)); } @Test public void getExtensionWithDot() { - assertEquals("", FileUtils.getFileNameExtension("file name with no ext.", false)); + assertEquals("", FileUtils.getFileNameExtension("file name with no ext.", false)); } @Test public void getExtensionWithDotBasic() { - assertEquals(".someext", FileUtils.getFileNameExtension("file.name.with.someext", true)); + assertEquals(".someext", FileUtils.getFileNameExtension("file.name.with.someext", true)); } @Test public void getExtensionWithDotWithFinalDot() { - assertEquals("", FileUtils.getFileNameExtension("file name with no ext.", true)); + assertEquals("", FileUtils.getFileNameExtension("file name with no ext.", true)); } @Test public void getExtensionWithDotWithInitialDot() { - assertEquals("", FileUtils.getFileNameExtension(".file name with no ext", true)); + assertEquals("", FileUtils.getFileNameExtension(".file name with no ext", true)); } @Test public void getExtensionWithInitialDot() { - assertEquals("", FileUtils.getFileNameExtension(".file name with no ext", false)); + assertEquals("", FileUtils.getFileNameExtension(".file name with no ext", false)); } @Test public void testFileNameWExtensionSimple() { - assertEquals("test", FileUtils.getFileNameWithoutExtension("test.txt", "txt")); + assertEquals("test", FileUtils.getFileNameWithoutExtension("test.txt", "txt")); } @Test + public void testFileNameWExtensionSimpleWithDot() { + assertEquals("test", FileUtils.getFileNameWithoutExtension("test.txt", ".txt")); + } + + @Test public void testFileNameWithoutExtension() { - assertEquals("test", FileUtils.getFileNameWithoutExtension("test", "")); + assertEquals("test", FileUtils.getFileNameWithoutExtension("test", "")); } @Test + public void testFileNameWNoExtensionWithDot() { + assertEquals("test.", FileUtils.getFileNameWithoutExtension("test.", "")); + } + + @Test public void testGetFilenameExtNull() { - assertEquals("", FileUtils.getFileNameExtension(null, true)); + assertEquals("", FileUtils.getFileNameExtension(null, true)); } @Test public void testIfSeq101return102() { - assertEquals(SIMPLE_FILE_NAME + " 102", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + " 101")); + assertEquals(SIMPLE_FILE_NAME + " 102", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + " 101")); } @Test public void testIfSeq1return2() { - assertEquals(SIMPLE_FILE_NAME + " 2", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + " 1")); + assertEquals(SIMPLE_FILE_NAME + " 2", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + " 1")); } @Test public void testIfSeq1WithExtreturn2WithExt() { - assertEquals(SIMPLE_FILE_NAME + " 2" + EXT, FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + " 1" + EXT, - true)); + assertEquals(SIMPLE_FILE_NAME + " 2" + EXT, FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + " 1" + EXT, + true)); } @Test public void testNoSeqReturn1() { - assertEquals(SIMPLE_FILE_NAME + " 1", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME)); + assertEquals(SIMPLE_FILE_NAME + " 1", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME)); } @Test public void testNoSeqWithExtNotTakedIntoAccountReturn1() { - assertEquals(SIMPLE_FILE_NAME + EXT + " 1", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + EXT, false)); + assertEquals(SIMPLE_FILE_NAME + EXT + " 1", FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + EXT, false)); } @Test public void testNoSeqWithExtReturn1WithExt() { - assertEquals(SIMPLE_FILE_NAME + " 1" + EXT, FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + EXT, true)); + assertEquals(SIMPLE_FILE_NAME + " 1" + EXT, FileUtils.getNextSequentialFileName(SIMPLE_FILE_NAME + EXT, true)); } }

1 0

r910 - in trunk: . src/main/java/org/ourproject/kune/platf/client/ui/download src/main/java/org/ourproject/kune/platf/server/manager/impl src/main/java/org/ourproject/kune/platf/server/properties src/main/resources src/test/java/org/ourproject/kune/platf/server/manager/impl
by vjrj 15 Oct '08

15 Oct '08

Author: vjrj Date: 2008-10-15 05:14:33 +0200 (Wed, 15 Oct 2008) New Revision: 910 Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java Modified: trunk/INSTALL trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java trunk/src/main/resources/kune.properties trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java Log: Complete - task Images server utilities Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2008-10-14 13:39:30 UTC (rev 909) +++ trunk/INSTALL 2008-10-15 03:14:33 UTC (rev 910) @@ -57,6 +57,13 @@ - Install and run a openfire jabber server (see Appendix B for proper configuration of openfire) or ejabberd. +- Install jmagick-jni. In debian: apt-get install libjmagick6-jni (version 6.2.6-0) also you need or: + sudo ln -s /usr/lib/jni/libJMagick.so /usr/lib/libJMagick.so +or + set LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/jni in your test and in your webserver. + +in Windows maybe (not checked) you need to do something similar (copy the jmagick .dll of the same version in the Windows directory) + - Run jetty: mvn jetty:run -Dliquibase.should.run=false once started (and initialized the db), you can stop a run jetty with de db migrator to insert initial data and migrate: Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java 2008-10-14 13:39:30 UTC (rev 909) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java 2008-10-15 03:14:33 UTC (rev 910) @@ -0,0 +1,7 @@ +package org.ourproject.kune.platf.client.ui.download; + +public interface FileConstants { + final String ICON_SUFFIX = ".ico."; + final String SIZED_SUFFIX = ".sized."; + final String THUMB_SUFFIX = ".thumb."; +} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java 2008-10-14 13:39:30 UTC (rev 909) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/FileUploadManager.java 2008-10-15 03:14:33 UTC (rev 910) @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import magick.MagickException; import net.sf.json.JSONObject; import org.apache.commons.fileupload.FileItem; @@ -23,6 +24,7 @@ import org.ourproject.kune.docs.server.DocumentServerTool; import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.services.I18nTranslationService; +import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.platf.client.ui.upload.FileUploader; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.access.AccessRol; @@ -47,12 +49,12 @@ @RequestScoped public class FileUploadManager extends HttpServlet { + private static final long serialVersionUID = 1L; + public static final Log log = LogFactory.getLog(FileUploadManager.class); private static final String UTF8 = "UTF-8"; - private static final long serialVersionUID = 1L; - @Inject KuneProperties kuneProperties; @Inject @@ -69,126 +71,158 @@ @Override @SuppressWarnings( { "unchecked", "deprecation" }) protected void doPost(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, - IOException { + IOException { - JSONObject jsonResponse = createSuccessResponse(); + JSONObject jsonResponse = createSuccessResponse(); - final DiskFileItemFactory factory = new DiskFileItemFactory(); - // maximum size that will be stored in memory - factory.setSizeThreshold(4096); - // the location for saving data that is larger than getSizeThreshold() - factory.setRepository(new File("/tmp")); + final DiskFileItemFactory factory = new DiskFileItemFactory(); + // maximum size that will be stored in memory + factory.setSizeThreshold(4096); + // the location for saving data that is larger than getSizeThreshold() + factory.setRepository(new File("/tmp")); - if (!ServletFileUpload.isMultipartContent(req)) { - log.warn("Not a multipart upload"); - } + if (!ServletFileUpload.isMultipartContent(req)) { + log.warn("Not a multipart upload"); + } - final ServletFileUpload upload = new ServletFileUpload(factory); - // maximum size before a FileUploadException will be thrown - upload.setSizeMax(new Integer(kuneProperties.get(KuneProperties.UPLOAD_MAX_FILE_SIZE)) * 1024 * 1024); + final ServletFileUpload upload = new ServletFileUpload(factory); + // maximum size before a FileUploadException will be thrown + upload.setSizeMax(new Integer(kuneProperties.get(KuneProperties.UPLOAD_MAX_FILE_SIZE)) * 1024 * 1024); - try { - final List fileItems = upload.parseRequest(req); - String userHash = null; - StateToken stateToken = null; - String fileName = null; - FileItem file = null; - for (final Iterator iterator = fileItems.iterator(); iterator.hasNext();) { - final FileItem item = (FileItem) iterator.next(); - if (item.isFormField()) { - final String name = item.getFieldName(); - final String value = item.getString(); - log.info("name: " + name + " value: " + value); - if (name.equals(FileUploader.USERHASH)) { - userHash = value; - } - if (name.equals(FileUploader.CURRENT_STATE_TOKEN)) { - stateToken = new StateToken(value); - } - } else { - fileName = item.getName(); - log.info("file: " + fileName + " fieldName: " + item.getFieldName() + " size: " + item.getSize()); - file = item; - } - } - createUploadedFile(userHash, stateToken, fileName, file); - } catch (final FileUploadException e) { - jsonResponse = createJsonResponse(false, i18n.t("Error: File too large")); - } catch (final Exception e) { - jsonResponse = createJsonResponse(false, i18n.t("Error uploading file")); - log.info("Exception: " + e.getCause()); - e.printStackTrace(); - } + try { + final List fileItems = upload.parseRequest(req); + String userHash = null; + StateToken stateToken = null; + String fileName = null; + FileItem file = null; + for (final Iterator iterator = fileItems.iterator(); iterator.hasNext();) { + final FileItem item = (FileItem) iterator.next(); + if (item.isFormField()) { + final String name = item.getFieldName(); + final String value = item.getString(); + log.info("name: " + name + " value: " + value); + if (name.equals(FileUploader.USERHASH)) { + userHash = value; + } + if (name.equals(FileUploader.CURRENT_STATE_TOKEN)) { + stateToken = new StateToken(value); + } + } else { + fileName = item.getName(); + log.info("file: " + fileName + " fieldName: " + item.getFieldName() + " size: " + item.getSize()); + file = item; + } + } + createUploadedFile(userHash, stateToken, fileName, file); + } catch (final FileUploadException e) { + jsonResponse = createJsonResponse(false, i18n.t("Error: File too large")); + } catch (final Exception e) { + jsonResponse = createJsonResponse(false, i18n.t("Error uploading file")); + log.info("Exception: " + e.getCause()); + e.printStackTrace(); + } - final Writer w = new OutputStreamWriter(resp.getOutputStream()); - w.write(jsonResponse.toString()); - w.close(); - resp.setStatus(HttpServletResponse.SC_OK); + final Writer w = new OutputStreamWriter(resp.getOutputStream()); + w.write(jsonResponse.toString()); + w.close(); + resp.setStatus(HttpServletResponse.SC_OK); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor, actionLevel = ActionLevel.container) @Transactional(type = TransactionType.READ_WRITE) Content createUploadedFile(final String userHash, final StateToken stateToken, final String fileName, - final FileItem fileUploadItem) throws Exception { - final String relDir = FileUtils.toDir(stateToken); - final String absDir = kuneProperties.get(KuneProperties.UPLOAD_LOCATION) + relDir; - fileManager.mkdir(absDir); + final FileItem fileUploadItem) throws Exception { + final String relDir = FileUtils.toDir(stateToken); + final String absDir = kuneProperties.get(KuneProperties.UPLOAD_LOCATION) + relDir; + fileManager.mkdir(absDir); - File file = null; - try { - final String filenameUTF8 = new String(fileName.getBytes(), UTF8); - file = fileManager.createFileWithSequentialName(absDir, filenameUTF8); - fileUploadItem.write(file); + File file = null; + try { + final String filenameUTF8 = new String(fileName.getBytes(), UTF8); + file = fileManager.createFileWithSequentialName(absDir, filenameUTF8); + fileUploadItem.write(file); - final String mimetype = fileUploadItem.getContentType(); - final String extension = FileUtils.getFileNameExtension(filenameUTF8, false); + final String mimetype = fileUploadItem.getContentType(); + BasicMimeType basicMimeType = new BasicMimeType(mimetype); + log.info("Mimetype: " + basicMimeType); + final String extension = FileUtils.getFileNameExtension(file.getName(), false); - // Persist - final User user = userSession.getUser(); - final Container container = accessService.accessToContainer(ContentUtils.parseId(stateToken.getFolder()), - user, AccessRol.Editor); - final String preview = "Preview of this file (in development)"; - final Content content = contentManager.createContent(FileUtils.getFileNameWithoutExtension(file.getName(), - extension), preview, user, container); - content.setTypeId(DocumentServerTool.TYPE_UPLOADEDFILE); - content.setMimeType(new BasicMimeType(mimetype)); - content.setFilename(filenameUTF8); - return content; - } catch (final Exception e) { - if (file != null && file.exists()) { - file.delete(); - } - throw e; - } + if (basicMimeType.getType().equals("image")) { + generateThumbs(absDir, file.getName(), extension); + } + + // Persist + final User user = userSession.getUser(); + final Container container = accessService.accessToContainer(ContentUtils.parseId(stateToken.getFolder()), + user, AccessRol.Editor); + final String preview = "Preview of this file (in development)"; + final Content content = contentManager.createContent(FileUtils.getFileNameWithoutExtension(file.getName(), + extension), preview, user, container); + content.setTypeId(DocumentServerTool.TYPE_UPLOADEDFILE); + content.setMimeType(basicMimeType); + content.setFilename(file.getName()); + return content; + } catch (final Exception e) { + if (file != null && file.exists()) { + file.delete(); + } + throw e; + } } private JSONObject createJsonResponse(final boolean success, final String message) { - /** - * - * http://max-bazhenov.com/dev/upload-dialog-2.0/index.php - * - * Server side handler. - * - * The files in the queue are posted one at a time, the file field name - * is 'file'. The handler should return json encoded object with - * following properties: { success: true|false, // required error: - * 'Error or success message' // optional, also can be named 'message' } - */ + /** + * + * http://max-bazhenov.com/dev/upload-dialog-2.0/index.php + * + * Server side handler. + * + * The files in the queue are posted one at a time, the file field name + * is 'file'. The handler should return json encoded object with + * following properties: { success: true|false, // required error: + * 'Error or success message' // optional, also can be named 'message' } + */ - JSONObject response = null; - try { - response = new JSONObject(); - response.put("success", success); - response.put("error", message); - response.put("code", "232"); - } catch (final Exception e) { - log.error("Error building response"); - } - return response; + JSONObject response = null; + try { + response = new JSONObject(); + response.put("success", success); + response.put("error", message); + response.put("code", "232"); + } catch (final Exception e) { + log.error("Error building response"); + } + return response; } private JSONObject createSuccessResponse() { - return createJsonResponse(true, i18n.t("Success uploading")); + return createJsonResponse(true, i18n.t("Success uploading")); } + + private void generateThumbs(String absDir, String filename, String extension) { + try { + String fileOrig = absDir + filename; + String withoutExtension = FileUtils.getFileNameWithoutExtension(filename, extension); + + String resizeName = absDir + withoutExtension + FileConstants.SIZED_SUFFIX + extension; + String thumbName = absDir + withoutExtension + FileConstants.THUMB_SUFFIX + extension; + String iconName = absDir + withoutExtension + FileConstants.ICON_SUFFIX + extension; + + int resizeWidth = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_RESIZEWIDTH)); + int thumbSize = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_THUMBSIZE)); + int cropSize = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_CROPSIZE)); + int iconSize = Integer.parseInt(kuneProperties.get(KuneProperties.IMAGES_ICONSIZE)); + + ImageUtilsDefault.scaleImageToMax(fileOrig, resizeName, resizeWidth); + ImageUtilsDefault.createThumb(fileOrig, thumbName, thumbSize, cropSize); + ImageUtilsDefault.createThumb(fileOrig, iconName, iconSize); + + } catch (NumberFormatException e) { + log.error("Image sizes in kune.properties are not integers"); + e.printStackTrace(); + } catch (MagickException e) { + log.info("Problem generating image thumb for " + filename); + } + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java 2008-10-14 13:39:30 UTC (rev 909) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java 2008-10-15 03:14:33 UTC (rev 910) @@ -11,7 +11,12 @@ /** * http://en.wikipedia.org/wiki/Thumbnail + * */ + public static void createThumb(String fileOrig, String fileDest, int cropDimension) throws MagickException { + createThumb(fileOrig, fileDest, cropDimension, cropDimension); + } + public static void createThumb(String fileOrig, String fileDest, int thumbDimension, int cropDimension) throws MagickException { if (thumbDimension < cropDimension) { @@ -21,10 +26,10 @@ Dimension origDimension = imageOrig.getDimension(); int origHeight = origDimension.height; int origWidth = origDimension.width; - Dimension proportionalDim = calculateProportionalDim(origWidth, origHeight, thumbDimension); + Dimension proportionalDim = calculatePropDim(origWidth, origHeight, thumbDimension, true); + MagickImage scaled = scaleImage(imageOrig, proportionalDim.width, proportionalDim.height); int x = calculateCenteredCoordinate(proportionalDim.width, cropDimension); int y = calculateCenteredCoordinate(proportionalDim.height, cropDimension); - MagickImage scaled = scaleImage(imageOrig, proportionalDim.width, proportionalDim.height); cropImage(scaled, fileDest, x, y, cropDimension, cropDimension); } @@ -53,15 +58,32 @@ return scaleImage(imageOrig, fileDest, width, height); } + public static boolean scaleImageToMax(String fileOrig, String fileDest, int maxSize) throws MagickException { + MagickImage imageOrig = createImage(fileOrig); + Dimension origDimension = imageOrig.getDimension(); + int origHeight = origDimension.height; + int origWidth = origDimension.width; + Dimension proportionalDim = calculatePropDim(origWidth, origHeight, maxSize, false); + MagickImage scaled = scaleImage(imageOrig, proportionalDim.width, proportionalDim.height); + + return writeImage(scaled, fileDest); + } + static int calculateCenteredCoordinate(int size, int crop) { int i = (size - crop) / 2; return i < 0 ? 0 : i; } - static Dimension calculateProportionalDim(int origWidth, int origHeight, int maxSize) { + static Dimension calculatePropDim(int origWidth, int origHeight, int maxSize) { + return calculatePropDim(origWidth, origHeight, maxSize, true); + } + + static Dimension calculatePropDim(int origWidth, int origHeight, int maxSize, boolean toShortest) { boolean higher = origHeight > origWidth; - double height = higher ? (origHeight * maxSize / origWidth) : maxSize; - double width = !higher ? (origWidth * maxSize / origHeight) : maxSize; + int propHeight = origHeight * maxSize / origWidth; + int propWidth = origWidth * maxSize / origHeight; + double height = toShortest ? (higher ? propHeight : maxSize) : (higher ? maxSize : propHeight); + double width = toShortest ? (!higher ? propWidth : maxSize) : (!higher ? maxSize : propWidth); if ((higher && origHeight <= maxSize) || (!higher && origWidth <= maxSize)) { return new Dimension(origWidth, origHeight); } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java 2008-10-14 13:39:30 UTC (rev 909) +++ trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java 2008-10-15 03:14:33 UTC (rev 910) @@ -32,6 +32,10 @@ public String UPLOAD_GALLERY_PERMITTED_EXTS = "kune.upload.gallerypermittedextensions"; public String UPLOAD_MAX_FILE_SIZE = "kune.upload.maxfilesizeinmegas"; public String UPLOAD_LOCATION = "kune.upload.location"; + public String IMAGES_RESIZEWIDTH = "kune.images.resizewidth"; + public String IMAGES_THUMBSIZE = "kune.images.thumbsize"; + public String IMAGES_CROPSIZE = "kune.images.cropsize"; + public String IMAGES_ICONSIZE = "kune.images.iconsize"; public String get(String key); Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2008-10-14 13:39:30 UTC (rev 909) +++ trunk/src/main/resources/kune.properties 2008-10-15 03:14:33 UTC (rev 910) @@ -25,5 +25,13 @@ kune.sitelogourl = images/kune-logo-16px.png kune.upload.location = /var/lib/kune/uploads/ + +# Gallery options kune.upload.gallerypermittedextensions = jpg,jpeg,png,gif,bmp,svg,avi,mpg,mpeg,ogg,mov,tif,tiff,mp3,wav kune.upload.maxfilesizeinmegas = 10 +# Images are resized to thumbsize pixels and later cropped (centered) to cropsize +kune.images.resizewidth = 400 +kune.images.thumbsize = 100 +kune.images.cropsize = 85 + +kune.images.iconsize = 16 Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java 2008-10-14 13:39:30 UTC (rev 909) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java 2008-10-15 03:14:33 UTC (rev 910) @@ -13,9 +13,14 @@ import org.junit.Test; /** - * UnsatisfiedLinkError: problem with jmagick installation (in debian, apt-get - * install libjmagick6-jni, and add LD_LIBRARY_PATH=/usr/lib/jni/ to this test - * environment params + * If you get a UnsatisfiedLinkError this is a problem with jmagick installation + * (in debian, apt-get install libjmagick6-jni, and add + * LD_LIBRARY_PATH=/usr/lib/jni/ to this test environment params or sudo ln -s + * /usr/lib/jni/libJMagick.so /usr/lib/libJMagick.so) + * + * See the output of: + * System.out.println(System.getProperty("java.library.path")); to see when is + * expecting the .so/.dll */ public class ImageUtilsDefaultTest { @@ -56,7 +61,7 @@ @Test public void testProportionalHigher() { - Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(500, 1000, 100); + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(500, 1000, 100); assertEquals(100, proportionalDim.width); assertEquals(200, proportionalDim.height); assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); @@ -65,7 +70,7 @@ @Test public void testProportionalHigherLikeSamples() { - Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(1200, 1600, 100); + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(1200, 1600, 100); assertEquals(100, proportionalDim.width); assertEquals(133, proportionalDim.height); assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); @@ -74,7 +79,7 @@ @Test public void testProportionalHigherSame() { - Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(20, 100, 100); + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(20, 100, 100); assertEquals(20, proportionalDim.width); assertEquals(100, proportionalDim.height); assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); @@ -83,7 +88,7 @@ @Test public void testProportionalHigherSmaller() { - Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(20, 10, 100); + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(20, 10, 100); assertEquals(20, proportionalDim.width); assertEquals(10, proportionalDim.height); assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); @@ -91,8 +96,36 @@ } @Test + public void testProportionalToBiggerNormal() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 300, false); + assertEquals(300, proportionalDim.width); + assertEquals(150, proportionalDim.height); + } + + @Test + public void testProportionalToBiggerSame() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 600, false); + assertEquals(600, proportionalDim.width); + assertEquals(300, proportionalDim.height); + } + + @Test + public void testProportionalToBiggerSmaller() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(600, 300, 700, false); + assertEquals(600, proportionalDim.width); + assertEquals(300, proportionalDim.height); + } + + @Test + public void testProportionalToBiggerWider() { + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(300, 600, 200, false); + assertEquals(100, proportionalDim.width); + assertEquals(200, proportionalDim.height); + } + + @Test public void testProportionalWider() { - Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(1000, 500, 100); + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(1000, 500, 100); assertEquals(200, proportionalDim.width); assertEquals(100, proportionalDim.height); assertEquals(50, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); @@ -101,7 +134,7 @@ @Test public void testProportionalWiderSame() { - Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(100, 20, 100); + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(100, 20, 100); assertEquals(100, proportionalDim.width); assertEquals(20, proportionalDim.height); assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); @@ -110,7 +143,7 @@ @Test public void testProportionalWiderSmaller() { - Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(5, 10, 100); + Dimension proportionalDim = ImageUtilsDefault.calculatePropDim(5, 10, 100); assertEquals(5, proportionalDim.width); assertEquals(10, proportionalDim.height); assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100));

1 0

r909 - trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl
by vjrj 14 Oct '08

14 Oct '08

Author: vjrj Date: 2008-10-14 15:39:30 +0200 (Tue, 14 Oct 2008) New Revision: 909 Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.gif trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.jpg trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.png trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.tiff Log: Complete - task Images server utilities Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java 2008-10-14 13:25:31 UTC (rev 908) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java 2008-10-14 13:39:30 UTC (rev 909) @@ -131,8 +131,8 @@ public void testSize() throws MagickException { for (String image : images) { Dimension dimension = ImageUtilsDefault.getDimension(IMG_PATH + image); - assertEquals(1600, (int) dimension.getHeight()); - assertEquals(1200, (int) dimension.getWidth()); + assertEquals(400, (int) dimension.getHeight()); + assertEquals(300, (int) dimension.getWidth()); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.gif =================================================================== (Binary files differ) Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.jpg =================================================================== (Binary files differ) Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.png =================================================================== (Binary files differ) Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.tiff =================================================================== (Binary files differ)

1 0

r908 - in trunk: . debian src/main/java/org/ourproject/kune/platf/server/manager/impl src/test/java/org/ourproject/kune/platf/server/manager/impl
by vjrj 14 Oct '08

14 Oct '08

Author: vjrj Date: 2008-10-14 15:25:31 +0200 (Tue, 14 Oct 2008) New Revision: 908 Added: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.gif trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.jpg trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.png trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.tiff Modified: trunk/debian/TODO trunk/pom.xml Log: Complete - task Images server utilities Modified: trunk/debian/TODO =================================================================== --- trunk/debian/TODO 2008-10-14 00:23:09 UTC (rev 907) +++ trunk/debian/TODO 2008-10-14 13:25:31 UTC (rev 908) @@ -1,3 +1,4 @@ - create user kune - create /var/lib/kune/uploads and give permissions - create /var/lib/kune/lucene +- deps: libjmagick6-jni Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-10-14 00:23:09 UTC (rev 907) +++ trunk/pom.xml 2008-10-14 13:25:31 UTC (rev 908) @@ -87,7 +87,7 @@ <dependency> <groupId>jmagick</groupId> <artifactId>jmagick</artifactId> - <version>6.2.4</version> + <version>6.2.6-0</version> </dependency>  Added: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java 2008-10-14 00:23:09 UTC (rev 907) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefault.java 2008-10-14 13:25:31 UTC (rev 908) @@ -0,0 +1,105 @@ +package org.ourproject.kune.platf.server.manager.impl; + +import java.awt.Dimension; +import java.awt.Rectangle; + +import magick.ImageInfo; +import magick.MagickException; +import magick.MagickImage; + +public class ImageUtilsDefault { + + /** + * http://en.wikipedia.org/wiki/Thumbnail + */ + public static void createThumb(String fileOrig, String fileDest, int thumbDimension, int cropDimension) + throws MagickException { + if (thumbDimension < cropDimension) { + throw new IndexOutOfBoundsException("Thumb dimension must be bigger than crop dimension"); + } + MagickImage imageOrig = createImage(fileOrig); + Dimension origDimension = imageOrig.getDimension(); + int origHeight = origDimension.height; + int origWidth = origDimension.width; + Dimension proportionalDim = calculateProportionalDim(origWidth, origHeight, thumbDimension); + int x = calculateCenteredCoordinate(proportionalDim.width, cropDimension); + int y = calculateCenteredCoordinate(proportionalDim.height, cropDimension); + MagickImage scaled = scaleImage(imageOrig, proportionalDim.width, proportionalDim.height); + cropImage(scaled, fileDest, x, y, cropDimension, cropDimension); + } + + public static boolean cropImage(String fileOrig, String fileDest, int x, int y, int width, int height) + throws MagickException { + Rectangle rectangle = new Rectangle(x, y, width, height); + return cropImage(fileOrig, fileDest, rectangle); + } + + public static boolean cropImage(String fileOrig, String fileDest, Rectangle rectangle) throws MagickException { + return cropImage(createImage(fileOrig), fileDest, rectangle); + } + + public static Dimension getDimension(String file) throws MagickException { + MagickImage imageOrig = createImage(file); + return imageOrig.getDimension(); + } + + public static boolean scaleImage(String fileOrig, String fileDest, Dimension dimension) throws MagickException { + MagickImage imageOrig = createImage(fileOrig); + return scaleImage(imageOrig, fileDest, (int) dimension.getWidth(), (int) dimension.getHeight()); + } + + public static boolean scaleImage(String fileOrig, String fileDest, int width, int height) throws MagickException { + MagickImage imageOrig = createImage(fileOrig); + return scaleImage(imageOrig, fileDest, width, height); + } + + static int calculateCenteredCoordinate(int size, int crop) { + int i = (size - crop) / 2; + return i < 0 ? 0 : i; + } + + static Dimension calculateProportionalDim(int origWidth, int origHeight, int maxSize) { + boolean higher = origHeight > origWidth; + double height = higher ? (origHeight * maxSize / origWidth) : maxSize; + double width = !higher ? (origWidth * maxSize / origHeight) : maxSize; + if ((higher && origHeight <= maxSize) || (!higher && origWidth <= maxSize)) { + return new Dimension(origWidth, origHeight); + } + return new Dimension((int) width, (int) height); + } + + private static ImageInfo createEmptyImageInfo() throws MagickException { + ImageInfo info = new ImageInfo(); + return info; + } + + private static MagickImage createImage(String file) throws MagickException { + return new MagickImage(new ImageInfo(file)); + } + + private static boolean cropImage(MagickImage fileOrig, String fileDest, int x, int y, int width, int height) + throws MagickException { + Rectangle rectangle = new Rectangle(x, y, width, height); + return cropImage(fileOrig, fileDest, rectangle); + } + + private static boolean cropImage(MagickImage fileOrig, String fileDest, Rectangle rectangle) throws MagickException { + MagickImage cropped = fileOrig.cropImage(rectangle); + return writeImage(cropped, fileDest); + } + + private static MagickImage scaleImage(MagickImage imageOrig, int width, int height) throws MagickException { + return imageOrig.scaleImage(width, height); + } + + private static boolean scaleImage(MagickImage imageOrig, String fileDest, int width, int height) + throws MagickException { + MagickImage imageDest = scaleImage(imageOrig, width, height); + return writeImage(imageDest, fileDest); + } + + private static boolean writeImage(MagickImage imageDest, String fileDest) throws MagickException { + imageDest.setFileName(fileDest); + return imageDest.writeImage(createEmptyImageInfo()); + } +} Added: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java 2008-10-14 00:23:09 UTC (rev 907) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/ImageUtilsDefaultTest.java 2008-10-14 13:25:31 UTC (rev 908) @@ -0,0 +1,143 @@ +package org.ourproject.kune.platf.server.manager.impl; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.awt.Dimension; +import java.io.File; + +import magick.MagickException; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * UnsatisfiedLinkError: problem with jmagick installation (in debian, apt-get + * install libjmagick6-jni, and add LD_LIBRARY_PATH=/usr/lib/jni/ to this test + * environment params + */ +public class ImageUtilsDefaultTest { + + private static final String IMG_PATH = "src/test/java/org/ourproject/kune/platf/server/manager/impl/"; + private static String[] images = { "orig.png", "orig.gif", "orig.jpg", "orig.tiff" }; + private static String imageDest; + + @AfterClass + public static void after() { + File file = new File(imageDest); + file.delete(); + } + + @BeforeClass + public static void before() { + imageDest = IMG_PATH + "output"; + } + + @Test + public void generateIcon() throws MagickException { + for (String image : images) { + ImageUtilsDefault.createThumb(IMG_PATH + image, imageDest, 16, 16); + Dimension dimension = ImageUtilsDefault.getDimension(imageDest); + assertEquals(16, (int) dimension.getHeight()); + assertEquals(16, (int) dimension.getWidth()); + } + } + + @Test + public void generateThumb() throws MagickException { + for (String image : images) { + ImageUtilsDefault.createThumb(IMG_PATH + image, imageDest, 100, 85); + Dimension dimension = ImageUtilsDefault.getDimension(imageDest); + assertEquals(85, (int) dimension.getHeight()); + assertEquals(85, (int) dimension.getWidth()); + } + } + + @Test + public void testProportionalHigher() { + Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(500, 1000, 100); + assertEquals(100, proportionalDim.width); + assertEquals(200, proportionalDim.height); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(50, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testProportionalHigherLikeSamples() { + Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(1200, 1600, 100); + assertEquals(100, proportionalDim.width); + assertEquals(133, proportionalDim.height); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(16, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testProportionalHigherSame() { + Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(20, 100, 100); + assertEquals(20, proportionalDim.width); + assertEquals(100, proportionalDim.height); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testProportionalHigherSmaller() { + Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(20, 10, 100); + assertEquals(20, proportionalDim.width); + assertEquals(10, proportionalDim.height); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testProportionalWider() { + Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(1000, 500, 100); + assertEquals(200, proportionalDim.width); + assertEquals(100, proportionalDim.height); + assertEquals(50, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testProportionalWiderSame() { + Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(100, 20, 100); + assertEquals(100, proportionalDim.width); + assertEquals(20, proportionalDim.height); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testProportionalWiderSmaller() { + Dimension proportionalDim = ImageUtilsDefault.calculateProportionalDim(5, 10, 100); + assertEquals(5, proportionalDim.width); + assertEquals(10, proportionalDim.height); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.width, 100)); + assertEquals(0, ImageUtilsDefault.calculateCenteredCoordinate(proportionalDim.height, 100)); + } + + @Test + public void testResize() throws MagickException { + for (String image : images) { + assertTrue(ImageUtilsDefault.scaleImage(IMG_PATH + image, imageDest, 100, 100)); + Dimension dimension = ImageUtilsDefault.getDimension(imageDest); + assertEquals(100, (int) dimension.getHeight()); + assertEquals(100, (int) dimension.getWidth()); + } + } + + @Test + public void testSize() throws MagickException { + for (String image : images) { + Dimension dimension = ImageUtilsDefault.getDimension(IMG_PATH + image); + assertEquals(1600, (int) dimension.getHeight()); + assertEquals(1200, (int) dimension.getWidth()); + } + } + + @Test(expected = IndexOutOfBoundsException.class) + public void thumbSmallerThanCropMustFail() throws MagickException { + ImageUtilsDefault.createThumb(IMG_PATH + images[0], imageDest, 100, 200); + } +} Added: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.gif =================================================================== (Binary files differ) Property changes on: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.png =================================================================== (Binary files differ) Property changes on: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/orig.tiff ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0