[kune-commits] r1413 - in trunk/src/main: java/cc/kune/core/server/manager/file java/cc/kune/gspace/client java/cc/kune/gspace/client/options/license java/cc/kune/gspace/client/options/logo java/cc/kune/gspace/client/options/style java/cc/kune/gspace/client/options/tools java/cc/kune/gspace/client/themes resources

Author: vjrj_ Date: 2011-06-21 23:29:32 +0200 (Tue, 21 Jun 2011) New Revision: 1413 Added: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicense.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicenseView.java trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicense.java trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicenseView.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicense.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicenseView.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogo.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoView.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptUploadButton.java trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogo.java trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoView.java trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogo.java trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoView.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStyle.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStyleView.java trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStyle.java trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStyleView.java trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStyle.java trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStyleView.java trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptTools.java trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsView.java trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptTools.java trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsView.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptTools.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsView.java Removed: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicense.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicenseView.java trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicense.java trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicenseView.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicense.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicenseView.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogo.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoView.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsUploadButton.java trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogo.java trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoView.java trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogo.java trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoView.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConf.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfView.java trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConf.java trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfPanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfView.java trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConf.java trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfPanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfView.java trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConf.java trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfView.java trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConf.java trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfView.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConf.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfView.java Modified: trunk/src/main/java/cc/kune/core/server/manager/file/EntityBackgroundUploadManager.java trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityUploaderForm.java trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java trunk/src/main/resources/kune.properties Log: Background management (done) Modified: trunk/src/main/java/cc/kune/core/server/manager/file/EntityBackgroundUploadManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/EntityBackgroundUploadManager.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/core/server/manager/file/EntityBackgroundUploadManager.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -96,8 +96,8 @@ groupManager.setGroupBackgroundImage(group, filenameUTF8, mimeTypeS); } catch (final Exception e) { - return i18n.t("Error uploading file"); + return i18n.t("Error uploading background"); } - return i18n.t("Success uploading"); + return i18n.t("Backgroup changed"); } } Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -47,38 +47,38 @@ import cc.kune.gspace.client.options.UserOptionsPanel; import cc.kune.gspace.client.options.UserOptionsPresenter; import cc.kune.gspace.client.options.UserOptionsView; -import cc.kune.gspace.client.options.license.GroupOptionsDefLicense; -import cc.kune.gspace.client.options.license.GroupOptionsDefLicensePanel; -import cc.kune.gspace.client.options.license.GroupOptionsDefLicensePresenter; -import cc.kune.gspace.client.options.license.GroupOptionsDefLicenseView; -import cc.kune.gspace.client.options.license.UserOptionsDefLicense; -import cc.kune.gspace.client.options.license.UserOptionsDefLicensePanel; -import cc.kune.gspace.client.options.license.UserOptionsDefLicensePresenter; -import cc.kune.gspace.client.options.license.UserOptionsDefLicenseView; -import cc.kune.gspace.client.options.logo.GroupOptionsLogo; -import cc.kune.gspace.client.options.logo.GroupOptionsLogoPanel; -import cc.kune.gspace.client.options.logo.GroupOptionsLogoPresenter; -import cc.kune.gspace.client.options.logo.GroupOptionsLogoView; -import cc.kune.gspace.client.options.logo.UserOptionsLogo; -import cc.kune.gspace.client.options.logo.UserOptionsLogoPanel; -import cc.kune.gspace.client.options.logo.UserOptionsLogoPresenter; -import cc.kune.gspace.client.options.logo.UserOptionsLogoView; -import cc.kune.gspace.client.options.style.GroupOptionsStyleConf; -import cc.kune.gspace.client.options.style.GroupOptionsStyleConfPanel; -import cc.kune.gspace.client.options.style.GroupOptionsStyleConfPresenter; -import cc.kune.gspace.client.options.style.GroupOptionsStyleConfView; -import cc.kune.gspace.client.options.style.UserOptionsStyleConf; -import cc.kune.gspace.client.options.style.UserOptionsStyleConfPanel; -import cc.kune.gspace.client.options.style.UserOptionsStyleConfPresenter; -import cc.kune.gspace.client.options.style.UserOptionsStyleConfView; -import cc.kune.gspace.client.options.tools.GroupOptionsToolsConf; -import cc.kune.gspace.client.options.tools.GroupOptionsToolsConfPanel; -import cc.kune.gspace.client.options.tools.GroupOptionsToolsConfPresenter; -import cc.kune.gspace.client.options.tools.GroupOptionsToolsConfView; -import cc.kune.gspace.client.options.tools.UserOptionsToolsConf; -import cc.kune.gspace.client.options.tools.UserOptionsToolsConfPanel; -import cc.kune.gspace.client.options.tools.UserOptionsToolsConfPresenter; -import cc.kune.gspace.client.options.tools.UserOptionsToolsConfView; +import cc.kune.gspace.client.options.license.GroupOptDefLicense; +import cc.kune.gspace.client.options.license.GroupOptDefLicensePanel; +import cc.kune.gspace.client.options.license.GroupOptDefLicensePresenter; +import cc.kune.gspace.client.options.license.GroupOptDefLicenseView; +import cc.kune.gspace.client.options.license.UserOptDefLicense; +import cc.kune.gspace.client.options.license.UserOptDefLicensePanel; +import cc.kune.gspace.client.options.license.UserOptDefLicensePresenter; +import cc.kune.gspace.client.options.license.UserOptDefLicenseView; +import cc.kune.gspace.client.options.logo.GroupOptLogo; +import cc.kune.gspace.client.options.logo.GroupOptLogoPanel; +import cc.kune.gspace.client.options.logo.GroupOptLogoPresenter; +import cc.kune.gspace.client.options.logo.GroupOptLogoView; +import cc.kune.gspace.client.options.logo.UserOptLogo; +import cc.kune.gspace.client.options.logo.UserOptLogoPanel; +import cc.kune.gspace.client.options.logo.UserOptLogoPresenter; +import cc.kune.gspace.client.options.logo.UserOptLogoView; +import cc.kune.gspace.client.options.style.GroupOptStyle; +import cc.kune.gspace.client.options.style.GroupOptStylePanel; +import cc.kune.gspace.client.options.style.GroupOptStylePresenter; +import cc.kune.gspace.client.options.style.GroupOptStyleView; +import cc.kune.gspace.client.options.style.UserOptStyle; +import cc.kune.gspace.client.options.style.UserOptStylePanel; +import cc.kune.gspace.client.options.style.UserOptStylePresenter; +import cc.kune.gspace.client.options.style.UserOptStyleView; +import cc.kune.gspace.client.options.tools.GroupOptTools; +import cc.kune.gspace.client.options.tools.GroupOptToolsPanel; +import cc.kune.gspace.client.options.tools.GroupOptToolsPresenter; +import cc.kune.gspace.client.options.tools.GroupOptToolsView; +import cc.kune.gspace.client.options.tools.UserOptTools; +import cc.kune.gspace.client.options.tools.UserOptToolsPanel; +import cc.kune.gspace.client.options.tools.UserOptToolsPresenter; +import cc.kune.gspace.client.options.tools.UserOptToolsView; import cc.kune.gspace.client.style.GSpaceBackManager; import cc.kune.gspace.client.style.GSpaceBackManagerImpl; import cc.kune.gspace.client.tags.TagsSummaryPanel; @@ -134,23 +134,23 @@ s(UserOptionsCollection.class); s(GroupOptionsCollection.class); - s(GroupOptionsDefLicense.class, GroupOptionsDefLicensePresenter.class); - s(GroupOptionsDefLicenseView.class, GroupOptionsDefLicensePanel.class); - s(GroupOptionsStyleConf.class, GroupOptionsStyleConfPresenter.class); - s(GroupOptionsStyleConfView.class, GroupOptionsStyleConfPanel.class); - s(GroupOptionsLogo.class, GroupOptionsLogoPresenter.class); - s(GroupOptionsLogoView.class, GroupOptionsLogoPanel.class); - s(GroupOptionsToolsConf.class, GroupOptionsToolsConfPresenter.class); - s(GroupOptionsToolsConfView.class, GroupOptionsToolsConfPanel.class); + s(GroupOptDefLicense.class, GroupOptDefLicensePresenter.class); + s(GroupOptDefLicenseView.class, GroupOptDefLicensePanel.class); + s(GroupOptStyle.class, GroupOptStylePresenter.class); + s(GroupOptStyleView.class, GroupOptStylePanel.class); + s(GroupOptLogo.class, GroupOptLogoPresenter.class); + s(GroupOptLogoView.class, GroupOptLogoPanel.class); + s(GroupOptTools.class, GroupOptToolsPresenter.class); + s(GroupOptToolsView.class, GroupOptToolsPanel.class); - s(UserOptionsDefLicense.class, UserOptionsDefLicensePresenter.class); - s(UserOptionsDefLicenseView.class, UserOptionsDefLicensePanel.class); - s(UserOptionsStyleConf.class, UserOptionsStyleConfPresenter.class); - s(UserOptionsStyleConfView.class, UserOptionsStyleConfPanel.class); - s(UserOptionsLogo.class, UserOptionsLogoPresenter.class); - s(UserOptionsLogoView.class, UserOptionsLogoPanel.class); - s(UserOptionsToolsConf.class, UserOptionsToolsConfPresenter.class); - s(UserOptionsToolsConfView.class, UserOptionsToolsConfPanel.class); + s(UserOptDefLicense.class, UserOptDefLicensePresenter.class); + s(UserOptDefLicenseView.class, UserOptDefLicensePanel.class); + s(UserOptStyle.class, UserOptStylePresenter.class); + s(UserOptStyleView.class, UserOptStylePanel.class); + s(UserOptLogo.class, UserOptLogoPresenter.class); + s(UserOptLogoView.class, UserOptLogoPanel.class); + s(UserOptTools.class, UserOptToolsPresenter.class); + s(UserOptToolsView.class, UserOptToolsPanel.class); s(GSpaceBackManager.class, GSpaceBackManagerImpl.class); s(GSpaceThemeSelectorPresenter.class); Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -27,14 +27,14 @@ import cc.kune.gspace.client.options.GroupOptionsCollection; import cc.kune.gspace.client.options.UserOptions; import cc.kune.gspace.client.options.UserOptionsCollection; -import cc.kune.gspace.client.options.license.GroupOptionsDefLicense; -import cc.kune.gspace.client.options.license.UserOptionsDefLicense; -import cc.kune.gspace.client.options.logo.GroupOptionsLogo; -import cc.kune.gspace.client.options.logo.UserOptionsLogo; -import cc.kune.gspace.client.options.style.GroupOptionsStyleConf; -import cc.kune.gspace.client.options.style.UserOptionsStyleConf; -import cc.kune.gspace.client.options.tools.GroupOptionsToolsConf; -import cc.kune.gspace.client.options.tools.UserOptionsToolsConf; +import cc.kune.gspace.client.options.license.GroupOptDefLicense; +import cc.kune.gspace.client.options.license.UserOptDefLicense; +import cc.kune.gspace.client.options.logo.GroupOptLogo; +import cc.kune.gspace.client.options.logo.UserOptLogo; +import cc.kune.gspace.client.options.style.GroupOptStyle; +import cc.kune.gspace.client.options.style.UserOptStyle; +import cc.kune.gspace.client.options.tools.GroupOptTools; +import cc.kune.gspace.client.options.tools.UserOptTools; import cc.kune.gspace.client.tags.TagsSummaryPresenter; import cc.kune.gspace.client.themes.GSpaceThemeManager; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -55,11 +55,11 @@ final Provider<NoHomePageViewer> noHome, final Provider<ContentViewerPresenter> docsViewer, final Provider<FolderViewerPresenter> folderViewer, final Provider<GroupOptions> go, final Provider<UserOptions> uo, final Provider<GroupOptionsCollection> goc, - final Provider<UserOptionsCollection> uoc, final Provider<GroupOptionsDefLicense> gdl, - final Provider<GroupOptionsStyleConf> gps, final Provider<GroupOptionsLogo> gl, - final Provider<GroupOptionsToolsConf> gtc, final Provider<UserOptionsDefLicense> udl, - final Provider<UserOptionsStyleConf> ups, final Provider<UserOptionsLogo> ul, - final Provider<UserOptionsToolsConf> utc, final Provider<SitebarSearchPresenter> siteSearch) { + final Provider<UserOptionsCollection> uoc, final Provider<GroupOptDefLicense> gdl, + final Provider<GroupOptStyle> gps, final Provider<GroupOptLogo> gl, + final Provider<GroupOptTools> gtc, final Provider<UserOptDefLicense> udl, + final Provider<UserOptStyle> ups, final Provider<UserOptLogo> ul, + final Provider<UserOptTools> utc, final Provider<SitebarSearchPresenter> siteSearch) { session.onAppStart(true, new AppStartHandler() { @Override Copied: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicense.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicense.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicense.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicense.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.license; + +public interface EntityOptDefLicense { + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,91 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.license; + +import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.common.client.ui.IconLabel; +import cc.kune.common.client.ui.KuneWindowUtils; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.EntityOptionsView; + +import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.user.client.ui.Button; +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.IsWidget; +import com.google.gwt.user.client.ui.Label; + +public class EntityOptDefLicensePanel extends Composite implements EntityOptDefLicenseView { + + private final Button change; + private final Image licenseImage; + private final IconLabel tabTitle; + + public EntityOptDefLicensePanel(final I18nTranslationService i18n, final CoreResources res) { + tabTitle = new IconLabel(res.copyleft(), i18n.t("License")); + final FlowPanel flow = new FlowPanel(); + final Label intro = new Label(); + intro.setWordWrap(true); + intro.setText(i18n.t("This is the default license for all the contents of this group (you can also select another different license per content):")); + intro.addStyleName("kune-Margin-20-tb"); + flow.add(intro); + licenseImage = new Image(); + flow.add(licenseImage); + licenseImage.addStyleName("kune-pointer"); + licenseImage.addStyleName("kune-Margin-10-r"); + change = new Button(i18n.t("Change")); + change.addStyleName("k-button"); + flow.add(change); + initWidget(flow); + flow.setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); + flow.setWidth(String.valueOf(EntityOptionsView.WIDTH) + "px"); + flow.addStyleName("k-overflow-y-auto"); + flow.addStyleName("k-tab-panel"); + } + + @Override + public HasClickHandlers getChange() { + return change; + } + + @Override + public HasClickHandlers getLicenseImage() { + return licenseImage; + } + + @Override + public IsWidget getTabTitle() { + return tabTitle; + } + + @Override + public void openWindow(final String url) { + KuneWindowUtils.open(url); + } + + @Override + public void setLicense(final LicenseDTO defaultLicense) { + licenseImage.setUrl(defaultLicense.getImageUrl()); + Tooltip.to(licenseImage, defaultLicense.getLongName()); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePresenter.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,113 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.license; + +import cc.kune.common.client.utils.SimpleResponseCallback; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.gspace.client.licensewizard.LicenseChangeAction; +import cc.kune.gspace.client.licensewizard.LicenseChooseCallback; +import cc.kune.gspace.client.licensewizard.LicenseWizard; +import cc.kune.gspace.client.options.EntityOptions; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.inject.Provider; + +public abstract class EntityOptDefLicensePresenter { + + private final EntityOptions entityOptions; + private final Provider<LicenseChangeAction> licChangeAction; + private final Provider<LicenseWizard> licenseWizard; + protected final Session session; + private EntityOptDefLicenseView view; + + public EntityOptDefLicensePresenter(final EntityOptions entityOptions, final Session session, + final Provider<LicenseWizard> licenseWizard, final Provider<LicenseChangeAction> licChangeAction) { + this.entityOptions = entityOptions; + this.session = session; + this.licenseWizard = licenseWizard; + this.licChangeAction = licChangeAction; + } + + protected abstract boolean applicable(); + + protected abstract LicenseDTO getCurrentDefLicense(); + + protected abstract StateToken getOperationToken(); + + public IsWidget getView() { + return view; + } + + protected void init(final EntityOptDefLicenseView view) { + this.view = view; + entityOptions.addTab(view, view.getTabTitle()); + setState(); + view.getChange().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + onChange(); + } + }); + view.getLicenseImage().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + onLicenseClick(); + } + }); + } + + public void onChange() { + licenseWizard.get().start(new LicenseChooseCallback() { + + @Override + public void onSelected(final LicenseDTO license) { + licChangeAction.get().changeLicense(getOperationToken(), license, new SimpleResponseCallback() { + + @Override + public void onCancel() { + } + + @Override + public void onSuccess() { + setLicense(license); + } + }); + } + }); + } + + public void onLicenseClick() { + view.openWindow(getCurrentDefLicense().getUrl()); + } + + private void setLicense(final LicenseDTO license) { + view.setLicense(license); + } + + protected void setState() { + if (applicable()) { + setLicense(getCurrentDefLicense()); + } + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicenseView.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicenseView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicenseView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicenseView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,37 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.license; + +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.gspace.client.options.EntityOptionsTabView; + +import com.google.gwt.event.dom.client.HasClickHandlers; + +public interface EntityOptDefLicenseView extends EntityOptionsTabView { + + HasClickHandlers getChange(); + + HasClickHandlers getLicenseImage(); + + void openWindow(String url); + + void setLicense(LicenseDTO defaultLicense); + +} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicense.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicense.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicense.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.license; - -public interface EntityOptionsDefLicense { - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,91 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.license; - -import cc.kune.common.client.tooltip.Tooltip; -import cc.kune.common.client.ui.IconLabel; -import cc.kune.common.client.ui.KuneWindowUtils; -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.options.EntityOptionsView; - -import com.google.gwt.event.dom.client.HasClickHandlers; -import com.google.gwt.user.client.ui.Button; -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.IsWidget; -import com.google.gwt.user.client.ui.Label; - -public class EntityOptionsDefLicensePanel extends Composite implements EntityOptionsDefLicenseView { - - private final Button change; - private final Image licenseImage; - private final IconLabel tabTitle; - - public EntityOptionsDefLicensePanel(final I18nTranslationService i18n, final CoreResources res) { - tabTitle = new IconLabel(res.copyleft(), i18n.t("License")); - final FlowPanel flow = new FlowPanel(); - final Label intro = new Label(); - intro.setWordWrap(true); - intro.setText(i18n.t("This is the default license for all the contents of this group (you can also select another different license per content):")); - intro.addStyleName("kune-Margin-20-tb"); - flow.add(intro); - licenseImage = new Image(); - flow.add(licenseImage); - licenseImage.addStyleName("kune-pointer"); - licenseImage.addStyleName("kune-Margin-10-r"); - change = new Button(i18n.t("Change")); - change.addStyleName("k-button"); - flow.add(change); - initWidget(flow); - flow.setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); - flow.setWidth(String.valueOf(EntityOptionsView.WIDTH) + "px"); - flow.addStyleName("k-overflow-y-auto"); - flow.addStyleName("k-tab-panel"); - } - - @Override - public HasClickHandlers getChange() { - return change; - } - - @Override - public HasClickHandlers getLicenseImage() { - return licenseImage; - } - - @Override - public IsWidget getTabTitle() { - return tabTitle; - } - - @Override - public void openWindow(final String url) { - KuneWindowUtils.open(url); - } - - @Override - public void setLicense(final LicenseDTO defaultLicense) { - licenseImage.setUrl(defaultLicense.getImageUrl()); - Tooltip.to(licenseImage, defaultLicense.getLongName()); - } -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePresenter.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,113 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.license; - -import cc.kune.common.client.utils.SimpleResponseCallback; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.gspace.client.licensewizard.LicenseChangeAction; -import cc.kune.gspace.client.licensewizard.LicenseChooseCallback; -import cc.kune.gspace.client.licensewizard.LicenseWizard; -import cc.kune.gspace.client.options.EntityOptions; - -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.ui.IsWidget; -import com.google.inject.Provider; - -public abstract class EntityOptionsDefLicensePresenter { - - private final EntityOptions entityOptions; - private final Provider<LicenseChangeAction> licChangeAction; - private final Provider<LicenseWizard> licenseWizard; - protected final Session session; - private EntityOptionsDefLicenseView view; - - public EntityOptionsDefLicensePresenter(final EntityOptions entityOptions, final Session session, - final Provider<LicenseWizard> licenseWizard, final Provider<LicenseChangeAction> licChangeAction) { - this.entityOptions = entityOptions; - this.session = session; - this.licenseWizard = licenseWizard; - this.licChangeAction = licChangeAction; - } - - protected abstract boolean applicable(); - - protected abstract LicenseDTO getCurrentDefLicense(); - - protected abstract StateToken getOperationToken(); - - public IsWidget getView() { - return view; - } - - protected void init(final EntityOptionsDefLicenseView view) { - this.view = view; - entityOptions.addTab(view, view.getTabTitle()); - setState(); - view.getChange().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - onChange(); - } - }); - view.getLicenseImage().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - onLicenseClick(); - } - }); - } - - public void onChange() { - licenseWizard.get().start(new LicenseChooseCallback() { - - @Override - public void onSelected(final LicenseDTO license) { - licChangeAction.get().changeLicense(getOperationToken(), license, new SimpleResponseCallback() { - - @Override - public void onCancel() { - } - - @Override - public void onSuccess() { - setLicense(license); - } - }); - } - }); - } - - public void onLicenseClick() { - view.openWindow(getCurrentDefLicense().getUrl()); - } - - private void setLicense(final LicenseDTO license) { - view.setLicense(license); - } - - protected void setState() { - if (applicable()) { - setLicense(getCurrentDefLicense()); - } - } -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicenseView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicenseView.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicenseView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,37 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.license; - -import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.gspace.client.options.EntityOptionsTabView; - -import com.google.gwt.event.dom.client.HasClickHandlers; - -public interface EntityOptionsDefLicenseView extends EntityOptionsTabView { - - HasClickHandlers getChange(); - - HasClickHandlers getLicenseImage(); - - void openWindow(String url); - - void setLicense(LicenseDTO defaultLicense); - -} Copied: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicense.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicense.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicense.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicense.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.license; + +public interface GroupOptDefLicense extends EntityOptDefLicense { + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePanel.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,34 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.license; + +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class GroupOptDefLicensePanel extends EntityOptDefLicensePanel implements GroupOptDefLicenseView { + + @Inject + public GroupOptDefLicensePanel(final I18nTranslationService i18n, final CoreResources res) { + super(i18n, res); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePresenter.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicensePresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,66 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.license; + +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.state.UserSignInEvent; +import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.gspace.client.licensewizard.LicenseChangeAction; +import cc.kune.gspace.client.licensewizard.LicenseWizard; +import cc.kune.gspace.client.options.GroupOptions; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class GroupOptDefLicensePresenter extends EntityOptDefLicensePresenter implements + GroupOptDefLicense { + + @Inject + public GroupOptDefLicensePresenter(final GroupOptions entityOptions, + final StateManager stateManager, final Session session, final GroupOptDefLicenseView view, + final Provider<LicenseWizard> licenseWizard, final Provider<LicenseChangeAction> licChangeAction) { + super(entityOptions, session, licenseWizard, licChangeAction); + init(view); + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + setState(); + } + }); + } + + @Override + protected boolean applicable() { + return session.isCurrentStateAGroup(); + } + + @Override + protected LicenseDTO getCurrentDefLicense() { + return session.getCurrentState().getGroup().getDefaultLicense(); + } + + @Override + protected StateToken getOperationToken() { + return session.getCurrentStateToken(); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicenseView.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicenseView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicenseView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicenseView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.license; + +public interface GroupOptDefLicenseView extends EntityOptDefLicenseView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptDefLicenseView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicense.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicense.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicense.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.license; - -public interface GroupOptionsDefLicense extends EntityOptionsDefLicense { - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePanel.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,34 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.license; - -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.inject.Inject; - -public class GroupOptionsDefLicensePanel extends EntityOptionsDefLicensePanel implements GroupOptionsDefLicenseView { - - @Inject - public GroupOptionsDefLicensePanel(final I18nTranslationService i18n, final CoreResources res) { - super(i18n, res); - } - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePresenter.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,66 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.license; - -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.state.UserSignInEvent; -import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.gspace.client.licensewizard.LicenseChangeAction; -import cc.kune.gspace.client.licensewizard.LicenseWizard; -import cc.kune.gspace.client.options.GroupOptions; - -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class GroupOptionsDefLicensePresenter extends EntityOptionsDefLicensePresenter implements - GroupOptionsDefLicense { - - @Inject - public GroupOptionsDefLicensePresenter(final GroupOptions entityOptions, - final StateManager stateManager, final Session session, final GroupOptionsDefLicenseView view, - final Provider<LicenseWizard> licenseWizard, final Provider<LicenseChangeAction> licChangeAction) { - super(entityOptions, session, licenseWizard, licChangeAction); - init(view); - session.onUserSignIn(true, new UserSignInHandler() { - @Override - public void onUserSignIn(final UserSignInEvent event) { - setState(); - } - }); - } - - @Override - protected boolean applicable() { - return session.isCurrentStateAGroup(); - } - - @Override - protected LicenseDTO getCurrentDefLicense() { - return session.getCurrentState().getGroup().getDefaultLicense(); - } - - @Override - protected StateToken getOperationToken() { - return session.getCurrentStateToken(); - } -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicenseView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicenseView.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicenseView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.license; - -public interface GroupOptionsDefLicenseView extends EntityOptionsDefLicenseView { - -} Copied: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicense.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicense.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicense.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicense.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.license; + +public interface UserOptDefLicense extends EntityOptDefLicense { + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePanel.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,34 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.license; + +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class UserOptDefLicensePanel extends EntityOptDefLicensePanel implements UserOptDefLicenseView { + + @Inject + public UserOptDefLicensePanel(final I18nTranslationService i18n, final CoreResources res) { + super(i18n, res); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePresenter.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicensePresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,65 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.license; + +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.UserSignInEvent; +import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.gspace.client.licensewizard.LicenseChangeAction; +import cc.kune.gspace.client.licensewizard.LicenseWizard; +import cc.kune.gspace.client.options.UserOptions; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class UserOptDefLicensePresenter extends EntityOptDefLicensePresenter implements + UserOptDefLicense { + + @Inject + public UserOptDefLicensePresenter(final UserOptions entityOptions, final Session session, + final UserOptDefLicenseView view, final Provider<LicenseWizard> licenseWizard, + final Provider<LicenseChangeAction> licChangeAction) { + super(entityOptions, session, licenseWizard, licChangeAction); + init(view); + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + setState(); + } + }); + } + + @Override + protected boolean applicable() { + return session.isLogged(); + } + + @Override + protected LicenseDTO getCurrentDefLicense() { + return session.getCurrentState().getGroup().getDefaultLicense(); + } + + @Override + protected StateToken getOperationToken() { + return session.getCurrentUser().getStateToken(); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicenseView.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicenseView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicenseView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicenseView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.license; + +public interface UserOptDefLicenseView extends EntityOptDefLicenseView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptDefLicenseView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicense.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicense.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicense.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.license; - -public interface UserOptionsDefLicense extends EntityOptionsDefLicense { - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePanel.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,34 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.license; - -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.inject.Inject; - -public class UserOptionsDefLicensePanel extends EntityOptionsDefLicensePanel implements UserOptionsDefLicenseView { - - @Inject - public UserOptionsDefLicensePanel(final I18nTranslationService i18n, final CoreResources res) { - super(i18n, res); - } - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePresenter.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,65 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.license; - -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.UserSignInEvent; -import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.gspace.client.licensewizard.LicenseChangeAction; -import cc.kune.gspace.client.licensewizard.LicenseWizard; -import cc.kune.gspace.client.options.UserOptions; - -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class UserOptionsDefLicensePresenter extends EntityOptionsDefLicensePresenter implements - UserOptionsDefLicense { - - @Inject - public UserOptionsDefLicensePresenter(final UserOptions entityOptions, final Session session, - final UserOptionsDefLicenseView view, final Provider<LicenseWizard> licenseWizard, - final Provider<LicenseChangeAction> licChangeAction) { - super(entityOptions, session, licenseWizard, licChangeAction); - init(view); - session.onUserSignIn(true, new UserSignInHandler() { - @Override - public void onUserSignIn(final UserSignInEvent event) { - setState(); - } - }); - } - - @Override - protected boolean applicable() { - return session.isLogged(); - } - - @Override - protected LicenseDTO getCurrentDefLicense() { - return session.getCurrentState().getGroup().getDefaultLicense(); - } - - @Override - protected StateToken getOperationToken() { - return session.getCurrentUser().getStateToken(); - } -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicenseView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicenseView.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicenseView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.license; - -public interface UserOptionsDefLicenseView extends EntityOptionsDefLicenseView { - -} Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogo.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogo.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogo.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogo.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,23 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + \*/ +package cc.kune.gspace.client.options.logo; + +public interface EntityOptLogo { +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogo.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java (from rev 1412, trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,117 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + \*/ +package cc.kune.gspace.client.options.logo; + +import gwtupload.client.IUploader.OnCancelUploaderHandler; +import gwtupload.client.IUploader.OnChangeUploaderHandler; +import gwtupload.client.IUploader.OnFinishUploaderHandler; +import gwtupload.client.IUploader.OnStartUploaderHandler; +import cc.kune.common.client.ui.IconLabel; +import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.client.services.FileConstants; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.EntityOptionsView; + +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.IsWidget; + +public class EntityOptLogoPanel extends Composite implements EntityOptLogoView { + + public static final String ICON_UPLD_SERVLET = "servlets/EntityLogoUploadManager"; + private final EntityUploaderForm uploader; + private final I18nTranslationService i18n; + private final IconLabel tabTitle; + + public EntityOptLogoPanel(final EventBus eventBus, final I18nTranslationService i18n, + final String panelId, final String buttonId, final String inputId, final NavResources res) { + super(); + this.i18n = i18n; + tabTitle = new IconLabel(res.picture(), ""); + + uploader = new EntityUploaderForm(ICON_UPLD_SERVLET, i18n.t("Choose")); + + initWidget(uploader); + setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); + setWidth(String.valueOf(EntityOptionsView.WIDTH) + "px"); + + addStyleName("k-overflow-y-auto"); + addStyleName("k-tab-panel"); + } + + @Override + public HandlerRegistration addOnCancelUploadHandler(final OnCancelUploaderHandler handler) { + return uploader.addOnCancelUploadHandler(handler); + } + + @Override + public HandlerRegistration addOnChangeUploadHandler(final OnChangeUploaderHandler handler) { + return uploader.addOnChangeUploadHandler(handler); + } + + @Override + public HandlerRegistration addOnFinishUploadHandler(final OnFinishUploaderHandler handler) { + return uploader.addOnFinishUploadHandler(handler); + } + + @Override + public HandlerRegistration addOnStartUploadHandler(final OnStartUploaderHandler handler) { + return uploader.addOnStartUploadHandler(handler); + } + + @Override + public OnAcceptCallback getOnSubmit() { + return null; + } + + @Override + public IsWidget getTabTitle() { + return tabTitle; + } + + public void reset() { + uploader.reset(); + } + + @Override + public void setNormalGroupsLabels() { + uploader.setLabelText(i18n.t("Select an image in your computer as the logo for this group. " + + "For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images.", + FileConstants.LOGO_DEF_HEIGHT, FileConstants.LOGO_DEF_HEIGHT)); + tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_NORMAL_TITLE); + } + + @Override + public void setPersonalGroupsLabels() { + uploader.setLabelText(i18n.t("Select an image in your computer as your avatar. " + + "For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images.", + FileConstants.LOGO_DEF_HEIGHT, FileConstants.LOGO_DEF_HEIGHT)); + tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_PERSON_TITLE); + } + + @Override + public void setUploadParams(final String userHash, final String token) { + uploader.setUploadParams(userHash, token); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPresenter.java (from rev 1412, trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,94 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + \*/ +package cc.kune.gspace.client.options.logo; + +import gwtupload.client.IUploadStatus.Status; +import gwtupload.client.IUploader; +import gwtupload.client.IUploader.OnFinishUploaderHandler; +import gwtupload.client.IUploader.OnStartUploaderHandler; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.EntityOptions; + +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.inject.Provider; + +public abstract class EntityOptLogoPresenter implements GroupOptLogo, UserOptLogo { + private final EntityOptions entityOptions; + protected final EventBus eventBus; + private final I18nTranslationService i18n; + protected final Session session; + protected final Provider<UserServiceAsync> userService; + protected EntityOptLogoView view; + + public EntityOptLogoPresenter(final EventBus eventBus, final Session session, + final EntityOptions entityOptions, final Provider<UserServiceAsync> userService, + final I18nTranslationService i18n) { + this.eventBus = eventBus; + this.session = session; + this.entityOptions = entityOptions; + this.userService = userService; + this.i18n = i18n; + } + + public IsWidget getView() { + return view; + } + + protected void init(final EntityOptLogoView view) { + this.view = view; + entityOptions.addTab(view, view.getTabTitle()); + setState(); + view.addOnStartUploadHandler(new OnStartUploaderHandler() { + @Override + public void onStart(final IUploader uploader) { + setState(); + } + }); + view.addOnFinishUploadHandler(new OnFinishUploaderHandler() { + @Override + public void onFinish(final IUploader uploader) { + onSubmitComplete(uploader); + } + }); + } + + public void onSubmitComplete(final IUploader uploader) { + final String response = uploader.getServerInfo().message; + if (uploader.getStatus() == Status.SUCCESS) { + if (response != null) { + NotifyUser.info(response); + } + CurrentLogoChangedEvent.fire(eventBus); + } else { + onSubmitFailed(response); + } + } + + public void onSubmitFailed(final String responseText) { + NotifyUser.error(i18n.t("Error setting the logo", responseText)); + } + + protected abstract void setState(); + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPresenter.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoView.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,47 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + \*/ +package cc.kune.gspace.client.options.logo; + +import gwtupload.client.IUploader; +import gwtupload.client.IUploader.OnCancelUploaderHandler; +import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.gspace.client.options.EntityOptionsTabView; + +import com.google.gwt.event.shared.HandlerRegistration; + +public interface EntityOptLogoView extends EntityOptionsTabView { + + HandlerRegistration addOnCancelUploadHandler(OnCancelUploaderHandler handler); + + HandlerRegistration addOnChangeUploadHandler(IUploader.OnChangeUploaderHandler handler); + + HandlerRegistration addOnFinishUploadHandler(IUploader.OnFinishUploaderHandler handler); + + HandlerRegistration addOnStartUploadHandler(IUploader.OnStartUploaderHandler handler); + + OnAcceptCallback getOnSubmit(); + + void setNormalGroupsLabels(); + + void setPersonalGroupsLabels(); + + void setUploadParams(String userHash, String token); + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoView.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptUploadButton.java (from rev 1412, trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsUploadButton.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptUploadButton.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptUploadButton.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,33 @@ +package cc.kune.gspace.client.options.logo; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.DecoratorPanel; +import com.google.gwt.user.client.ui.HasText; + +public class EntityOptUploadButton extends Composite implements HasClickHandlers { + private final Button btn; + DecoratorPanel widget = new DecoratorPanel(); + + public EntityOptUploadButton(final String text) { + final DecoratorPanel widget = new DecoratorPanel(); + btn = new Button(text); + btn.addStyleName("k-button"); + initWidget(widget); + widget.setWidget(btn); + widget.setHeight("50px"); + } + + @Override + public HandlerRegistration addClickHandler(final ClickHandler handler) { + return addDomHandler(handler, ClickEvent.getType()); + } + + public HasText getBtn() { + return btn; + } +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptUploadButton.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogo.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogo.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogo.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,23 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package cc.kune.gspace.client.options.logo; - -public interface EntityOptionsLogo { -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPanel.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,117 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package cc.kune.gspace.client.options.logo; - -import gwtupload.client.IUploader.OnCancelUploaderHandler; -import gwtupload.client.IUploader.OnChangeUploaderHandler; -import gwtupload.client.IUploader.OnFinishUploaderHandler; -import gwtupload.client.IUploader.OnStartUploaderHandler; -import cc.kune.common.client.ui.IconLabel; -import cc.kune.common.client.utils.OnAcceptCallback; -import cc.kune.core.client.resources.CoreMessages; -import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.client.services.FileConstants; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.options.EntityOptionsView; - -import com.google.gwt.event.shared.EventBus; -import com.google.gwt.event.shared.HandlerRegistration; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.IsWidget; - -public class EntityOptionsLogoPanel extends Composite implements EntityOptionsLogoView { - - public static final String ICON_UPLD_SERVLET = "servlets/EntityLogoUploadManager"; - private final EntityUploaderForm uploader; - private final I18nTranslationService i18n; - private final IconLabel tabTitle; - - public EntityOptionsLogoPanel(final EventBus eventBus, final I18nTranslationService i18n, - final String panelId, final String buttonId, final String inputId, final NavResources res) { - super(); - this.i18n = i18n; - tabTitle = new IconLabel(res.picture(), ""); - - uploader = new EntityUploaderForm(ICON_UPLD_SERVLET, i18n.t("Choose")); - - initWidget(uploader); - setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); - setWidth(String.valueOf(EntityOptionsView.WIDTH) + "px"); - - addStyleName("k-overflow-y-auto"); - addStyleName("k-tab-panel"); - } - - @Override - public HandlerRegistration addOnCancelUploadHandler(final OnCancelUploaderHandler handler) { - return uploader.addOnCancelUploadHandler(handler); - } - - @Override - public HandlerRegistration addOnChangeUploadHandler(final OnChangeUploaderHandler handler) { - return uploader.addOnChangeUploadHandler(handler); - } - - @Override - public HandlerRegistration addOnFinishUploadHandler(final OnFinishUploaderHandler handler) { - return uploader.addOnFinishUploadHandler(handler); - } - - @Override - public HandlerRegistration addOnStartUploadHandler(final OnStartUploaderHandler handler) { - return uploader.addOnStartUploadHandler(handler); - } - - @Override - public OnAcceptCallback getOnSubmit() { - return null; - } - - @Override - public IsWidget getTabTitle() { - return tabTitle; - } - - public void reset() { - uploader.reset(); - } - - @Override - public void setNormalGroupsLabels() { - uploader.setLabelText(i18n.t("Select an image in your computer as the logo for this group. " - + "For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images.", - FileConstants.LOGO_DEF_HEIGHT, FileConstants.LOGO_DEF_HEIGHT)); - tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_NORMAL_TITLE); - } - - @Override - public void setPersonalGroupsLabels() { - uploader.setLabelText(i18n.t("Select an image in your computer as your avatar. " - + "For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images.", - FileConstants.LOGO_DEF_HEIGHT, FileConstants.LOGO_DEF_HEIGHT)); - tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_PERSON_TITLE); - } - - @Override - public void setUploadParams(final String userHash, final String token) { - uploader.setUploadParams(userHash, token); - } - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPresenter.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,94 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package cc.kune.gspace.client.options.logo; - -import gwtupload.client.IUploadStatus.Status; -import gwtupload.client.IUploader; -import gwtupload.client.IUploader.OnFinishUploaderHandler; -import gwtupload.client.IUploader.OnStartUploaderHandler; -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.core.client.rpcservices.UserServiceAsync; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.options.EntityOptions; - -import com.google.gwt.event.shared.EventBus; -import com.google.gwt.user.client.ui.IsWidget; -import com.google.inject.Provider; - -public abstract class EntityOptionsLogoPresenter implements GroupOptionsLogo, UserOptionsLogo { - private final EntityOptions entityOptions; - protected final EventBus eventBus; - private final I18nTranslationService i18n; - protected final Session session; - protected final Provider<UserServiceAsync> userService; - protected EntityOptionsLogoView view; - - public EntityOptionsLogoPresenter(final EventBus eventBus, final Session session, - final EntityOptions entityOptions, final Provider<UserServiceAsync> userService, - final I18nTranslationService i18n) { - this.eventBus = eventBus; - this.session = session; - this.entityOptions = entityOptions; - this.userService = userService; - this.i18n = i18n; - } - - public IsWidget getView() { - return view; - } - - protected void init(final EntityOptionsLogoView view) { - this.view = view; - entityOptions.addTab(view, view.getTabTitle()); - setState(); - view.addOnStartUploadHandler(new OnStartUploaderHandler() { - @Override - public void onStart(final IUploader uploader) { - setState(); - } - }); - view.addOnFinishUploadHandler(new OnFinishUploaderHandler() { - @Override - public void onFinish(final IUploader uploader) { - onSubmitComplete(uploader); - } - }); - } - - public void onSubmitComplete(final IUploader uploader) { - final String response = uploader.getServerInfo().message; - if (uploader.getStatus() == Status.SUCCESS) { - if (response != null) { - NotifyUser.info(response); - } - CurrentLogoChangedEvent.fire(eventBus); - } else { - onSubmitFailed(response); - } - } - - public void onSubmitFailed(final String responseText) { - NotifyUser.error(i18n.t("Error setting the logo", responseText)); - } - - protected abstract void setState(); - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoView.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,47 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package cc.kune.gspace.client.options.logo; - -import gwtupload.client.IUploader; -import gwtupload.client.IUploader.OnCancelUploaderHandler; -import cc.kune.common.client.utils.OnAcceptCallback; -import cc.kune.gspace.client.options.EntityOptionsTabView; - -import com.google.gwt.event.shared.HandlerRegistration; - -public interface EntityOptionsLogoView extends EntityOptionsTabView { - - HandlerRegistration addOnCancelUploadHandler(OnCancelUploaderHandler handler); - - HandlerRegistration addOnChangeUploadHandler(IUploader.OnChangeUploaderHandler handler); - - HandlerRegistration addOnFinishUploadHandler(IUploader.OnFinishUploaderHandler handler); - - HandlerRegistration addOnStartUploadHandler(IUploader.OnStartUploaderHandler handler); - - OnAcceptCallback getOnSubmit(); - - void setNormalGroupsLabels(); - - void setPersonalGroupsLabels(); - - void setUploadParams(String userHash, String token); - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsUploadButton.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsUploadButton.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsUploadButton.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,27 +0,0 @@ -package cc.kune.gspace.client.options.logo; - -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.dom.client.HasClickHandlers; -import com.google.gwt.event.shared.HandlerRegistration; -import com.google.gwt.user.client.ui.Button; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.DecoratorPanel; - -public class EntityOptionsUploadButton extends Composite implements HasClickHandlers { - DecoratorPanel widget = new DecoratorPanel(); - - public EntityOptionsUploadButton(final String text) { - final DecoratorPanel widget = new DecoratorPanel(); - final Button btn = new Button(text); - btn.addStyleName("k-button"); - initWidget(widget); - widget.setWidget(btn); - widget.setHeight("50px"); - } - - @Override - public HandlerRegistration addClickHandler(final ClickHandler handler) { - return addDomHandler(handler, ClickEvent.getType()); - } -} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityUploaderForm.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityUploaderForm.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityUploaderForm.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -11,31 +11,30 @@ import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.HasText; import com.google.gwt.user.client.ui.Hidden; import com.google.gwt.user.client.ui.Label; public class EntityUploaderForm extends Composite { + private final EntityOptUploadButton btn; private final Label dialogInfoLabel; private final Hidden tokenField; private final MultiUploader uploader; private final Hidden userhashField; public EntityUploaderForm(final String servlet, final String btnText) { - final EntityOptionsUploadButton btn = new EntityOptionsUploadButton(btnText); + btn = new EntityOptUploadButton(btnText); uploader = new MultiUploader(FileInputType.CUSTOM.with(btn)); uploader.setServletPath(servlet); uploader.setMaximumFiles(1); + uploader.setValidExtensions("png", "jpg", "gif", "jpeg", "bmp"); dialogInfoLabel = new Label(); dialogInfoLabel.setWordWrap(true); dialogInfoLabel.addStyleName("kune-Margin-20-tb"); - uploader.setValidExtensions("png", "jpg", "gif", "jpeg", "bmp"); - userhashField = new Hidden(FileConstants.HASH, FileConstants.HASH); tokenField = new Hidden(FileConstants.TOKEN, FileConstants.TOKEN); - final FlowPanel holder = new FlowPanel(); - uploader.add(userhashField); uploader.add(tokenField); holder.add(dialogInfoLabel); @@ -59,6 +58,10 @@ return uploader.addOnStartUploadHandler(handler); } + public HasText getBtn() { + return btn.getBtn(); + } + public void reset() { uploader.reset(); } Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogo.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogo.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogo.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogo.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.logo; + +public interface GroupOptLogo extends EntityOptLogo { + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPanel.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,38 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.logo; + +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.client.services.FileConstants; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; + +public class GroupOptLogoPanel extends EntityOptLogoPanel implements GroupOptLogoView { + public static final String BUTTON_ID = "k-golp-sendb"; + public static final String PANEL_ID = "k-golp-pan"; + + @Inject + public GroupOptLogoPanel(final EventBus eventBus, final I18nTranslationService i18n, final NavResources res) { + super(eventBus, i18n, PANEL_ID, BUTTON_ID, FileConstants.GROUP_LOGO_FIELD, res); + } + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPresenter.java (from rev 1412, trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,60 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.logo; + +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.GroupChangedEvent; +import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.GroupOptions; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class GroupOptLogoPresenter extends EntityOptLogoPresenter { + + @Inject + public GroupOptLogoPresenter(final EventBus eventBus, final Session session, + final GroupOptions entityOptions, final StateManager stateManager, + final Provider<UserServiceAsync> userService, final GroupOptLogoView view, + final I18nTranslationService i18n) { + super(eventBus, session, entityOptions, userService, i18n); + init(view); + stateManager.onGroupChanged(true, new GroupChangedHandler() { + @Override + public void onGroupChanged(final GroupChangedEvent event) { + setState(); + } + }); + } + + private void init(final GroupOptLogoView view) { + super.init(view); + view.setNormalGroupsLabels(); + } + + @Override + protected void setState() { + view.setUploadParams(session.getUserHash(), session.getCurrentStateToken().toString()); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoView.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.logo; + +public interface GroupOptLogoView extends EntityOptLogoView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptLogoView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogo.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogo.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogo.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.logo; - -public interface GroupOptionsLogo extends EntityOptionsLogo { - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPanel.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,38 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.logo; - -import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.client.services.FileConstants; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.gwt.event.shared.EventBus; -import com.google.inject.Inject; - -public class GroupOptionsLogoPanel extends EntityOptionsLogoPanel implements GroupOptionsLogoView { - public static final String BUTTON_ID = "k-golp-sendb"; - public static final String PANEL_ID = "k-golp-pan"; - - @Inject - public GroupOptionsLogoPanel(final EventBus eventBus, final I18nTranslationService i18n, final NavResources res) { - super(eventBus, i18n, PANEL_ID, BUTTON_ID, FileConstants.GROUP_LOGO_FIELD, res); - } - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPresenter.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,60 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.logo; - -import cc.kune.core.client.rpcservices.UserServiceAsync; -import cc.kune.core.client.state.GroupChangedEvent; -import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.options.GroupOptions; - -import com.google.gwt.event.shared.EventBus; -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class GroupOptionsLogoPresenter extends EntityOptionsLogoPresenter { - - @Inject - public GroupOptionsLogoPresenter(final EventBus eventBus, final Session session, - final GroupOptions entityOptions, final StateManager stateManager, - final Provider<UserServiceAsync> userService, final GroupOptionsLogoView view, - final I18nTranslationService i18n) { - super(eventBus, session, entityOptions, userService, i18n); - init(view); - stateManager.onGroupChanged(true, new GroupChangedHandler() { - @Override - public void onGroupChanged(final GroupChangedEvent event) { - setState(); - } - }); - } - - private void init(final GroupOptionsLogoView view) { - super.init(view); - view.setNormalGroupsLabels(); - } - - @Override - protected void setState() { - view.setUploadParams(session.getUserHash(), session.getCurrentStateToken().toString()); - } -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoView.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.logo; - -public interface GroupOptionsLogoView extends EntityOptionsLogoView { - -} Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogo.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogo.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogo.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogo.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.logo; + +public interface UserOptLogo extends EntityOptLogo { + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPanel.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,38 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.logo; + +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.client.services.FileConstants; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; + +public class UserOptLogoPanel extends EntityOptLogoPanel implements UserOptLogoView { + public static final String BUTTON_ID = "k-uolp-sendb"; + public static final String PANEL_ID = "k-uolp-pan"; + + @Inject + public UserOptLogoPanel(final EventBus eventBus, final I18nTranslationService i18n, final NavResources res) { + super(eventBus, i18n, PANEL_ID, BUTTON_ID, FileConstants.USER_LOGO_FIELD, res); + } + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPresenter.java (from rev 1412, trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,79 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.logo; + +import gwtupload.client.IUploader; +import cc.kune.core.client.events.AvatarChangedEvent; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.state.UserSignInEvent; +import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.UserOptions; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class UserOptLogoPresenter extends EntityOptLogoPresenter { + + @Inject + public UserOptLogoPresenter(final EventBus eventBus, final Session session, + final UserOptions entityOptions, final StateManager stateManager, + final Provider<UserServiceAsync> userService, final UserOptLogoView view, + final I18nTranslationService i18n) { + super(eventBus, session, entityOptions, userService, i18n); + init(view); + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + setState(); + } + }); + } + + private void init(final UserOptLogoView view) { + super.init(view); + view.setPersonalGroupsLabels(); + } + + @Override + public void onSubmitComplete(final IUploader uploader) { + super.onSubmitComplete(uploader); + final GroupDTO group = session.getCurrentState().getGroup(); + if (session.getCurrentUser().getShortName().equals(group.getShortName())) { + userService.get().getUserAvatarBaser64(session.getUserHash(), group.getStateToken(), + new AsyncCallbackSimple<String>() { + @Override + public void onSuccess(final String photoBinary) { + AvatarChangedEvent.fire(eventBus, photoBinary); + } + }); + } + } + + @Override + protected void setState() { + view.setUploadParams(session.getUserHash(), session.getCurrentUser().getStateToken().toString()); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoView.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.logo; + +public interface UserOptLogoView extends EntityOptLogoView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptLogoView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogo.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogo.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogo.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.logo; - -public interface UserOptionsLogo extends EntityOptionsLogo { - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPanel.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,38 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.logo; - -import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.client.services.FileConstants; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.gwt.event.shared.EventBus; -import com.google.inject.Inject; - -public class UserOptionsLogoPanel extends EntityOptionsLogoPanel implements UserOptionsLogoView { - public static final String BUTTON_ID = "k-uolp-sendb"; - public static final String PANEL_ID = "k-uolp-pan"; - - @Inject - public UserOptionsLogoPanel(final EventBus eventBus, final I18nTranslationService i18n, final NavResources res) { - super(eventBus, i18n, PANEL_ID, BUTTON_ID, FileConstants.USER_LOGO_FIELD, res); - } - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPresenter.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,79 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.logo; - -import gwtupload.client.IUploader; -import cc.kune.core.client.events.AvatarChangedEvent; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.UserServiceAsync; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.state.UserSignInEvent; -import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.options.UserOptions; - -import com.google.gwt.event.shared.EventBus; -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class UserOptionsLogoPresenter extends EntityOptionsLogoPresenter { - - @Inject - public UserOptionsLogoPresenter(final EventBus eventBus, final Session session, - final UserOptions entityOptions, final StateManager stateManager, - final Provider<UserServiceAsync> userService, final UserOptionsLogoView view, - final I18nTranslationService i18n) { - super(eventBus, session, entityOptions, userService, i18n); - init(view); - session.onUserSignIn(true, new UserSignInHandler() { - @Override - public void onUserSignIn(final UserSignInEvent event) { - setState(); - } - }); - } - - private void init(final UserOptionsLogoView view) { - super.init(view); - view.setPersonalGroupsLabels(); - } - - @Override - public void onSubmitComplete(final IUploader uploader) { - super.onSubmitComplete(uploader); - final GroupDTO group = session.getCurrentState().getGroup(); - if (session.getCurrentUser().getShortName().equals(group.getShortName())) { - userService.get().getUserAvatarBaser64(session.getUserHash(), group.getStateToken(), - new AsyncCallbackSimple<String>() { - @Override - public void onSuccess(final String photoBinary) { - AvatarChangedEvent.fire(eventBus, photoBinary); - } - }); - } - } - - @Override - protected void setState() { - view.setUploadParams(session.getUserHash(), session.getCurrentUser().getStateToken().toString()); - } -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoView.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.logo; - -public interface UserOptionsLogoView extends EntityOptionsLogoView { - -} Copied: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStyle.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConf.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStyle.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStyle.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.style; + + +public interface EntityOptStyle { +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java (from rev 1412, trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,179 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.style; + +import gwtupload.client.IUploader.OnCancelUploaderHandler; +import gwtupload.client.IUploader.OnChangeUploaderHandler; +import gwtupload.client.IUploader.OnFinishUploaderHandler; +import gwtupload.client.IUploader.OnStartUploaderHandler; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.common.client.ui.BasicThumb; +import cc.kune.common.client.ui.IconLabel; +import cc.kune.common.client.utils.TextUtils; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.EntityOptionsView; +import cc.kune.gspace.client.options.logo.EntityUploaderForm; +import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.VerticalPanel; + +public class EntityOptStylePanel extends FlowPanel implements EntityOptStyleView { + + public static final String ICON_UPLD_SERVLET = "servlets/EntityBackgroundUploadManager"; + private final Label backgroundLabel; + private final Image backImage; + private final String changeImage; + private final String chooseImage; + private final Button clearBtn; + private final String hasBackLabel; + private final String noHasBacklabel; + private final IconLabel tabTitle; + private final EntityUploaderForm uploader; + + public EntityOptStylePanel(final I18nTranslationService i18n, final CoreResources res, + final GSpaceThemeSelectorPanel styleSelector) { + tabTitle = new IconLabel(res.themeChoose(), i18n.t("Style")); + super.setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); + super.setWidth(String.valueOf(EntityOptionsView.WIDTH) + "px"); + + final FlowPanel flow = new FlowPanel(); + final Label wsThemeInfo = new Label(i18n.t("Change this workspace theme:")); + flow.addStyleName("kune-Margin-20-tb"); + wsThemeInfo.addStyleName("k-fl"); + styleSelector.addStyleName("k-fl"); + styleSelector.addStyleName("kune-Margin-10-lr"); + flow.add(wsThemeInfo); + flow.add(styleSelector); + hasBackLabel = i18n.t("Current background image: "); + noHasBacklabel = i18n.t("Also you can upload a background:"); + backgroundLabel = new Label(hasBackLabel); + backgroundLabel.addStyleName("k-clear"); + chooseImage = i18n.t("Choose"); + changeImage = i18n.t("Change"); + uploader = new EntityUploaderForm(ICON_UPLD_SERVLET, chooseImage); + uploader.addStyleName("k-fl"); + backImage = new Image(); + backImage.addStyleName("kune-Margin-Medium-trbl"); + clearBtn = new Button(i18n.t("Clear")); + clearBtn.setStyleName("k-button"); + clearBtn.addStyleName("k-fl"); + clearBtn.addStyleName("kune-Margin-20-lr"); + Tooltip.to(clearBtn, i18n.t("Remove current background image")); + flow.add(backgroundLabel); + flow.add(backImage); + flow.add(clearBtn); + flow.add(uploader); + flow.addStyleName("oc-clean"); + backImage.addStyleName("k-fl"); + add(flow); + final Label wsInfo = new Label(i18n.t("Select and configure the public space theme of this group:")); + wsInfo.addStyleName("kune-Margin-Medium-tb"); + // add(wsInfo); + + final VerticalPanel stylesPanel = new VerticalPanel(); + final ClickHandler clickHandler = new ClickHandler() { + + @Override + public void onClick(final ClickEvent event) { + NotifyUser.info(TextUtils.IN_DEVELOPMENT); + } + }; + for (int i = 1; i <= 6; i++) { + final BasicThumb thumb = new BasicThumb("images/styles/styl" + i + ".png", "Style " + i, + clickHandler); + thumb.setTooltip(i18n.t("Click to select and configure this theme")); + // add(thumb); + } + stylesPanel.addStyleName("oc-clean"); + add(stylesPanel); + setBackImageVisibleImpl(false); + super.addStyleName("k-overflow-y-auto"); + super.addStyleName("k-tab-panel"); + } + + @Override + public HandlerRegistration addOnCancelUploadHandler(final OnCancelUploaderHandler handler) { + return uploader.addOnCancelUploadHandler(handler); + } + + @Override + public HandlerRegistration addOnChangeUploadHandler(final OnChangeUploaderHandler handler) { + return uploader.addOnChangeUploadHandler(handler); + } + + @Override + public HandlerRegistration addOnFinishUploadHandler(final OnFinishUploaderHandler handler) { + return uploader.addOnFinishUploadHandler(handler); + } + + @Override + public HandlerRegistration addOnStartUploadHandler(final OnStartUploaderHandler handler) { + return uploader.addOnStartUploadHandler(handler); + } + + @Override + public void clearBackImage() { + setBackImageVisibleImpl(false); + } + + @Override + public HasClickHandlers getClearBtn() { + return clearBtn; + } + + @Override + public IsWidget getTabTitle() { + return tabTitle; + } + + @Override + public void reset() { + uploader.reset(); + } + + @Override + public void setBackImage(final String url) { + backImage.setUrl(url); + setBackImageVisibleImpl(true); + } + + private void setBackImageVisibleImpl(final boolean visible) { + backImage.setVisible(visible); + clearBtn.setVisible(visible); + backgroundLabel.setText(visible ? hasBackLabel : noHasBacklabel); + uploader.getBtn().setText(visible ? changeImage : chooseImage); + } + + @Override + public void setUploadParams(final String userHash, final String token) { + uploader.setUploadParams(userHash, token); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePresenter.java (from rev 1412, trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,169 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.style; + +import gwtupload.client.IUploadStatus.Status; +import gwtupload.client.IUploader; +import gwtupload.client.IUploader.OnFinishUploaderHandler; +import gwtupload.client.IUploader.OnStartUploaderHandler; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.utils.TextUtils; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.ImageSize; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateChangedEvent; +import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.EntityOptions; +import cc.kune.gspace.client.style.ClearBackImageEvent; +import cc.kune.gspace.client.style.GSpaceBackManager; +import cc.kune.gspace.client.style.SetBackImageEvent; +import cc.kune.gspace.client.themes.GSpaceThemeSelectorPresenter; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.inject.Provider; + +public abstract class EntityOptStylePresenter implements EntityOptStyle { + private final GSpaceBackManager backManager; + private final EntityOptions entityOptions; + private final EventBus eventBus; + private final FileDownloadUtils fileDownloadUtils; + private final Provider<GroupServiceAsync> groupService; + private final I18nTranslationService i18n; + private final Session session; + private final StateManager stateManager; + private EntityOptStyleView view; + + protected EntityOptStylePresenter(final EventBus eventBus, final Session session, + final StateManager stateManager, final EntityOptions entityOptions, + final Provider<GroupServiceAsync> groupService, final GSpaceBackManager backManager, + final GSpaceThemeSelectorPresenter styleSelector, final I18nTranslationService i18n, + final FileDownloadUtils fileDownloadUtils) { + this.eventBus = eventBus; + this.session = session; + this.stateManager = stateManager; + this.entityOptions = entityOptions; + this.groupService = groupService; + this.backManager = backManager; + this.i18n = i18n; + this.fileDownloadUtils = fileDownloadUtils; + } + + private void clearBackImage() { + groupService.get().clearGroupBackImage(session.getUserHash(), session.getCurrentStateToken(), + new AsyncCallbackSimple<GroupDTO>() { + @Override + public void onSuccess(final GroupDTO result) { + view.clearBackImage(); + backManager.clearBackImage(); + ClearBackImageEvent.fire(eventBus); + } + }); + } + + public IsWidget getView() { + return view; + } + + public void init(final EntityOptStyleView view) { + this.view = view; + entityOptions.addTab(view, view.getTabTitle()); + setState(); + view.getClearBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + clearBackImage(); + } + }); + stateManager.onStateChanged(true, new StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + setState(); + } + }); + eventBus.addHandler(SetBackImageEvent.getType(), new SetBackImageEvent.SetBackImageHandler() { + @Override + public void onSetBackImage(final SetBackImageEvent event) { + final StateToken token = event.getToken(); + backManager.setBackImage(token); + setBackImage(event.getToken()); + } + }); + eventBus.addHandler(ClearBackImageEvent.getType(), new ClearBackImageEvent.ClearBackImageHandler() { + @Override + public void onClearBackImage(final ClearBackImageEvent event) { + view.clearBackImage(); + } + }); + view.addOnStartUploadHandler(new OnStartUploaderHandler() { + @Override + public void onStart(final IUploader uploader) { + setState(); + } + }); + view.addOnFinishUploadHandler(new OnFinishUploaderHandler() { + @Override + public void onFinish(final IUploader uploader) { + onSubmitComplete(uploader); + } + }); + } + + private void onSubmitComplete(final IUploader uploader) { + final String response = uploader.getServerInfo().message; + if (uploader.getStatus() == Status.SUCCESS) { + if (!TextUtils.empty(response)) { + NotifyUser.info(response); + } + SetBackImageEvent.fire(eventBus, session.getCurrentState().getGroup().getStateToken()); + } else { + onSubmitFailed(response); + } + } + + private void onSubmitFailed(final String responseText) { + NotifyUser.error(i18n.t("Error setting the background"), responseText); + } + + private void setBackImage(final StateToken token) { + view.setBackImage(fileDownloadUtils.getBackgroundResizedUrl(token, ImageSize.thumb)); + } + + private void setState() { + final StateAbstractDTO state = session.getCurrentState(); + final GroupDTO group = state.getGroup(); + if (group.getBackgroundImage() == null) { + view.clearBackImage(); + } else { + setBackImage(group.getStateToken()); + } + view.setUploadParams(session.getUserHash(), session.getCurrentStateToken().toString()); + } + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStyleView.java (from rev 1412, trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStyleView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStyleView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,49 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.style; + +import gwtupload.client.IUploader; +import gwtupload.client.IUploader.OnCancelUploaderHandler; +import cc.kune.gspace.client.options.EntityOptionsTabView; + +import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.event.shared.HandlerRegistration; + +public interface EntityOptStyleView extends EntityOptionsTabView { + + HandlerRegistration addOnCancelUploadHandler(OnCancelUploaderHandler handler); + + HandlerRegistration addOnChangeUploadHandler(IUploader.OnChangeUploaderHandler handler); + + HandlerRegistration addOnFinishUploadHandler(IUploader.OnFinishUploaderHandler handler); + + HandlerRegistration addOnStartUploadHandler(IUploader.OnStartUploaderHandler handler); + + public void clearBackImage(); + + HasClickHandlers getClearBtn(); + + void reset(); + + public void setBackImage(final String url); + + void setUploadParams(String userHash, String token); + +} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConf.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConf.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConf.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.style; - - -public interface EntityOptionsStyleConf { -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPanel.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,177 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.style; - -import gwtupload.client.IUploader.OnCancelUploaderHandler; -import gwtupload.client.IUploader.OnChangeUploaderHandler; -import gwtupload.client.IUploader.OnFinishUploaderHandler; -import gwtupload.client.IUploader.OnStartUploaderHandler; -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.common.client.tooltip.Tooltip; -import cc.kune.common.client.ui.BasicThumb; -import cc.kune.common.client.ui.IconLabel; -import cc.kune.common.client.utils.TextUtils; -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.options.EntityOptionsView; -import cc.kune.gspace.client.options.logo.EntityUploaderForm; -import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel; - -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.dom.client.HasClickHandlers; -import com.google.gwt.event.shared.HandlerRegistration; -import com.google.gwt.user.client.ui.Button; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.IsWidget; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.VerticalPanel; - -public class EntityOptionsStyleConfPanel extends FlowPanel implements EntityOptionsStyleConfView { - - public static final String ICON_UPLD_SERVLET = "servlets/EntityBackgroundUploadManager"; - private final Image backImage; - private final Button clearBtn; - private final Label currentBackLabel; - private final Label noBackLabel; - private final IconLabel tabTitle; - private final EntityUploaderForm uploader; - - public EntityOptionsStyleConfPanel(final I18nTranslationService i18n, final CoreResources res, - final GSpaceThemeSelectorPanel styleSelector) { - ; - tabTitle = new IconLabel(res.themeChoose(), i18n.t("Style")); - super.setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); - super.setWidth(String.valueOf(EntityOptionsView.WIDTH) + "px"); - - final FlowPanel flow = new FlowPanel(); - final Label wsThemeInfo = new Label(i18n.t("Change this workspace theme:")); - flow.addStyleName("kune-Margin-20-tb"); - wsThemeInfo.addStyleName("k-fl"); - styleSelector.addStyleName("k-fl"); - styleSelector.addStyleName("kune-Margin-10-trbl"); - flow.add(wsThemeInfo); - flow.add(styleSelector); - currentBackLabel = new Label(i18n.t("Current background image: ")); - noBackLabel = new Label(i18n.t("Also you can upload a background:")); - currentBackLabel.addStyleName("k-clear"); - noBackLabel.addStyleName("k-clear"); - uploader = new EntityUploaderForm(ICON_UPLD_SERVLET, i18n.t("Choose")); - uploader.addStyleName("k-fl"); - backImage = new Image(); - backImage.addStyleName("kune-Margin-Medium-trbl"); - noBackLabel.addStyleName("kune-Margin-Medium-tb"); - clearBtn = new Button(i18n.t("Clear")); - clearBtn.setStyleName("k-button"); - clearBtn.addStyleName("k-fl"); - Tooltip.to(clearBtn, i18n.t("Remove current background image")); - flow.add(noBackLabel); - flow.add(currentBackLabel); - flow.add(backImage); - flow.add(uploader); - flow.add(clearBtn); - flow.addStyleName("oc-clean"); - backImage.addStyleName("k-fr"); - add(flow); - final Label wsInfo = new Label(i18n.t("Select and configure the public space theme of this group:")); - wsInfo.addStyleName("kune-Margin-Medium-tb"); - // add(wsInfo); - - final VerticalPanel stylesPanel = new VerticalPanel(); - final ClickHandler clickHandler = new ClickHandler() { - - @Override - public void onClick(final ClickEvent event) { - NotifyUser.info(TextUtils.IN_DEVELOPMENT); - } - }; - for (int i = 1; i <= 6; i++) { - final BasicThumb thumb = new BasicThumb("images/styles/styl" + i + ".png", "Style " + i, - clickHandler); - thumb.setTooltip(i18n.t("Click to select and configure this theme")); - // add(thumb); - } - stylesPanel.addStyleName("oc-clean"); - add(stylesPanel); - setBackImageVisibleImpl(false); - super.addStyleName("k-overflow-y-auto"); - super.addStyleName("k-tab-panel"); - } - - @Override - public HandlerRegistration addOnCancelUploadHandler(final OnCancelUploaderHandler handler) { - return uploader.addOnCancelUploadHandler(handler); - } - - @Override - public HandlerRegistration addOnChangeUploadHandler(final OnChangeUploaderHandler handler) { - return uploader.addOnChangeUploadHandler(handler); - } - - @Override - public HandlerRegistration addOnFinishUploadHandler(final OnFinishUploaderHandler handler) { - return uploader.addOnFinishUploadHandler(handler); - } - - @Override - public HandlerRegistration addOnStartUploadHandler(final OnStartUploaderHandler handler) { - return uploader.addOnStartUploadHandler(handler); - } - - @Override - public void clearBackImage() { - setBackImageVisibleImpl(false); - } - - @Override - public HasClickHandlers getClearBtn() { - return clearBtn; - } - - @Override - public IsWidget getTabTitle() { - return tabTitle; - } - - @Override - public void reset() { - uploader.reset(); - } - - @Override - public void setBackImage(final String url) { - // backImage.setUrl(downUtils.getImageResizedUrl(token, ImageSize.thumb)); - backImage.setUrl(url); - setBackImageVisibleImpl(true); - } - - private void setBackImageVisibleImpl(final boolean visible) { - backImage.setVisible(visible); - currentBackLabel.setVisible(visible); - clearBtn.setVisible(visible); - noBackLabel.setVisible(!visible); - } - - @Override - public void setUploadParams(final String userHash, final String token) { - uploader.setUploadParams(userHash, token); - } -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPresenter.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,169 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.style; - -import gwtupload.client.IUploadStatus.Status; -import gwtupload.client.IUploader; -import gwtupload.client.IUploader.OnFinishUploaderHandler; -import gwtupload.client.IUploader.OnStartUploaderHandler; -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.common.client.utils.TextUtils; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.services.ImageSize; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateChangedEvent; -import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.options.EntityOptions; -import cc.kune.gspace.client.style.ClearBackImageEvent; -import cc.kune.gspace.client.style.GSpaceBackManager; -import cc.kune.gspace.client.style.SetBackImageEvent; -import cc.kune.gspace.client.themes.GSpaceThemeSelectorPresenter; - -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.shared.EventBus; -import com.google.gwt.user.client.ui.IsWidget; -import com.google.inject.Provider; - -public abstract class EntityOptionsStyleConfPresenter implements EntityOptionsStyleConf { - private final GSpaceBackManager backManager; - private final EntityOptions entityOptions; - private final EventBus eventBus; - private final FileDownloadUtils fileDownloadUtils; - private final Provider<GroupServiceAsync> groupService; - private final I18nTranslationService i18n; - private final Session session; - private final StateManager stateManager; - private EntityOptionsStyleConfView view; - - protected EntityOptionsStyleConfPresenter(final EventBus eventBus, final Session session, - final StateManager stateManager, final EntityOptions entityOptions, - final Provider<GroupServiceAsync> groupService, final GSpaceBackManager backManager, - final GSpaceThemeSelectorPresenter styleSelector, final I18nTranslationService i18n, - final FileDownloadUtils fileDownloadUtils) { - this.eventBus = eventBus; - this.session = session; - this.stateManager = stateManager; - this.entityOptions = entityOptions; - this.groupService = groupService; - this.backManager = backManager; - this.i18n = i18n; - this.fileDownloadUtils = fileDownloadUtils; - } - - private void clearBackImage() { - groupService.get().clearGroupBackImage(session.getUserHash(), session.getCurrentStateToken(), - new AsyncCallbackSimple<GroupDTO>() { - @Override - public void onSuccess(final GroupDTO result) { - view.clearBackImage(); - backManager.clearBackImage(); - ClearBackImageEvent.fire(eventBus); - } - }); - } - - public IsWidget getView() { - return view; - } - - public void init(final EntityOptionsStyleConfView view) { - this.view = view; - entityOptions.addTab(view, view.getTabTitle()); - setState(); - view.getClearBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - clearBackImage(); - } - }); - stateManager.onStateChanged(true, new StateChangedHandler() { - @Override - public void onStateChanged(final StateChangedEvent event) { - setState(); - } - }); - eventBus.addHandler(SetBackImageEvent.getType(), new SetBackImageEvent.SetBackImageHandler() { - @Override - public void onSetBackImage(final SetBackImageEvent event) { - final StateToken token = event.getToken(); - backManager.setBackImage(token); - setBackImage(event.getToken()); - } - }); - eventBus.addHandler(ClearBackImageEvent.getType(), new ClearBackImageEvent.ClearBackImageHandler() { - @Override - public void onClearBackImage(final ClearBackImageEvent event) { - view.clearBackImage(); - } - }); - view.addOnStartUploadHandler(new OnStartUploaderHandler() { - @Override - public void onStart(final IUploader uploader) { - setState(); - } - }); - view.addOnFinishUploadHandler(new OnFinishUploaderHandler() { - @Override - public void onFinish(final IUploader uploader) { - onSubmitComplete(uploader); - } - }); - } - - private void onSubmitComplete(final IUploader uploader) { - final String response = uploader.getServerInfo().message; - if (uploader.getStatus() == Status.SUCCESS) { - if (!TextUtils.empty(response)) { - NotifyUser.info(response); - } - SetBackImageEvent.fire(eventBus, session.getCurrentState().getGroup().getStateToken()); - } else { - onSubmitFailed(response); - } - } - - private void onSubmitFailed(final String responseText) { - NotifyUser.error(i18n.t("Error setting the background"), responseText); - } - - private void setBackImage(final StateToken token) { - view.setBackImage(fileDownloadUtils.getBackgroundResizedUrl(token, ImageSize.thumb)); - } - - private void setState() { - final StateAbstractDTO state = session.getCurrentState(); - final GroupDTO group = state.getGroup(); - if (group.getBackgroundImage() == null) { - view.clearBackImage(); - } else { - setBackImage(group.getStateToken()); - } - view.setUploadParams(session.getUserHash(), session.getCurrentStateToken().toString()); - } - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfView.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,49 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.style; - -import gwtupload.client.IUploader; -import gwtupload.client.IUploader.OnCancelUploaderHandler; -import cc.kune.gspace.client.options.EntityOptionsTabView; - -import com.google.gwt.event.dom.client.HasClickHandlers; -import com.google.gwt.event.shared.HandlerRegistration; - -public interface EntityOptionsStyleConfView extends EntityOptionsTabView { - - HandlerRegistration addOnCancelUploadHandler(OnCancelUploaderHandler handler); - - HandlerRegistration addOnChangeUploadHandler(IUploader.OnChangeUploaderHandler handler); - - HandlerRegistration addOnFinishUploadHandler(IUploader.OnFinishUploaderHandler handler); - - HandlerRegistration addOnStartUploadHandler(IUploader.OnStartUploaderHandler handler); - - public void clearBackImage(); - - HasClickHandlers getClearBtn(); - - void reset(); - - public void setBackImage(final String url); - - void setUploadParams(String userHash, String token); - -} Copied: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStyle.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConf.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStyle.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStyle.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.style; + +public interface GroupOptStyle extends EntityOptStyle { + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePanel.java (from rev 1412, trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,37 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.style; + +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel; + +import com.google.inject.Inject; + +public class GroupOptStylePanel extends EntityOptStylePanel implements + GroupOptStyleView { + + @Inject + public GroupOptStylePanel(final I18nTranslationService i18n, final CoreResources res, + final GSpaceThemeSelectorPanel styleSelector) { + super(i18n, res, styleSelector); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePresenter.java (from rev 1412, trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStylePresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,49 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.style; + +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.GroupOptions; +import cc.kune.gspace.client.style.GSpaceBackManager; +import cc.kune.gspace.client.themes.GSpaceThemeSelectorPresenter; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class GroupOptStylePresenter extends EntityOptStylePresenter implements + GroupOptStyle { + + @Inject + public GroupOptStylePresenter(final EventBus eventBus, final Session session, + final StateManager stateManager, final GroupOptions entityOptions, + final Provider<GroupServiceAsync> groupService, final GSpaceBackManager backManager, + final GroupOptStyleView view, final GSpaceThemeSelectorPresenter styleSelector, + final I18nTranslationService i18n, final FileDownloadUtils fileDownUtils) { + super(eventBus, session, stateManager, entityOptions, groupService, backManager, styleSelector, + i18n, fileDownUtils); + init(view); + } + +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStyleView.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStyleView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStyleView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.style; + +public interface GroupOptStyleView extends EntityOptStyleView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptStyleView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConf.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConf.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConf.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.style; - -public interface GroupOptionsStyleConf extends EntityOptionsStyleConf { - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfPanel.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,37 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.style; - -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel; - -import com.google.inject.Inject; - -public class GroupOptionsStyleConfPanel extends EntityOptionsStyleConfPanel implements - GroupOptionsStyleConfView { - - @Inject - public GroupOptionsStyleConfPanel(final I18nTranslationService i18n, final CoreResources res, - final GSpaceThemeSelectorPanel styleSelector) { - super(i18n, res, styleSelector); - } - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfPresenter.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,49 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.style; - -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.options.GroupOptions; -import cc.kune.gspace.client.style.GSpaceBackManager; -import cc.kune.gspace.client.themes.GSpaceThemeSelectorPresenter; - -import com.google.gwt.event.shared.EventBus; -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class GroupOptionsStyleConfPresenter extends EntityOptionsStyleConfPresenter implements - GroupOptionsStyleConf { - - @Inject - public GroupOptionsStyleConfPresenter(final EventBus eventBus, final Session session, - final StateManager stateManager, final GroupOptions entityOptions, - final Provider<GroupServiceAsync> groupService, final GSpaceBackManager backManager, - final GroupOptionsStyleConfView view, final GSpaceThemeSelectorPresenter styleSelector, - final I18nTranslationService i18n, final FileDownloadUtils fileDownUtils) { - super(eventBus, session, stateManager, entityOptions, groupService, backManager, styleSelector, - i18n, fileDownUtils); - init(view); - } - -} \ No newline at end of file Deleted: trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfView.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/GroupOptionsStyleConfView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.style; - -public interface GroupOptionsStyleConfView extends EntityOptionsStyleConfView { - -} Copied: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStyle.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConf.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStyle.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStyle.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.style; + +public interface UserOptStyle extends EntityOptStyle { + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePanel.java (from rev 1412, trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,37 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.style; + +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel; + +import com.google.inject.Inject; + +public class UserOptStylePanel extends EntityOptStylePanel implements + UserOptStyleView { + + @Inject + public UserOptStylePanel(final I18nTranslationService i18n, final CoreResources res, + final GSpaceThemeSelectorPanel styleSelector) { + super(i18n, res, styleSelector); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePresenter.java (from rev 1412, trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStylePresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,50 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.style; + +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.UserOptions; +import cc.kune.gspace.client.style.GSpaceBackManager; +import cc.kune.gspace.client.themes.GSpaceThemeSelectorPresenter; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class UserOptStylePresenter extends EntityOptStylePresenter implements + UserOptStyle { + + // private final WsThemeSelector themeSelector; + + @Inject + public UserOptStylePresenter(final EventBus eventBus, final Session session, + final StateManager stateManager, final UserOptions entityOptions, + final Provider<GroupServiceAsync> groupService, final GSpaceBackManager backManager, + final UserOptStyleView view, final GSpaceThemeSelectorPresenter styleSelector, + final I18nTranslationService i18n, final FileDownloadUtils fileDownUtils) { + super(eventBus, session, stateManager, entityOptions, groupService, backManager, styleSelector, + i18n, fileDownUtils); + init(view); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStyleView.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStyleView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStyleView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.style; + +public interface UserOptStyleView extends EntityOptStyleView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptStyleView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConf.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConf.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConf.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.style; - -public interface UserOptionsStyleConf extends EntityOptionsStyleConf { - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfPanel.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,37 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.style; - -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel; - -import com.google.inject.Inject; - -public class UserOptionsStyleConfPanel extends EntityOptionsStyleConfPanel implements - UserOptionsStyleConfView { - - @Inject - public UserOptionsStyleConfPanel(final I18nTranslationService i18n, final CoreResources res, - final GSpaceThemeSelectorPanel styleSelector) { - super(i18n, res, styleSelector); - } - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfPresenter.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,50 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.style; - -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.options.UserOptions; -import cc.kune.gspace.client.style.GSpaceBackManager; -import cc.kune.gspace.client.themes.GSpaceThemeSelectorPresenter; - -import com.google.gwt.event.shared.EventBus; -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class UserOptionsStyleConfPresenter extends EntityOptionsStyleConfPresenter implements - UserOptionsStyleConf { - - // private final WsThemeSelector themeSelector; - - @Inject - public UserOptionsStyleConfPresenter(final EventBus eventBus, final Session session, - final StateManager stateManager, final UserOptions entityOptions, - final Provider<GroupServiceAsync> groupService, final GSpaceBackManager backManager, - final UserOptionsStyleConfView view, final GSpaceThemeSelectorPresenter styleSelector, - final I18nTranslationService i18n, final FileDownloadUtils fileDownUtils) { - super(eventBus, session, stateManager, entityOptions, groupService, backManager, styleSelector, - i18n, fileDownUtils); - init(view); - } -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfView.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/UserOptionsStyleConfView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.style; - -public interface UserOptionsStyleConfView extends EntityOptionsStyleConfView { - -} Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptTools.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConf.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptTools.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptTools.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.tools; + +public interface EntityOptTools { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptTools.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,158 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.tools; + +import java.util.HashMap; + +import cc.kune.common.client.log.Log; +import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.common.client.ui.IconLabel; +import cc.kune.common.client.ui.MaskWidget; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.ui.DefaultForm; +import cc.kune.core.shared.dto.ToolSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.EntityOptionsView; + +import com.extjs.gxt.ui.client.event.BaseEvent; +import com.extjs.gxt.ui.client.event.Events; +import com.extjs.gxt.ui.client.event.Listener; +import com.extjs.gxt.ui.client.widget.form.CheckBox; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Widget; + +public class EntityOptToolsPanel extends DefaultForm implements EntityOptToolsView { + private final HashMap<String, CheckBox> fields; + private final I18nTranslationService i18n; + private final MaskWidget maskWidget; + private final IconLabel tabTitle; + + public EntityOptToolsPanel(final I18nTranslationService i18n, final CoreResources res, + final MaskWidget maskWidget) { + this.maskWidget = maskWidget; + tabTitle = new IconLabel(res.kunePreferences(), i18n.t("Tools")); + this.i18n = i18n; + // super.setHeight(EntityOptionsView.HEIGHT); + super.setWidth(EntityOptionsView.WIDTH); + super.setFrame(true); + // super.add(new HiddenField()); + super.getFormPanel().setLabelWidth(20); + fields = new HashMap<String, CheckBox>(); + super.addStyleName("k-overflow-y-auto"); + // super.addStyleName("k-tab-panel"); + } + + @Override + public void add(final ToolSimpleDTO tool, final boolean enabled, final boolean checked, + final ClickHandler handler) { + final CheckBox checkbox = new CheckBox(); + checkbox.setFieldLabel(tool.getRootName()); + // checkbox.setFireChangeEventOnSetValue(false); + checkbox.setValue(checked); + setEnabled(checkbox, enabled); + checkbox.addListener(Events.Change, new Listener<BaseEvent>() { + @Override + public void handleEvent(final BaseEvent be) { + handler.onClick(null); + } + }); + super.add(checkbox); + fields.put(tool.getName(), checkbox); + doLayoutIfNeeded(); + } + + @Override + public Widget asWidget() { + return super.getFormPanel(); + } + + @Override + public void clear() { + super.getFormPanel().removeAll(); + fields.clear(); + final Label label = new Label(); + label.setText(i18n.t("Here you can select the tools used:")); + label.addStyleName("kune-Margin-10-tb"); + super.add(label); + } + + private void doLayoutIfNeeded() { + if (super.getFormPanel().isRendered()) { + super.getFormPanel().layout(); + } + } + + @Override + public IsWidget getTabTitle() { + return tabTitle; + } + + private CheckBox getTool(final String tool) { + final CheckBox field = fields.get(tool); + if (field == null) { + Log.error("Field " + tool + " not found in EOTCP"); + } + return field; + } + + @Override + public boolean isChecked(final String tool) { + final CheckBox field = getTool(tool); + return field.getValue(); + } + + @Override + public void mask() { + maskWidget.mask(this); + } + + @Override + public void setChecked(final String tool, final boolean checked) { + final CheckBox field = getTool(tool); + field.setValue(checked); + } + + private void setEnabled(final CheckBox checkbox, final boolean enabled) { + if (enabled) { + checkbox.enable(); + } else { + checkbox.disable(); + } + } + + @Override + public void setEnabled(final String tool, final boolean enabled) { + final CheckBox field = getTool(tool); + setEnabled(field, enabled); + } + + @Override + public void setTooltip(final String tool, final String tip) { + final CheckBox field = getTool(tool); + Tooltip.to(field, tip); + } + + @Override + public void unmask() { + maskWidget.unMask(); + } +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPresenter.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,147 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.tools; + +import java.util.Collection; +import java.util.List; + +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.ToolSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.EntityOptions; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.inject.Provider; + +public abstract class EntityOptToolsPresenter { + + private final EntityOptions entityOptions; + private final Provider<GroupServiceAsync> groupService; + protected final I18nTranslationService i18n; + protected final Session session; + protected final StateManager stateManager; + private EntityOptToolsView view; + + public EntityOptToolsPresenter(final Session session, final StateManager stateManager, + final I18nTranslationService i18n, final EntityOptions entityOptions, + final Provider<GroupServiceAsync> groupService) { + this.session = session; + this.stateManager = stateManager; + this.i18n = i18n; + this.entityOptions = entityOptions; + this.groupService = groupService; + } + + protected abstract boolean applicable(); + + protected abstract Collection<ToolSimpleDTO> getAllTools(); + + protected abstract StateToken getDefContentToken(); + + protected abstract String getDefContentTooltip(); + + protected abstract List<String> getEnabledTools(); + + protected abstract StateToken getOperationToken(); + + public IsWidget getView() { + return view; + } + + protected abstract void gotoDifLocationIfNecessary(String toolName); + + public void init(final EntityOptToolsView view) { + this.view = view; + setState(); + entityOptions.addTab(view, view.getTabTitle()); + } + + private void onCheck(final ToolSimpleDTO tool, final boolean checked) { + final List<String> enabledTools = getEnabledTools(); + final String toolName = tool.getName(); + setToolCheckedInServer(checked, toolName); + if (!checked) { + if (enabledTools.contains(toolName)) { + // FIXME uncomment this when fixed + // setToolCheckedInServer(checked, toolName); + // gotoDifLocationIfNecessary(toolName); + } + } + } + + protected void reset() { + view.clear(); + entityOptions.hideMessages(); + } + + protected void setState() { + reset(); + final Collection<ToolSimpleDTO> toolCollection = getAllTools(); + final List<String> enabledTools = getEnabledTools(); + for (final ToolSimpleDTO tool : toolCollection) { + final boolean checked = enabledTools.contains(tool.getName()); + final boolean enabled = true; + view.add(tool, enabled, checked, new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + onCheck(tool, view.isChecked(tool.getName())); + } + }); + } + // Disable def content tool (don't works now) + final StateToken token = getDefContentToken(); + if (token != null) { + final String defContentTool = token.getTool(); + if (defContentTool != null) { + // view.setEnabled(defContentTool, false); + view.setTooltip(defContentTool, getDefContentTooltip()); + } + } + } + + protected void setToolCheckedInServer(final boolean checked, final String toolName) { + // view.mask(); + // NotifyUser.info("Dis/Enabling tool" + toolName + " - " + checked); + groupService.get().setToolEnabled(session.getUserHash(), getOperationToken(), toolName, checked, + new AsyncCallback<Void>() { + @Override + public void onFailure(final Throwable caught) { + view.setChecked(toolName, !checked); + entityOptions.setErrorMessage(i18n.t("Error configuring the tool"), NotifyLevel.error); + NotifyUser.error(i18n.t("Error configuring the tool")); + // view.unmask(); + } + + @Override + public void onSuccess(final Void result) { + stateManager.reload(); + // view.unmask(); + } + }); + } +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPresenter.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsView.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,44 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.tools; + +import cc.kune.core.shared.dto.ToolSimpleDTO; +import cc.kune.gspace.client.options.EntityOptionsTabView; + +import com.google.gwt.event.dom.client.ClickHandler; + +public interface EntityOptToolsView extends EntityOptionsTabView { + + void add(ToolSimpleDTO tool, boolean enabled, boolean checked, ClickHandler clickHandler); + + void clear(); + + boolean isChecked(String tool); + + void mask(); + + void setChecked(String tool, boolean checked); + + void setEnabled(String tool, boolean enabled); + + void setTooltip(String tool, String tip); + + void unmask(); +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsView.java ___________________________________________________________________ Name: svn:mergeinfo + Deleted: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConf.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConf.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConf.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.tools; - -public interface EntityOptionsToolsConf { - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPanel.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,158 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.tools; - -import java.util.HashMap; - -import cc.kune.common.client.log.Log; -import cc.kune.common.client.tooltip.Tooltip; -import cc.kune.common.client.ui.IconLabel; -import cc.kune.common.client.ui.MaskWidget; -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.client.ui.DefaultForm; -import cc.kune.core.shared.dto.ToolSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.options.EntityOptionsView; - -import com.extjs.gxt.ui.client.event.BaseEvent; -import com.extjs.gxt.ui.client.event.Events; -import com.extjs.gxt.ui.client.event.Listener; -import com.extjs.gxt.ui.client.widget.form.CheckBox; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.ui.IsWidget; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Widget; - -public class EntityOptionsToolsConfPanel extends DefaultForm implements EntityOptionsToolsConfView { - private final HashMap<String, CheckBox> fields; - private final I18nTranslationService i18n; - private final MaskWidget maskWidget; - private final IconLabel tabTitle; - - public EntityOptionsToolsConfPanel(final I18nTranslationService i18n, final CoreResources res, - final MaskWidget maskWidget) { - this.maskWidget = maskWidget; - tabTitle = new IconLabel(res.kunePreferences(), i18n.t("Tools")); - this.i18n = i18n; - // super.setHeight(EntityOptionsView.HEIGHT); - super.setWidth(EntityOptionsView.WIDTH); - super.setFrame(true); - // super.add(new HiddenField()); - super.getFormPanel().setLabelWidth(20); - fields = new HashMap<String, CheckBox>(); - super.addStyleName("k-overflow-y-auto"); - // super.addStyleName("k-tab-panel"); - } - - @Override - public void add(final ToolSimpleDTO tool, final boolean enabled, final boolean checked, - final ClickHandler handler) { - final CheckBox checkbox = new CheckBox(); - checkbox.setFieldLabel(tool.getRootName()); - // checkbox.setFireChangeEventOnSetValue(false); - checkbox.setValue(checked); - setEnabled(checkbox, enabled); - checkbox.addListener(Events.Change, new Listener<BaseEvent>() { - @Override - public void handleEvent(final BaseEvent be) { - handler.onClick(null); - } - }); - super.add(checkbox); - fields.put(tool.getName(), checkbox); - doLayoutIfNeeded(); - } - - @Override - public Widget asWidget() { - return super.getFormPanel(); - } - - @Override - public void clear() { - super.getFormPanel().removeAll(); - fields.clear(); - final Label label = new Label(); - label.setText(i18n.t("Here you can select the tools used:")); - label.addStyleName("kune-Margin-10-tb"); - super.add(label); - } - - private void doLayoutIfNeeded() { - if (super.getFormPanel().isRendered()) { - super.getFormPanel().layout(); - } - } - - @Override - public IsWidget getTabTitle() { - return tabTitle; - } - - private CheckBox getTool(final String tool) { - final CheckBox field = fields.get(tool); - if (field == null) { - Log.error("Field " + tool + " not found in EOTCP"); - } - return field; - } - - @Override - public boolean isChecked(final String tool) { - final CheckBox field = getTool(tool); - return field.getValue(); - } - - @Override - public void mask() { - maskWidget.mask(this); - } - - @Override - public void setChecked(final String tool, final boolean checked) { - final CheckBox field = getTool(tool); - field.setValue(checked); - } - - private void setEnabled(final CheckBox checkbox, final boolean enabled) { - if (enabled) { - checkbox.enable(); - } else { - checkbox.disable(); - } - } - - @Override - public void setEnabled(final String tool, final boolean enabled) { - final CheckBox field = getTool(tool); - setEnabled(field, enabled); - } - - @Override - public void setTooltip(final String tool, final String tip) { - final CheckBox field = getTool(tool); - Tooltip.to(field, tip); - } - - @Override - public void unmask() { - maskWidget.unMask(); - } -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,147 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.tools; - -import java.util.Collection; -import java.util.List; - -import cc.kune.common.client.notify.NotifyLevel; -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.ToolSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.options.EntityOptions; - -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.gwt.user.client.ui.IsWidget; -import com.google.inject.Provider; - -public abstract class EntityOptionsToolsConfPresenter { - - private final EntityOptions entityOptions; - private final Provider<GroupServiceAsync> groupService; - protected final I18nTranslationService i18n; - protected final Session session; - protected final StateManager stateManager; - private EntityOptionsToolsConfView view; - - public EntityOptionsToolsConfPresenter(final Session session, final StateManager stateManager, - final I18nTranslationService i18n, final EntityOptions entityOptions, - final Provider<GroupServiceAsync> groupService) { - this.session = session; - this.stateManager = stateManager; - this.i18n = i18n; - this.entityOptions = entityOptions; - this.groupService = groupService; - } - - protected abstract boolean applicable(); - - protected abstract Collection<ToolSimpleDTO> getAllTools(); - - protected abstract StateToken getDefContentToken(); - - protected abstract String getDefContentTooltip(); - - protected abstract List<String> getEnabledTools(); - - protected abstract StateToken getOperationToken(); - - public IsWidget getView() { - return view; - } - - protected abstract void gotoDifLocationIfNecessary(String toolName); - - public void init(final EntityOptionsToolsConfView view) { - this.view = view; - setState(); - entityOptions.addTab(view, view.getTabTitle()); - } - - private void onCheck(final ToolSimpleDTO tool, final boolean checked) { - final List<String> enabledTools = getEnabledTools(); - final String toolName = tool.getName(); - setToolCheckedInServer(checked, toolName); - if (!checked) { - if (enabledTools.contains(toolName)) { - // FIXME uncomment this when fixed - // setToolCheckedInServer(checked, toolName); - // gotoDifLocationIfNecessary(toolName); - } - } - } - - protected void reset() { - view.clear(); - entityOptions.hideMessages(); - } - - protected void setState() { - reset(); - final Collection<ToolSimpleDTO> toolCollection = getAllTools(); - final List<String> enabledTools = getEnabledTools(); - for (final ToolSimpleDTO tool : toolCollection) { - final boolean checked = enabledTools.contains(tool.getName()); - final boolean enabled = true; - view.add(tool, enabled, checked, new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - onCheck(tool, view.isChecked(tool.getName())); - } - }); - } - // Disable def content tool (don't works now) - final StateToken token = getDefContentToken(); - if (token != null) { - final String defContentTool = token.getTool(); - if (defContentTool != null) { - // view.setEnabled(defContentTool, false); - view.setTooltip(defContentTool, getDefContentTooltip()); - } - } - } - - protected void setToolCheckedInServer(final boolean checked, final String toolName) { - // view.mask(); - // NotifyUser.info("Dis/Enabling tool" + toolName + " - " + checked); - groupService.get().setToolEnabled(session.getUserHash(), getOperationToken(), toolName, checked, - new AsyncCallback<Void>() { - @Override - public void onFailure(final Throwable caught) { - view.setChecked(toolName, !checked); - entityOptions.setErrorMessage(i18n.t("Error configuring the tool"), NotifyLevel.error); - NotifyUser.error(i18n.t("Error configuring the tool")); - // view.unmask(); - } - - @Override - public void onSuccess(final Void result) { - stateManager.reload(); - // view.unmask(); - } - }); - } -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfView.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,44 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.tools; - -import cc.kune.core.shared.dto.ToolSimpleDTO; -import cc.kune.gspace.client.options.EntityOptionsTabView; - -import com.google.gwt.event.dom.client.ClickHandler; - -public interface EntityOptionsToolsConfView extends EntityOptionsTabView { - - void add(ToolSimpleDTO tool, boolean enabled, boolean checked, ClickHandler clickHandler); - - void clear(); - - boolean isChecked(String tool); - - void mask(); - - void setChecked(String tool, boolean checked); - - void setEnabled(String tool, boolean enabled); - - void setTooltip(String tool, String tip); - - void unmask(); -} Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptTools.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConf.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptTools.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptTools.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.tools; + +public interface GroupOptTools extends EntityOptTools { + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPanel.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,37 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.tools; + +import cc.kune.common.client.ui.MaskWidget; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class GroupOptToolsPanel extends EntityOptToolsPanel implements + GroupOptToolsView { + + @Inject + public GroupOptToolsPanel(final I18nTranslationService i18n, final CoreResources res, + final MaskWidget maskWidget) { + super(i18n, res, maskWidget); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,98 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.tools; + +import java.util.Collection; +import java.util.List; + +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.state.GroupChangedEvent; +import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.ContentSimpleDTO; +import cc.kune.core.shared.dto.ToolSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.GroupOptions; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class GroupOptToolsPresenter extends EntityOptToolsPresenter implements + GroupOptTools { + + @Inject + public GroupOptToolsPresenter(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final GroupOptions entityOptions, + final Provider<GroupServiceAsync> groupService, final GroupOptToolsView view) { + super(session, stateManager, i18n, entityOptions, groupService); + init(view); + stateManager.onGroupChanged(true, new GroupChangedHandler() { + @Override + public void onGroupChanged(final GroupChangedEvent event) { + setState(); + } + }); + } + + @Override + protected boolean applicable() { + return session.isCurrentStateAGroup(); + } + + @Override + protected Collection<ToolSimpleDTO> getAllTools() { + return session.getGroupTools(); + } + + @Override + protected StateToken getDefContentToken() { + final ContentSimpleDTO defaultContent = session.getCurrentState().getGroup().getDefaultContent(); + return defaultContent == null ? null : defaultContent.getStateToken(); + } + + @Override + protected String getDefContentTooltip() { + // FIXME + return i18n.t("You cannot disable this tool because it's where the current group home page is located. To do that you have to select other content as the default group home page but in another tool."); + } + + @Override + protected List<String> getEnabledTools() { + return session.getCurrentState().getEnabledTools(); + } + + @Override + protected StateToken getOperationToken() { + return session.getCurrentStateToken(); + } + + @Override + protected void gotoDifLocationIfNecessary(final String toolName) { + if (session.getCurrentStateToken().getTool().equals(toolName)) { + final ContentSimpleDTO defaultContent = session.getCurrentState().getGroup().getDefaultContent(); + if (defaultContent != null) { + stateManager.gotoStateToken(defaultContent.getStateToken()); + } + } + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsView.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.tools; + +public interface GroupOptToolsView extends EntityOptToolsView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConf.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConf.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConf.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.tools; - -public interface GroupOptionsToolsConf extends EntityOptionsToolsConf { - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPanel.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,37 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.tools; - -import cc.kune.common.client.ui.MaskWidget; -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.inject.Inject; - -public class GroupOptionsToolsConfPanel extends EntityOptionsToolsConfPanel implements - GroupOptionsToolsConfView { - - @Inject - public GroupOptionsToolsConfPanel(final I18nTranslationService i18n, final CoreResources res, - final MaskWidget maskWidget) { - super(i18n, res, maskWidget); - } - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPresenter.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,98 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.tools; - -import java.util.Collection; -import java.util.List; - -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.state.GroupChangedEvent; -import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.ContentSimpleDTO; -import cc.kune.core.shared.dto.ToolSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.options.GroupOptions; - -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class GroupOptionsToolsConfPresenter extends EntityOptionsToolsConfPresenter implements - GroupOptionsToolsConf { - - @Inject - public GroupOptionsToolsConfPresenter(final StateManager stateManager, final Session session, - final I18nTranslationService i18n, final GroupOptions entityOptions, - final Provider<GroupServiceAsync> groupService, final GroupOptionsToolsConfView view) { - super(session, stateManager, i18n, entityOptions, groupService); - init(view); - stateManager.onGroupChanged(true, new GroupChangedHandler() { - @Override - public void onGroupChanged(final GroupChangedEvent event) { - setState(); - } - }); - } - - @Override - protected boolean applicable() { - return session.isCurrentStateAGroup(); - } - - @Override - protected Collection<ToolSimpleDTO> getAllTools() { - return session.getGroupTools(); - } - - @Override - protected StateToken getDefContentToken() { - final ContentSimpleDTO defaultContent = session.getCurrentState().getGroup().getDefaultContent(); - return defaultContent == null ? null : defaultContent.getStateToken(); - } - - @Override - protected String getDefContentTooltip() { - // FIXME - return i18n.t("You cannot disable this tool because it's where the current group home page is located. To do that you have to select other content as the default group home page but in another tool."); - } - - @Override - protected List<String> getEnabledTools() { - return session.getCurrentState().getEnabledTools(); - } - - @Override - protected StateToken getOperationToken() { - return session.getCurrentStateToken(); - } - - @Override - protected void gotoDifLocationIfNecessary(final String toolName) { - if (session.getCurrentStateToken().getTool().equals(toolName)) { - final ContentSimpleDTO defaultContent = session.getCurrentState().getGroup().getDefaultContent(); - if (defaultContent != null) { - stateManager.gotoStateToken(defaultContent.getStateToken()); - } - } - } - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfView.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.tools; - -public interface GroupOptionsToolsConfView extends EntityOptionsToolsConfView { - -} Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptTools.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConf.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptTools.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptTools.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.tools; + +public interface UserOptTools extends EntityOptTools { + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPanel.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,37 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.tools; + +import cc.kune.common.client.ui.MaskWidget; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class UserOptToolsPanel extends EntityOptToolsPanel implements + UserOptToolsView { + + @Inject + public UserOptToolsPanel(final I18nTranslationService i18n, final CoreResources res, + final MaskWidget maskWidget) { + super(i18n, res, maskWidget); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPresenter.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,94 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.tools; + +import java.util.Collection; +import java.util.List; + +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.state.UserSignInEvent; +import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.ToolSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.UserOptions; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class UserOptToolsPresenter extends EntityOptToolsPresenter implements + UserOptTools { + + @Inject + public UserOptToolsPresenter(final Session session, final StateManager stateManager, + final I18nTranslationService i18n, final UserOptions entityOptions, + final Provider<GroupServiceAsync> groupService, final UserOptToolsView view) { + super(session, stateManager, i18n, entityOptions, groupService); + init(view); + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + setState(); + } + }); + } + + @Override + protected boolean applicable() { + return session.isLogged(); + } + + @Override + protected Collection<ToolSimpleDTO> getAllTools() { + return session.getUserTools(); + } + + @Override + protected StateToken getDefContentToken() { + final String homePage = session.getCurrentUserInfo().getHomePage(); + return homePage == null ? null : new StateToken(homePage); + } + + @Override + protected String getDefContentTooltip() { + // FIXME + return i18n.t("You cannot disable this tool because it's where your home page is located. To do that you have to select other content as the default home page but in another tool."); + } + + @Override + protected List<String> getEnabledTools() { + return session.getCurrentUserInfo().getEnabledTools(); + } + + @Override + protected StateToken getOperationToken() { + return session.getCurrentUser().getStateToken(); + } + + @Override + protected void gotoDifLocationIfNecessary(final String toolName) { + if (session.getCurrentStateToken().getGroup().equals(session.getCurrentUserInfo().getShortName()) + && session.getCurrentStateToken().getTool().equals(toolName)) { + stateManager.gotoStateToken(session.getCurrentState().getGroup().getDefaultContent().getStateToken()); + } + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsView.java (from rev 1409, trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.options.tools; + +public interface UserOptToolsView extends EntityOptToolsView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptToolsView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConf.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConf.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConf.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.tools; - -public interface UserOptionsToolsConf extends EntityOptionsToolsConf { - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPanel.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPanel.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,37 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.tools; - -import cc.kune.common.client.ui.MaskWidget; -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.inject.Inject; - -public class UserOptionsToolsConfPanel extends EntityOptionsToolsConfPanel implements - UserOptionsToolsConfView { - - @Inject - public UserOptionsToolsConfPanel(final I18nTranslationService i18n, final CoreResources res, - final MaskWidget maskWidget) { - super(i18n, res, maskWidget); - } - -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPresenter.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,94 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.tools; - -import java.util.Collection; -import java.util.List; - -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.state.UserSignInEvent; -import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.ToolSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.options.UserOptions; - -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class UserOptionsToolsConfPresenter extends EntityOptionsToolsConfPresenter implements - UserOptionsToolsConf { - - @Inject - public UserOptionsToolsConfPresenter(final Session session, final StateManager stateManager, - final I18nTranslationService i18n, final UserOptions entityOptions, - final Provider<GroupServiceAsync> groupService, final UserOptionsToolsConfView view) { - super(session, stateManager, i18n, entityOptions, groupService); - init(view); - session.onUserSignIn(true, new UserSignInHandler() { - @Override - public void onUserSignIn(final UserSignInEvent event) { - setState(); - } - }); - } - - @Override - protected boolean applicable() { - return session.isLogged(); - } - - @Override - protected Collection<ToolSimpleDTO> getAllTools() { - return session.getUserTools(); - } - - @Override - protected StateToken getDefContentToken() { - final String homePage = session.getCurrentUserInfo().getHomePage(); - return homePage == null ? null : new StateToken(homePage); - } - - @Override - protected String getDefContentTooltip() { - // FIXME - return i18n.t("You cannot disable this tool because it's where your home page is located. To do that you have to select other content as the default home page but in another tool."); - } - - @Override - protected List<String> getEnabledTools() { - return session.getCurrentUserInfo().getEnabledTools(); - } - - @Override - protected StateToken getOperationToken() { - return session.getCurrentUser().getStateToken(); - } - - @Override - protected void gotoDifLocationIfNecessary(final String toolName) { - if (session.getCurrentStateToken().getGroup().equals(session.getCurrentUserInfo().getShortName()) - && session.getCurrentStateToken().getTool().equals(toolName)) { - stateManager.gotoStateToken(session.getCurrentState().getGroup().getDefaultContent().getStateToken()); - } - } -} Deleted: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfView.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfView.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.options.tools; - -public interface UserOptionsToolsConfView extends EntityOptionsToolsConfView { - -} Modified: trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java 2011-06-21 21:29:32 UTC (rev 1413) @@ -84,6 +84,8 @@ this.manager = manager; this.view = view; itemMap = new HashMap<String, MenuRadioItemDescriptor>(); + this.view = view; + createActions(); eventBus.addHandler(GSpaceThemeChangeEvent.getType(), new GSpaceThemeChangeHandler() { @Override public void onGsThemeChange(final GSpaceThemeChangeEvent event) { @@ -92,8 +94,6 @@ select(oldTheme, newTheme); } }); - this.view = view; - createActions(); } private void createActions() { Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2011-06-21 20:03:39 UTC (rev 1412) +++ trunk/src/main/resources/kune.properties 2011-06-21 21:29:32 UTC (rev 1413) @@ -35,7 +35,7 @@ ### Workspace enabled themes # This names are also the name of the items in the theme menu and there are translated -kune.wsthemes = default,green,purple,grey,red,sahara,blue,redblack,camp,pink,highcontrast,whiteblack,blackwhite +kune.wsthemes = default,green,purple,grey,red,sahara,blue,redblack,camp,pink,highcontrast,whiteblack,blackwhite,transparent kune.wsthemes.default = default kune.wsthemes.default.backgrounds = #deaa87, #d99e76, #ce7f4b, #d99e76, #f6e7dd, #d99e76, #FFF, #f8eee7 kune.wsthemes.default.colors = #FFF,#FFF,#FFF,#FFF,#552200,#FFF,#a05a2c,#a05a2c @@ -63,6 +63,8 @@ kune.wsthemes.whiteblack.colors = #000, #000, #000, #000, #000, #000, #000, #000 kune.wsthemes.blackwhite.backgrounds = #000, #000, #808080, #000, #000, #e6e6e6, #000, #000 kune.wsthemes.blackwhite.colors = #FFF, #FFF, #000, #FFF, #FFF, #000, #FFF, #FFF +kune.wsthemes.transparent.backgrounds = transparent, transparent, #e6e6e6, transparent, transparent, #e6e6e6, transparent, transparent +kune.wsthemes.transparent.colors = #000, #000, #000, #000, #000, #000, #000, #000 ### Gallery options kune.upload.gallerypermittedextensions = jpg,jpeg,png,gif,bmp,svg,avi,mpg,mpeg,ogg,mov,tif,tiff,mp3,wav