- kune-commits - lists.ourproject.org

r1331 - in trunk/src/main/java/cc/kune: common/client/ui/dialogs core/client/notify/confirm
by Vicente J. Ruiz Jurado 29 Apr '11

29 Apr '11

Author: vjrj_ Date: 2011-04-29 15:16:37 +0200 (Fri, 29 Apr 2011) New Revision: 1331 Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialogView.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java Log: Fix with dialog buttons refactorization Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java 2011-04-29 12:57:28 UTC (rev 1330) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java 2011-04-29 13:16:37 UTC (rev 1331) @@ -31,7 +31,6 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HasDirectionalText; -import com.google.gwt.user.client.ui.HasText; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; @@ -81,11 +80,6 @@ } @Override - public HasText getFirstBtnText() { - return firstBtn; - } - - @Override public ForIsWidget getInnerPanel() { return vp; } @@ -96,11 +90,6 @@ } @Override - public HasText getSecondBtnText() { - return secondBtn; - } - - @Override public HasDirectionalText getTitleText() { return title; } @@ -114,6 +103,12 @@ } @Override + public void setFirstBtnText(final String text) { + firstBtn.setText(text); + firstBtn.setVisible(TextUtils.notEmpty(text)); + } + + @Override public void setFirstBtnTitle(final String title) { firstBtn.setTitle(title); } @@ -132,6 +127,12 @@ } @Override + public void setSecondBtnText(final String text) { + secondBtn.setText(text); + secondBtn.setVisible(TextUtils.notEmpty(text)); + } + + @Override public void setSecondBtnTitle(final String title) { secondBtn.setTitle(title); } Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialogView.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialogView.java 2011-04-29 12:57:28 UTC (rev 1330) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialogView.java 2011-04-29 13:16:37 UTC (rev 1331) @@ -21,31 +21,30 @@ import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.user.client.ui.HasDirectionalText; -import com.google.gwt.user.client.ui.HasText; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; public interface BasicDialogView { - ForIsWidget getBottomPanel(); + ForIsWidget getBottomPanel(); - HasClickHandlers getFirstBtn(); + HasClickHandlers getFirstBtn(); - HasText getFirstBtnText(); + ForIsWidget getInnerPanel(); - ForIsWidget getInnerPanel(); + HasClickHandlers getSecondBtn(); - HasClickHandlers getSecondBtn(); + HasDirectionalText getTitleText(); - HasText getSecondBtnText(); + void setFirstBtnText(String text); - HasDirectionalText getTitleText(); + void setFirstBtnTitle(String title); - void setFirstBtnTitle(String title); + void setFirstBtnVisible(boolean visible); - void setFirstBtnVisible(boolean visible); + void setSecondBtnText(String text); - void setSecondBtnTitle(String title); + void setSecondBtnTitle(String title); - void setSecondBtnVisible(boolean visible); + void setSecondBtnVisible(boolean visible); } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java 2011-04-29 12:57:28 UTC (rev 1330) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java 2011-04-29 13:16:37 UTC (rev 1331) @@ -28,139 +28,133 @@ public class BasicTopDialog extends BasicDialog { - public static class Builder { - private final boolean autohide; - private boolean autoscroll = false; - private final String dialogId; - private String firstButtonId; - private String firstButtonTitle; - private String height = "70%"; - private String icon; - private final boolean modal; - private String sndButtonId; - private String sndButtonTitle; - private int tabIndexStart = 0; - private String title; - private String width = "400px"; + public static class Builder { + private final boolean autohide; + private boolean autoscroll = false; + private final String dialogId; + private String firstButtonId; + private String firstButtonTitle; + private String height = "70%"; + private String icon; + private final boolean modal; + private String sndButtonId; + private String sndButtonTitle; + private int tabIndexStart = 0; + private String title; + private String width = "400px"; - public Builder(final String dialogId, final boolean autohide, final boolean modal) { - // Required params - this.autohide = autohide; - this.modal = modal; - this.dialogId = dialogId; - } + public Builder(final String dialogId, final boolean autohide, final boolean modal) { + // Required params + this.autohide = autohide; + this.modal = modal; + this.dialogId = dialogId; + } - public Builder autoscroll(final boolean autoscroll) { - // Not used for now - this.autoscroll = autoscroll; - return this; - } + public Builder autoscroll(final boolean autoscroll) { + // Not used for now + this.autoscroll = autoscroll; + return this; + } - public BasicTopDialog build() { - return new BasicTopDialog(this); - } + public BasicTopDialog build() { + return new BasicTopDialog(this); + } - public Builder firstButtonId(final String firstButtonId) { - this.firstButtonId = firstButtonId; - return this; - } + public Builder firstButtonId(final String firstButtonId) { + this.firstButtonId = firstButtonId; + return this; + } - public Builder firstButtonTitle(final String firstButtonTitle) { - this.firstButtonTitle = firstButtonTitle; - return this; - } + public Builder firstButtonTitle(final String firstButtonTitle) { + this.firstButtonTitle = firstButtonTitle; + return this; + } - public Builder height(final int height) { - this.height = String.valueOf(height); - return this; - } + public Builder height(final int height) { + this.height = String.valueOf(height); + return this; + } - public Builder height(final String height) { - this.height = height; - return this; - } + public Builder height(final String height) { + this.height = height; + return this; + } - public Builder icon(final String icon) { - this.icon = icon; - return this; - } + public Builder icon(final String icon) { + this.icon = icon; + return this; + } - public Builder sndButtonId(final String sndButtonId) { - this.sndButtonId = sndButtonId; - return this; - } + public Builder sndButtonId(final String sndButtonId) { + this.sndButtonId = sndButtonId; + return this; + } - public Builder sndButtonTitle(final String sndButtonTitle) { - this.sndButtonTitle = sndButtonTitle; - return this; - } + public Builder sndButtonTitle(final String sndButtonTitle) { + this.sndButtonTitle = sndButtonTitle; + return this; + } - public Builder tabIndexStart(final int tabIndexStart) { - this.tabIndexStart = tabIndexStart; - return this; - } + public Builder tabIndexStart(final int tabIndexStart) { + this.tabIndexStart = tabIndexStart; + return this; + } - public Builder title(final String title) { - this.title = title; - return this; - } + public Builder title(final String title) { + this.title = title; + return this; + } - public Builder width(final int width) { - this.width = String.valueOf(width); - return this; - } + public Builder width(final int width) { + this.width = String.valueOf(width); + return this; + } - public Builder width(final String width) { - this.width = width; - return this; - } + public Builder width(final String width) { + this.width = width; + return this; } + } - private final PopupTopPanel popup; + private final PopupTopPanel popup; - private BasicTopDialog(final Builder builder) { - popup = new PopupTopPanel(builder.autohide, builder.modal); - popup.add(this); - popup.ensureDebugId(builder.dialogId); - super.getTitleText().setText(builder.title); - if (TextUtils.notEmpty(builder.icon)) { - super.setTitleIcon(builder.icon); - } - if (TextUtils.empty(builder.firstButtonTitle)) { - super.setFirstBtnVisible(false); - } else { - super.getFirstBtnText().setText(builder.firstButtonTitle); - if (TextUtils.notEmpty(builder.firstButtonId)) { - super.setFirstBtnId(builder.firstButtonId); - } - super.setFirstBtnTabIndex(builder.tabIndexStart); - } - if (TextUtils.empty(builder.sndButtonTitle)) { - super.setSecondBtnVisible(false); - } else { - super.getSecondBtnText().setText(builder.sndButtonTitle); - if (TextUtils.notEmpty(builder.sndButtonId)) { - super.setSecondBtnId(builder.sndButtonId); - } - super.setSecondBtnTabIndex(builder.tabIndexStart + 1); - } - super.setSize(builder.width, builder.height); + private BasicTopDialog(final Builder builder) { + popup = new PopupTopPanel(builder.autohide, builder.modal); + popup.add(this); + popup.ensureDebugId(builder.dialogId); + super.getTitleText().setText(builder.title); + if (TextUtils.notEmpty(builder.icon)) { + super.setTitleIcon(builder.icon); } + super.setFirstBtnText(builder.firstButtonTitle); + super.setFirstBtnId(builder.firstButtonId); + super.setFirstBtnTabIndex(builder.tabIndexStart); + super.setSecondBtnText(builder.sndButtonTitle); + super.setSecondBtnId(builder.sndButtonId); + super.setSecondBtnTabIndex(builder.tabIndexStart + 1); + super.setSize(builder.width, builder.height); + } - public HasCloseHandlers<PopupPanel> getClose() { - return popup; - } + public HasCloseHandlers<PopupPanel> getClose() { + return popup; + } - public void hide() { - popup.hide(); + public void hide() { + popup.hide(); - } + } - public void showCentered() { - popup.showCentered(); - } + @Override + public void setFirstBtnTitle(final String title) { + super.setFirstBtnTitle(title); - public void showRelativeTo(final UIObject object) { - popup.showRelativeTo(object); - } + } + + public void showCentered() { + popup.showCentered(); + } + + public void showRelativeTo(final UIObject object) { + popup.showRelativeTo(object); + } } Modified: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-04-29 12:57:28 UTC (rev 1330) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-04-29 13:16:37 UTC (rev 1331) @@ -21,7 +21,6 @@ import cc.kune.common.client.notify.ConfirmAskEvent; import cc.kune.common.client.ui.dialogs.BasicTopDialog; -import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmView; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -34,68 +33,63 @@ import com.gwtplatform.mvp.client.ViewImpl; public class UserConfirmPanel extends ViewImpl implements UserConfirmView { - private static final String CANCEL_ID = "k-conf-dial"; - private static final String DIALOG_ID = "k-conf-dial-nok"; - private static final String OK_ID = "k-conf-dial-ok"; - private HandlerRegistration acceptHandler; - private final Label askLabel; - private HandlerRegistration cancelHandler; - private final BasicTopDialog dialog; + private static final String CANCEL_ID = "k-conf-dial"; + private static final String DIALOG_ID = "k-conf-dial-nok"; + private static final String OK_ID = "k-conf-dial-ok"; + private HandlerRegistration acceptHandler; + private final Label askLabel; + private HandlerRegistration cancelHandler; + private final BasicTopDialog dialog; - @Inject - public UserConfirmPanel(final I18nTranslationService i18n) { - dialog = new BasicTopDialog.Builder(DIALOG_ID, false, true).autoscroll(false).width(100).height(100).firstButtonId( - OK_ID).sndButtonId(CANCEL_ID).tabIndexStart(1).build(); - askLabel = new Label(); - askLabel.addStyleName("k-userconfirm-label"); - dialog.getInnerPanel().add(askLabel); - } + @Inject + public UserConfirmPanel(final I18nTranslationService i18n) { + dialog = new BasicTopDialog.Builder(DIALOG_ID, false, true).autoscroll(false).width(100).height(100).firstButtonId( + OK_ID).sndButtonId(CANCEL_ID).tabIndexStart(1).build(); + askLabel = new Label(); + askLabel.addStyleName("k-userconfirm-label"); + dialog.getInnerPanel().add(askLabel); + } - @Override - public Widget asWidget() { - return null; - } + @Override + public Widget asWidget() { + return null; + } - @Override - public void confirmAsk(final ConfirmAskEvent ask) { - dialog.getFirstBtnText().setText(ask.getAcceptBtnMsg()); - final String cancelBtnMsg = ask.getCancelBtnMsg(); - dialog.setFirstBtnTitle(ask.getAcceptBtnTooltip()); - if (TextUtils.notEmpty(cancelBtnMsg)) { - dialog.getSecondBtnText().setText(cancelBtnMsg); - dialog.setSecondBtnTitle(ask.getCancelBtnTooltip()); - dialog.setSecondBtnVisible(true); - } else { - dialog.setSecondBtnVisible(false); - } - dialog.getTitleText().setText(ask.getTitle()); - askLabel.setText(ask.getMessage()); - dialog.showCentered(); - resetHandlers(); - acceptHandler = dialog.getFirstBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - ask.getCallback().onSuccess(); - dialog.hide(); - } - }); - cancelHandler = dialog.getSecondBtn().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - ask.getCallback().onCancel(); - dialog.hide(); - } - }); - dialog.showCentered(); - } + @Override + public void confirmAsk(final ConfirmAskEvent ask) { + dialog.setFirstBtnText(ask.getAcceptBtnMsg()); + final String cancelBtnMsg = ask.getCancelBtnMsg(); + dialog.setFirstBtnTitle(ask.getAcceptBtnTooltip()); + dialog.setSecondBtnText(cancelBtnMsg); + dialog.setSecondBtnTitle(ask.getCancelBtnTooltip()); + dialog.getTitleText().setText(ask.getTitle()); + askLabel.setText(ask.getMessage()); + dialog.showCentered(); + resetHandlers(); + acceptHandler = dialog.getFirstBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + ask.getCallback().onSuccess(); + dialog.hide(); + } + }); + cancelHandler = dialog.getSecondBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + ask.getCallback().onCancel(); + dialog.hide(); + } + }); + dialog.showCentered(); + } - private void resetHandlers() { - if (acceptHandler != null) { - acceptHandler.removeHandler(); - } - if (cancelHandler != null) { - cancelHandler.removeHandler(); - } + private void resetHandlers() { + if (acceptHandler != null) { + acceptHandler.removeHandler(); } + if (cancelHandler != null) { + cancelHandler.removeHandler(); + } + } }

1 0

r1330 - in trunk/src/main/java/cc/kune/gspace/client: . viewers
by Vicente J. Ruiz Jurado 29 Apr '11

29 Apr '11

Author: vjrj_ Date: 2011-04-29 14:57:28 +0200 (Fri, 29 Apr 2011) New Revision: 1330 Added: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java Log: Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-04-29 12:02:17 UTC (rev 1329) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-04-29 12:57:28 UTC (rev 1330) @@ -20,6 +20,7 @@ package cc.kune.gspace.client; import cc.kune.client.ExtendedGinModule; +import cc.kune.gspace.client.actions.RenameAction; import cc.kune.gspace.client.options.GroupOptions; import cc.kune.gspace.client.options.GroupOptionsCollection; import cc.kune.gspace.client.options.GroupOptionsPanel; @@ -80,54 +81,56 @@ public class GSpaceGinModule extends ExtendedGinModule { - /* - * (non-Javadoc) - * - * @see com.google.gwt.inject.client.AbstractGinModule#configure() - */ - @Override - protected void configure() { - bindPresenter(EntityLicensePresenter.class, EntityLicensePresenter.EntityLicenseView.class, - EntityLicensePanel.class, EntityLicensePresenter.EntityLicenseProxy.class); - bindPresenter(TagsSummaryPresenter.class, TagsSummaryPresenter.TagsSummaryView.class, TagsSummaryPanel.class, - TagsSummaryPresenter.TagsSummaryProxy.class); - bind(GSpaceArmorImpl.class).in(Singleton.class); - bind(GSpaceArmor.class).to(GSpaceArmorImpl.class).in(Singleton.class); - bind(GSpaceParts.class).asEagerSingleton(); - bindPresenter(ToolSelectorPresenter.class, ToolSelectorPresenter.ToolSelectorView.class, - ToolSelectorPanel.class, ToolSelectorPresenter.ToolSelectorProxy.class); - bind(ToolSelector.class).to(ToolSelectorPresenter.class).in(Singleton.class); - bindPresenter(DocViewerPresenter.class, DocViewerPresenter.DocViewerView.class, DocViewerPanel.class, - DocViewerPresenter.DocViewerProxy.class); - bindPresenter(FolderViewerPresenter.class, FolderViewerPresenter.FolderViewerView.class, - FolderViewerAsTablePanel.class, FolderViewerPresenter.FolderViewerProxy.class); + /* + * (non-Javadoc) + * + * @see com.google.gwt.inject.client.AbstractGinModule#configure() + */ + @Override + protected void configure() { + bindPresenter(EntityLicensePresenter.class, EntityLicensePresenter.EntityLicenseView.class, + EntityLicensePanel.class, EntityLicensePresenter.EntityLicenseProxy.class); + bindPresenter(TagsSummaryPresenter.class, TagsSummaryPresenter.TagsSummaryView.class, + TagsSummaryPanel.class, TagsSummaryPresenter.TagsSummaryProxy.class); + bind(GSpaceArmorImpl.class).in(Singleton.class); + bind(GSpaceArmor.class).to(GSpaceArmorImpl.class).in(Singleton.class); + bind(GSpaceParts.class).asEagerSingleton(); + bindPresenter(ToolSelectorPresenter.class, ToolSelectorPresenter.ToolSelectorView.class, + ToolSelectorPanel.class, ToolSelectorPresenter.ToolSelectorProxy.class); + bind(ToolSelector.class).to(ToolSelectorPresenter.class).in(Singleton.class); + bindPresenter(DocViewerPresenter.class, DocViewerPresenter.DocViewerView.class, + DocViewerPanel.class, DocViewerPresenter.DocViewerProxy.class); + bindPresenter(FolderViewerPresenter.class, FolderViewerPresenter.FolderViewerView.class, + FolderViewerAsTablePanel.class, FolderViewerPresenter.FolderViewerProxy.class); - s(GroupOptions.class, GroupOptionsPresenter.class); - s(GroupOptionsView.class, GroupOptionsPanel.class); - s(UserOptions.class, UserOptionsPresenter.class); - s(UserOptionsView.class, UserOptionsPanel.class); + s(GroupOptions.class, GroupOptionsPresenter.class); + s(GroupOptionsView.class, GroupOptionsPanel.class); + s(UserOptions.class, UserOptionsPresenter.class); + s(UserOptionsView.class, UserOptionsPanel.class); - s(UserOptionsCollection.class); - s(GroupOptionsCollection.class); + s(UserOptionsCollection.class); + s(GroupOptionsCollection.class); - s(GroupOptionsDefLicense.class, GroupOptionsDefLicensePresenter.class); - s(GroupOptionsDefLicenseView.class, GroupOptionsDefLicensePanel.class); - s(GroupOptionsPublicSpaceConf.class, GroupOptionsPublicSpaceConfPresenter.class); - s(GroupOptionsPublicSpaceConfView.class, GroupOptionsPublicSpaceConfPanel.class); - s(GroupOptionsLogo.class, GroupOptionsLogoPresenter.class); - s(GroupOptionsLogoView.class, GroupOptionsLogoPanel.class); - s(GroupOptionsToolsConf.class, GroupOptionsToolsConfPresenter.class); - s(GroupOptionsToolsConfView.class, GroupOptionsToolsConfPanel.class); + s(GroupOptionsDefLicense.class, GroupOptionsDefLicensePresenter.class); + s(GroupOptionsDefLicenseView.class, GroupOptionsDefLicensePanel.class); + s(GroupOptionsPublicSpaceConf.class, GroupOptionsPublicSpaceConfPresenter.class); + s(GroupOptionsPublicSpaceConfView.class, GroupOptionsPublicSpaceConfPanel.class); + s(GroupOptionsLogo.class, GroupOptionsLogoPresenter.class); + s(GroupOptionsLogoView.class, GroupOptionsLogoPanel.class); + s(GroupOptionsToolsConf.class, GroupOptionsToolsConfPresenter.class); + s(GroupOptionsToolsConfView.class, GroupOptionsToolsConfPanel.class); - s(UserOptionsDefLicense.class, UserOptionsDefLicensePresenter.class); - s(UserOptionsDefLicenseView.class, UserOptionsDefLicensePanel.class); - s(UserOptionsPublicSpaceConf.class, UserOptionsPublicSpaceConfPresenter.class); - s(UserOptionsPublicSpaceConfView.class, UserOptionsPublicSpaceConfPanel.class); - s(UserOptionsLogo.class, UserOptionsLogoPresenter.class); - s(UserOptionsLogoView.class, UserOptionsLogoPanel.class); - s(UserOptionsToolsConf.class, UserOptionsToolsConfPresenter.class); - s(UserOptionsToolsConfView.class, UserOptionsToolsConfPanel.class); + s(UserOptionsDefLicense.class, UserOptionsDefLicensePresenter.class); + s(UserOptionsDefLicenseView.class, UserOptionsDefLicensePanel.class); + s(UserOptionsPublicSpaceConf.class, UserOptionsPublicSpaceConfPresenter.class); + s(UserOptionsPublicSpaceConfView.class, UserOptionsPublicSpaceConfPanel.class); + s(UserOptionsLogo.class, UserOptionsLogoPresenter.class); + s(UserOptionsLogoView.class, UserOptionsLogoPanel.class); + s(UserOptionsToolsConf.class, UserOptionsToolsConfPresenter.class); + s(UserOptionsToolsConfView.class, UserOptionsToolsConfPanel.class); - s(GSpaceBackManager.class, GSpaceBackManagerImpl.class); - } + s(GSpaceBackManager.class, GSpaceBackManagerImpl.class); + + s(RenameAction.class); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-04-29 12:02:17 UTC (rev 1329) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-04-29 12:57:28 UTC (rev 1330) @@ -1,35 +1,33 @@ package cc.kune.gspace.client.viewers; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; -import cc.kune.common.client.ui.IconLabel; +import cc.kune.common.client.ui.HasEditHandler; import cc.kune.common.client.ui.UiUtils; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.registry.IconsRegistry; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.viewers.FolderViewerPresenter.FolderViewerView; -import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; import com.google.gwt.user.client.ui.Widget; import com.gwtplatform.mvp.client.ViewImpl; public abstract class AbstractFolderViewerPanel extends ViewImpl implements FolderViewerView { + private final ContentTitleWidget contentTitle; private final InlineLabel emptyLabel; protected final GSpaceArmor gsArmor; protected final I18nTranslationService i18n; - private final IconsRegistry iconRegistry; protected Widget widget; public AbstractFolderViewerPanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n, final ContentCapabilitiesRegistry capabilitiesRegistry) { this.gsArmor = gsArmor; this.i18n = i18n; - this.iconRegistry = capabilitiesRegistry.getIconsRegistry(); emptyLabel = new InlineLabel(i18n.t("This folder is empty.")); emptyLabel.setStyleName("k-empty-msg"); + contentTitle = new ContentTitleWidget(i18n, gsArmor, capabilitiesRegistry.getIconsRegistry()); } @Override @@ -56,6 +54,11 @@ } @Override + public HasEditHandler getEditTitle() { + return contentTitle.getEditableTitle(); + } + + @Override public void setActions(final GuiActionDescCollection actions) { gsArmor.getSubheaderToolbar().clear(); gsArmor.getSubheaderToolbar().addAll(actions); @@ -63,14 +66,15 @@ @Override public void setContainer(final StateContainerDTO state) { - // gsArmor.getDocHeader().add(new InlineLabel(state.getTitle())); - final IconLabel label = new IconLabel( - (ImageResource) iconRegistry.getContentTypeIcon(state.getTypeId()), state.getTitle()); - label.setStyleName("k-fl"); - gsArmor.getDocHeader().add(label); + contentTitle.setTitle(state.getTitle(), state.getTypeId(), state.getContainerRights().isEditable()); } @Override + public void setEditableTitle(final String title) { + contentTitle.setText(title); + } + + @Override public void showEmptyMsg() { gsArmor.getDocContainer().add(emptyLabel); } Added: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java 2011-04-29 12:57:28 UTC (rev 1330) @@ -0,0 +1,65 @@ +package cc.kune.gspace.client.viewers; + +import cc.kune.common.client.ui.EditableLabel; +import cc.kune.common.client.ui.HasEditHandler; +import cc.kune.common.client.ui.UiUtils; +import cc.kune.core.client.registry.IconsRegistry; +import cc.kune.core.shared.dto.BasicMimeTypeDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.GSpaceArmor; + +import com.google.gwt.resources.client.ImageResource; +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.InsertPanel.ForIsWidget; + +public class ContentTitleWidget extends Composite { + private final EditableLabel editableTitle; + private final GSpaceArmor gsArmor; + private final IconsRegistry iconRegistry; + private final Image titleIcon; + + public ContentTitleWidget(final I18nTranslationService i18n, final GSpaceArmor gsArmor, + final IconsRegistry iconRegistry) { + this.gsArmor = gsArmor; + this.iconRegistry = iconRegistry; + final FlowPanel flow = new FlowPanel(); + titleIcon = new Image(); + editableTitle = new EditableLabel(); + editableTitle.setTooltip(i18n.t("Click to edit")); + flow.add(titleIcon); + flow.add(editableTitle); + initWidget(flow); + } + + public HasEditHandler getEditableTitle() { + return editableTitle; + } + + public void setText(final String text) { + editableTitle.setText(text); + } + + public void setTitle(final String title, final String typeId, final BasicMimeTypeDTO mime, + final boolean editable) { + final ForIsWidget docHeader = gsArmor.getDocHeader(); + UiUtils.clear(docHeader); + + final ImageResource resource = (mime == null ? (ImageResource) iconRegistry.getContentTypeIcon(typeId) + : (ImageResource) iconRegistry.getContentTypeIcon(typeId, mime)); + final boolean hasIcon = resource != null; + if (hasIcon) { + titleIcon.setResource(resource); + } + titleIcon.setVisible(hasIcon); + editableTitle.setText(title); + editableTitle.setEditable(editable); + docHeader.add(this); + } + + public void setTitle(final String title, final String typeId, final boolean editable) { + setTitle(title, typeId, null, editable); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-04-29 12:02:17 UTC (rev 1329) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-04-29 12:57:28 UTC (rev 1330) @@ -20,11 +20,9 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.errors.UIException; -import cc.kune.common.client.ui.EditableLabel; import cc.kune.common.client.ui.HasEditHandler; import cc.kune.common.client.ui.UiUtils; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.registry.IconsRegistry; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; @@ -34,14 +32,11 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Element; -import com.google.gwt.resources.client.ImageResource; import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.ui.DeckPanel; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.InlineHTML; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; import com.google.gwt.user.client.ui.Widget; @@ -55,18 +50,15 @@ private static DocsViewerPanelUiBinder uiBinder = GWT.create(DocsViewerPanelUiBinder.class); private RemoteViewServiceMultiplexer channel; + private final ContentTitleWidget contentTitle; @UiField DeckPanel deck; - private final EditableLabel editableTitle; private final GSpaceArmor gsArmor; - private final IconsRegistry iconRegistry; private IdGenerator idGenerator; private final Element loading = new LoadingIndicator().getElement(); @UiField InlineHTML onlyViewPanel; private ProfileManager profiles; - private final FlowPanel title; - private final Image titleIcon; /** The wave panel, if a wave is open. */ private StagesProvider wave; @UiField @@ -80,14 +72,8 @@ public DocViewerPanel(final GSpaceArmor wsArmor, final ContentCapabilitiesRegistry capabilitiesRegistry, final I18nTranslationService i18n) { this.gsArmor = wsArmor; - this.iconRegistry = capabilitiesRegistry.getIconsRegistry(); widget = uiBinder.createAndBindUi(this); - title = new FlowPanel(); - titleIcon = new Image(); - editableTitle = new EditableLabel(); - editableTitle.setTooltip(i18n.t("Click to edit")); - title.add(titleIcon); - title.add(editableTitle); + contentTitle = new ContentTitleWidget(i18n, gsArmor, capabilitiesRegistry.getIconsRegistry()); } @Override @@ -116,7 +102,7 @@ @Override public HasEditHandler getEditTitle() { - return editableTitle; + return contentTitle.getEditableTitle(); } private WaveRef getWaveRef(final String waveRefS) { @@ -148,7 +134,7 @@ @Override public void setContent(final StateContentDTO state) { final boolean editable = state.getContentRights().isEditable(); - setTitle(state, editable); + contentTitle.setTitle(state.getTitle(), state.getTypeId(), state.getMimeType(), editable); if (editable) { initWaveClientIfNeeded(); setEditableWaveContent(state.getWaveRef(), false); @@ -165,7 +151,7 @@ @Override public void setEditableTitle(final String title) { - editableTitle.setText(title); + contentTitle.setText(title); } private void setEditableWaveContent(final String waveRefS, final boolean isNewWave) { @@ -191,18 +177,4 @@ }); } - private void setTitle(final StateContentDTO state, final boolean editable) { - final ForIsWidget docHeader = gsArmor.getDocHeader(); - UiUtils.clear(docHeader); - final ImageResource resource = (ImageResource) iconRegistry.getContentTypeIcon(state.getTypeId(), - state.getMimeType()); - final boolean hasIcon = resource != null; - if (hasIcon) { - titleIcon.setResource(resource); - } - titleIcon.setVisible(hasIcon); - editableTitle.setText(state.getTitle()); - editableTitle.setEditable(editable); - docHeader.add(title); - } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-04-29 12:02:17 UTC (rev 1329) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-04-29 12:57:28 UTC (rev 1330) @@ -98,7 +98,7 @@ @Override public void clear() { - flex.clear(); + flex.removeAllRows(); super.clear(); } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-04-29 12:02:17 UTC (rev 1329) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-04-29 12:57:28 UTC (rev 1330) @@ -4,6 +4,9 @@ import cc.kune.blogs.shared.BlogsConstants; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.ui.EditEvent; +import cc.kune.common.client.ui.EditEvent.EditHandler; +import cc.kune.common.client.ui.HasEditHandler; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.registry.IconsRegistry; @@ -23,6 +26,8 @@ import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.actions.ActionGroups; +import cc.kune.gspace.client.actions.RenameAction; +import cc.kune.gspace.client.actions.RenameListener; import cc.kune.gspace.client.tool.ContentViewer; import cc.kune.gspace.client.tool.ContentViewerSelector; @@ -31,6 +36,7 @@ import com.google.gwt.event.dom.client.DoubleClickEvent; import com.google.gwt.event.dom.client.DoubleClickHandler; import com.google.gwt.event.shared.EventBus; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.inject.Inject; import com.google.inject.Provider; import com.gwtplatform.mvp.client.Presenter; @@ -40,154 +46,192 @@ import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; public class FolderViewerPresenter extends - Presenter<FolderViewerPresenter.FolderViewerView, FolderViewerPresenter.FolderViewerProxy> implements - ContentViewer { + Presenter<FolderViewerPresenter.FolderViewerView, FolderViewerPresenter.FolderViewerProxy> implements + ContentViewer { - @ProxyCodeSplit - public interface FolderViewerProxy extends Proxy<FolderViewerPresenter> { - } + @ProxyCodeSplit + public interface FolderViewerProxy extends Proxy<FolderViewerPresenter> { + } - public interface FolderViewerView extends View { + public interface FolderViewerView extends View { - void addItem(FolderItemDescriptor item, ClickHandler clickHandler, DoubleClickHandler doubleClickHandler); + void addItem(FolderItemDescriptor item, ClickHandler clickHandler, + DoubleClickHandler doubleClickHandler); - void attach(); + void attach(); - void clear(); + void clear(); - void detach(); + void detach(); - void setActions(GuiActionDescCollection actions); + HasEditHandler getEditTitle(); - void setContainer(StateContainerDTO state); + void setActions(GuiActionDescCollection actions); - void showEmptyMsg(); - } + void setContainer(StateContainerDTO state); - private final ActionRegistryByType actionsRegistry; - private final ContentCapabilitiesRegistry capabilitiesRegistry; - private final Provider<FileDownloadUtils> downloadUtilsProvider; - private final I18nTranslationService i18n; - private final IconsRegistry iconsRegistry; - private final Session session; - private final StateManager stateManager; - private final boolean useGenericImageIcon; + void setEditableTitle(String title); - @Inject - public FolderViewerPresenter(final EventBus eventBus, final FolderViewerView view, final FolderViewerProxy proxy, - final Session session, final StateManager stateManager, final I18nTranslationService i18n, - final ContentViewerSelector viewerSelector, final ActionRegistryByType actionsRegistry, - final Provider<FileDownloadUtils> downloadUtilsProvider, - final ContentCapabilitiesRegistry capabilitiesRegistry) { - super(eventBus, view, proxy); - this.session = session; - this.stateManager = stateManager; - this.i18n = i18n; - this.actionsRegistry = actionsRegistry; - this.downloadUtilsProvider = downloadUtilsProvider; - this.capabilitiesRegistry = capabilitiesRegistry; - iconsRegistry = capabilitiesRegistry.getIconsRegistry(); - viewerSelector.register(this, true, DocsConstants.TYPE_ROOT, DocsConstants.TYPE_FOLDER); - viewerSelector.register(this, true, BlogsConstants.TYPE_ROOT, BlogsConstants.TYPE_BLOG); - useGenericImageIcon = false; - } + void showEmptyMsg(); + } - private void addItem(final String title, final String contentTypeId, final BasicMimeTypeDTO mimeType, - final ContentStatus status, final StateToken stateToken, final StateToken parentStateToken, - final AccessRights rights) { - final Object icon = getIcon(stateToken, contentTypeId, mimeType); - final String tooltip = getTooltip(stateToken, mimeType); - final FolderItemDescriptor item = new FolderItemDescriptor(genId(stateToken), genId(parentStateToken), icon, - title, tooltip, status, stateToken, capabilitiesRegistry.isDragable(contentTypeId) - && rights.isAdministrable(), capabilitiesRegistry.isDropable(contentTypeId) - && rights.isAdministrable(), actionsRegistry.getCurrentActions(stateToken, contentTypeId, - session.isLogged(), rights, ActionGroups.MENUITEM)); - if (status.equals(ContentStatus.inTheDustbin) && !session.getShowDeletedContent()) { - // Don't show - // NotifyUser.info("Deleted, don't show"); - } else { - getView().addItem(item, new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - stateManager.gotoStateToken(stateToken); - } - }, new DoubleClickHandler() { - @Override - public void onDoubleClick(final DoubleClickEvent event) { - stateManager.gotoStateToken(stateToken); - } - }); - } - } + private final ActionRegistryByType actionsRegistry; - @Override - public void attach() { - getView().attach(); - } + private final ContentCapabilitiesRegistry capabilitiesRegistry; - private void createChildItems(final ContainerDTO container, final AccessRights containerRights) { - if (container.getContents().size() + container.getChilds().size() == 0) { - getView().showEmptyMsg(); - } else { - // Folders - for (final ContainerSimpleDTO childFolder : container.getChilds()) { - addItem(childFolder.getName(), childFolder.getTypeId(), null, ContentStatus.publishedOnline, - childFolder.getStateToken(), - childFolder.getStateToken().copy().setFolder(childFolder.getParentFolderId()), containerRights); - } - // Other contents (docs, etc) - for (final ContentSimpleDTO content : container.getContents()) { - addItem(content.getTitle(), content.getTypeId(), content.getMimeType(), content.getStatus(), - content.getStateToken(), content.getStateToken().copy().clearDocument(), content.getRights()); - } + private final Provider<FileDownloadUtils> downloadUtilsProvider; + private HandlerRegistration editHandler; + private final I18nTranslationService i18n; + private final IconsRegistry iconsRegistry; + private final Provider<RenameAction> renameAction; + private final Session session; + private final StateManager stateManager; + private final boolean useGenericImageIcon; + + @Inject + public FolderViewerPresenter(final EventBus eventBus, final FolderViewerView view, + final FolderViewerProxy proxy, final Session session, final StateManager stateManager, + final I18nTranslationService i18n, final ContentViewerSelector viewerSelector, + final ActionRegistryByType actionsRegistry, + final Provider<FileDownloadUtils> downloadUtilsProvider, + final ContentCapabilitiesRegistry capabilitiesRegistry, final Provider<RenameAction> renameAction) { + super(eventBus, view, proxy); + this.session = session; + this.stateManager = stateManager; + this.i18n = i18n; + this.actionsRegistry = actionsRegistry; + this.downloadUtilsProvider = downloadUtilsProvider; + this.capabilitiesRegistry = capabilitiesRegistry; + iconsRegistry = capabilitiesRegistry.getIconsRegistry(); + viewerSelector.register(this, true, DocsConstants.TYPE_ROOT, DocsConstants.TYPE_FOLDER); + viewerSelector.register(this, true, BlogsConstants.TYPE_ROOT, BlogsConstants.TYPE_BLOG); + useGenericImageIcon = false; + this.renameAction = renameAction; + } + + private void addItem(final String title, final String contentTypeId, final BasicMimeTypeDTO mimeType, + final ContentStatus status, final StateToken stateToken, final StateToken parentStateToken, + final AccessRights rights) { + final Object icon = getIcon(stateToken, contentTypeId, mimeType); + final String tooltip = getTooltip(stateToken, mimeType); + final FolderItemDescriptor item = new FolderItemDescriptor(genId(stateToken), + genId(parentStateToken), icon, title, tooltip, status, stateToken, + capabilitiesRegistry.isDragable(contentTypeId) && rights.isAdministrable(), + capabilitiesRegistry.isDropable(contentTypeId) && rights.isAdministrable(), + actionsRegistry.getCurrentActions(stateToken, contentTypeId, session.isLogged(), rights, + ActionGroups.MENUITEM)); + if (status.equals(ContentStatus.inTheDustbin) && !session.getShowDeletedContent()) { + // Don't show + // NotifyUser.info("Deleted, don't show"); + } else { + getView().addItem(item, new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + stateManager.gotoStateToken(stateToken); } + }, new DoubleClickHandler() { + @Override + public void onDoubleClick(final DoubleClickEvent event) { + stateManager.gotoStateToken(stateToken); + } + }); } + } - @Override - public void detach() { - getView().detach(); + @Override + public void attach() { + getView().attach(); + if (editHandler == null) { + createEditHandler(); } + } - private String genId(final StateToken token) { - return "k-cnav-" + token.toString().replace(StateToken.SEPARATOR, "-"); + private void createChildItems(final ContainerDTO container, final AccessRights containerRights) { + if (container.getContents().size() + container.getChilds().size() == 0) { + getView().showEmptyMsg(); + } else { + // Folders + for (final ContainerSimpleDTO childFolder : container.getChilds()) { + addItem(childFolder.getName(), childFolder.getTypeId(), null, ContentStatus.publishedOnline, + childFolder.getStateToken(), + childFolder.getStateToken().copy().setFolder(childFolder.getParentFolderId()), + containerRights); + } + // Other contents (docs, etc) + for (final ContentSimpleDTO content : container.getContents()) { + addItem(content.getTitle(), content.getTypeId(), content.getMimeType(), content.getStatus(), + content.getStateToken(), content.getStateToken().copy().clearDocument(), content.getRights()); + } } + } - private Object getIcon(final StateToken token, final String contentTypeId, final BasicMimeTypeDTO mimeType) { - if (!useGenericImageIcon && mimeType != null && mimeType.getType().equals("image")) { - return downloadUtilsProvider.get().getImageResizedUrl(token, ImageSize.ico); - } else { - return iconsRegistry.getContentTypeIcon(contentTypeId, mimeType); - } - } + private void createEditHandler() { + // Duplicate in DocViewerPresenter + editHandler = getView().getEditTitle().addEditHandler(new EditHandler() { + @Override + public void fire(final EditEvent event) { + renameAction.get().rename(session.getCurrentStateToken(), session.getCurrentState().getTitle(), + event.getText(), new RenameListener() { + @Override + public void onFail(final StateToken token, final String oldTitle) { + getView().setEditableTitle(oldTitle); + } - private String getTooltip(final StateToken token, final BasicMimeTypeDTO mimeType) { - if (mimeType != null && (mimeType.isImage() || mimeType.isPdf())) { - // Used for previews - return null; - } else { - return i18n.t("Double click to open"); - } - } + @Override + public void onSuccess(final StateToken token, final String title) { + getView().setEditableTitle(title); + } + }); + } + }); + } - public void refreshState() { - setContent((HasContent) session.getCurrentState()); + @Override + public void detach() { + getView().detach(); + } + + private String genId(final StateToken token) { + return "k-cnav-" + token.toString().replace(StateToken.SEPARATOR, "-"); + } + + private Object getIcon(final StateToken token, final String contentTypeId, + final BasicMimeTypeDTO mimeType) { + if (!useGenericImageIcon && mimeType != null && mimeType.getType().equals("image")) { + return downloadUtilsProvider.get().getImageResizedUrl(token, ImageSize.ico); + } else { + return iconsRegistry.getContentTypeIcon(contentTypeId, mimeType); } + } - @Override - protected void revealInParent() { - RevealRootContentEvent.fire(this, this); + private String getTooltip(final StateToken token, final BasicMimeTypeDTO mimeType) { + if (mimeType != null && (mimeType.isImage() || mimeType.isPdf())) { + // Used for previews + return null; + } else { + return i18n.t("Double click to open"); } + } - @Override - public void setContent(@Nonnull final HasContent state) { - getView().clear(); - final StateContainerDTO stateContainer = (StateContainerDTO) state; - getView().setContainer(stateContainer); - final AccessRights rights = stateContainer.getContainerRights(); - final GuiActionDescCollection actions = actionsRegistry.getCurrentActions(stateContainer.getGroup(), - stateContainer.getTypeId(), session.isLogged(), rights, ActionGroups.VIEW); - getView().setActions(actions); - createChildItems(stateContainer.getContainer(), stateContainer.getContainerRights()); - // view.setEditable(rights.isEditable()); - } + public void refreshState() { + setContent((HasContent) session.getCurrentState()); + } + + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } + + @Override + public void setContent(@Nonnull final HasContent state) { + getView().clear(); + final StateContainerDTO stateContainer = (StateContainerDTO) state; + getView().setContainer(stateContainer); + final AccessRights rights = stateContainer.getContainerRights(); + final GuiActionDescCollection actions = actionsRegistry.getCurrentActions(stateContainer.getGroup(), + stateContainer.getTypeId(), session.isLogged(), rights, ActionGroups.VIEW); + getView().setActions(actions); + createChildItems(stateContainer.getContainer(), stateContainer.getContainerRights()); + // view.setEditable(rights.isEditable()); + } } \ No newline at end of file

1 0

29 Apr '11

Author: vjrj_ Date: 2011-04-29 14:02:17 +0200 (Fri, 29 Apr 2011) New Revision: 1329 Added: trunk/img/kune-intro.png trunk/img/kune-intro.svg trunk/src/main/java/cc/kune/common/client/ui/EditEvent.java trunk/src/main/java/cc/kune/common/client/ui/EditableLabel.java trunk/src/main/java/cc/kune/common/client/ui/EditableLabel.ui.xml trunk/src/main/java/cc/kune/common/client/ui/HasEditHandler.java trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java trunk/src/main/java/cc/kune/gspace/client/actions/RenameListener.java Modified: trunk/README_FIRST trunk/TODO trunk/TODO_done trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java trunk/src/main/java/cc/kune/core/server/state/StateContent.java trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java trunk/src/main/java/cc/kune/domain/Content.java trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPresenter.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml trunk/src/main/java/cc/kune/wave/server/KuneWaveManager.java trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java trunk/src/test/java/cc/kune/wave/server/KuneWaveManagerDefaultTest.java Log: Content renaming Modified: trunk/README_FIRST =================================================================== --- trunk/README_FIRST 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/README_FIRST 2011-04-29 12:02:17 UTC (rev 1329) @@ -1,2 +1,4 @@ WARNING Please note that we are doing a big refactorization of Kune to adapt it to Wave. Also we are starting to use other libraries (for instance gin for IoC instead of our old Suco library). Then don't expect to much of /trunk/ because of that (for our old more stable code see tag 0.0.6-pre-wiab). + +New code (and refactorized) is under cc.kune package. Our old code (not yet refactorized or deprecated) is under org.ourproject.kune package waiting for be adapted or removed. Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/TODO 2011-04-29 12:02:17 UTC (rev 1329) @@ -12,33 +12,108 @@ nick == assigned to * SHORT-TERM (URGENT) -** TODO WIAB History integration -*** Initial defpage #home -**** u: if logged: wave list (#inbox) else: signin -**** g: def project -**** p: idem -*** #example.com/w+abcd -**** u: if logged: this wave else: signin and return to this -**** g: equivalent group page? no, only with a button-action -**** p: idem -*** #site.doc.1 -**** u: if logged: wave list else signin (or also a button-action to go to open in the user-list) -**** g: group content -**** p: idem -*** Some javadoc: -HistorySupport.java -WaverefEncoder.java - /** - * Takes a path segment which includes the domain and wave ID,and optionally - * the wavelet domain + ID and the blip ID, and converts it to a waveref - * object. Further tokens after 5 are silently ignored. Examples of valid URI - * path segments are: example.com/w+abcd example.com/w+abcd/~/conv+root - * example.com/w+abcd/~/conv+root/b+45kg - * - * @param path The path containing the domain and wave ID. - * @return The corresponding WaveRef object, or null if the path was invalid. - * @throws InvalidWaveRefException If the path contains less than 2 tokens or 3 tokens. - */ +** TODO Wiab EDitor in GSpace +*** Logged +**** -Status--- +**** Admins (view plain, create new, participate in all) +**** Editors (view plain --> create new --> ask for participation) +**** Viewers (view plain --> ask for participation) +*** Not logged (view plain wave) + +** Perms in WIAB :ARCHIVE: +27-abr-2011 16:59:01 org.waveprotocol.box.server.robots.OperationContextImpl openWavelet +GRAVE: admin@localhost tried to open [WaveletName localhost/w+1v66qilgtl2o6E/localhost/conv+root] which it isn't participating in +27-abr-2011 16:59:01 org.waveprotocol.box.server.robots.util.OperationUtil executeOperation +ADVERTENCIA: Operation {'method':'robot.fetchWave','id':'op16','waveId':'localhost!w+1v66qilgtl2o6E','waveletId':'localhost!conv+root','blipId':'null','parameters':{WAVELET_ID=localhost!conv+root, WAVE_ID=localhost!w+1v66qilgtl2o6E}} failed to execute +com.google.wave.api.InvalidRequestException: Wavelet [WaveletName localhost/w+1v66qilgtl2o6E/localhost/conv+root] couldn't be retrieved + at org.waveprotocol.box.server.robots.OperationContextImpl.openWavelet(OperationContextImpl.java:231) + at org.waveprotocol.box.server.robots.OperationContextImpl.openWavelet(OperationContextImpl.java:247) + at org.waveprotocol.box.server.robots.operations.FetchWaveService.execute(FetchWaveService.java:52) + at org.waveprotocol.box.server.robots.util.OperationUtil.executeOperation(OperationUtil.java:171) + at cc.kune.wave.server.KuneWaveManagerDefault.fetchWavelet(KuneWaveManagerDefault.java:138) + at cc.kune.wave.server.KuneWaveManagerDefault$$EnhancerByGuice$$eb69153f.CGLIB$fetchWavelet$2(<generated>) + at cc.kune.wave.server.KuneWaveManagerDefault$$EnhancerByGuice$$eb69153f$$FastClassByGuice$$53f72476.invoke(<generated>) + at com.google.inject.internal.cglib.proxy.$MethodProxy.invokeSuper(MethodProxy.java:228) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at cc.kune.core.server.LoggerMethodInterceptor.invoke(LoggerMethodInterceptor.java:87) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at com.google.inject.internal.InterceptorStackCallback.intercept(InterceptorStackCallback.java:44) + at cc.kune.wave.server.KuneWaveManagerDefault$$EnhancerByGuice$$eb69153f.fetchWavelet(<generated>) + at cc.kune.core.server.state.StateServiceDefault.create(StateServiceDefault.java:111) + at cc.kune.core.server.state.StateServiceDefault$$EnhancerByGuice$$9d4970d0.CGLIB$create$1(<generated>) + at cc.kune.core.server.state.StateServiceDefault$$EnhancerByGuice$$9d4970d0$$FastClassByGuice$$9a3402d2.invoke(<generated>) + at com.google.inject.internal.cglib.proxy.$MethodProxy.invokeSuper(MethodProxy.java:228) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at cc.kune.core.server.LoggerMethodInterceptor.invoke(LoggerMethodInterceptor.java:87) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at com.google.inject.internal.InterceptorStackCallback.intercept(InterceptorStackCallback.java:44) + at cc.kune.core.server.state.StateServiceDefault$$EnhancerByGuice$$9d4970d0.create(<generated>) + at cc.kune.core.server.rpc.ContentRPC.getContentOrDefContent(ContentRPC.java:263) + at cc.kune.core.server.rpc.ContentRPC.getContent(ContentRPC.java:246) + at cc.kune.core.server.rpc.ContentRPC$$EnhancerByGuice$$9d633676.CGLIB$getContent$1(<generated>) + at cc.kune.core.server.rpc.ContentRPC$$EnhancerByGuice$$9d633676$$FastClassByGuice$$8c7047c.invoke(<generated>) + at com.google.inject.internal.cglib.proxy.$MethodProxy.invokeSuper(MethodProxy.java:228) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at cc.kune.core.server.LoggerMethodInterceptor.invoke(LoggerMethodInterceptor.java:87) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at com.google.inject.persist.jpa.JpaLocalTxnInterceptor.invoke(JpaLocalTxnInterceptor.java:66) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at cc.kune.core.server.auth.AuthenticatedMethodInterceptor.invoke(AuthenticatedMethodInterceptor.java:84) + at cc.kune.core.server.OutermostCallInterceptor.invoke(OutermostCallInterceptor.java:66) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at com.google.inject.internal.InterceptorStackCallback.intercept(InterceptorStackCallback.java:44) + at cc.kune.core.server.rpc.ContentRPC$$EnhancerByGuice$$9d633676.getContent(<generated>) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:616) + at com.google.gwt.user.server.rpc.RPC.invokeAndEncodeResponse(RPC.java:562) + at com.google.gwt.user.server.rpc.RPC.invokeAndEncodeResponse(RPC.java:544) + at com.google.gwt.user.server.rpc.RPC.invokeAndEncodeResponse(RPC.java:504) + at cc.kune.core.server.rack.filters.gwts.DelegatedRemoteServlet.processCall(DelegatedRemoteServlet.java:45) + at com.google.gwt.user.server.rpc.RemoteServiceServlet.processPost(RemoteServiceServlet.java:243) + at com.google.gwt.user.server.rpc.AbstractRemoteServiceServlet.doPost(AbstractRemoteServiceServlet.java:62) + at cc.kune.core.server.rack.filters.gwts.GWTServiceFilter.doFilter(GWTServiceFilter.java:61) + at cc.kune.core.server.rack.RackServletFilter$DockChain.execute(RackServletFilter.java:70) + at cc.kune.core.server.rack.RackServletFilter$DockChain.doFilter(RackServletFilter.java:63) + at com.google.inject.servlet.FilterChainInvocation.doFilter(FilterChainInvocation.java:66) + at com.google.inject.servlet.ManagedFilterPipeline.dispatch(ManagedFilterPipeline.java:118) + at com.google.inject.servlet.ManagedFilterPipeline$$EnhancerByGuice$$1af97b76.CGLIB$dispatch$0(<generated>) + at com.google.inject.servlet.ManagedFilterPipeline$$EnhancerByGuice$$1af97b76$$FastClassByGuice$$57398af4.invoke(<generated>) + at com.google.inject.internal.cglib.proxy.$MethodProxy.invokeSuper(MethodProxy.java:228) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at cc.kune.core.server.LoggerMethodInterceptor.invoke(LoggerMethodInterceptor.java:87) + at com.google.inject.internal.InterceptorStackCallback$InterceptedMethodInvocation.proceed(InterceptorStackCallback.java:64) + at com.google.inject.internal.InterceptorStackCallback.intercept(InterceptorStackCallback.java:44) + at com.google.inject.servlet.ManagedFilterPipeline$$EnhancerByGuice$$1af97b76.dispatch(<generated>) + at com.google.inject.servlet.GuiceFilter.doFilter(GuiceFilter.java:113) + at cc.kune.core.server.rack.RackServletFilter$DockChain.execute(RackServletFilter.java:70) + at cc.kune.core.server.rack.RackServletFilter$DockChain.doFilter(RackServletFilter.java:63) + at cc.kune.core.server.rack.filters.LogFilter.doFilter(LogFilter.java:46) + at cc.kune.core.server.rack.RackServletFilter$DockChain.execute(RackServletFilter.java:70) + at cc.kune.core.server.rack.RackServletFilter$DockChain.doFilter(RackServletFilter.java:63) + at cc.kune.core.server.rack.RackServletFilter.doFilter(RackServletFilter.java:105) + at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1187) + at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:421) + at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:119) + at org.eclipse.jetty.security.SecurityHandler.handle(SecurityHandler.java:493) + at org.eclipse.jetty.server.session.SessionHandler.doHandle(SessionHandler.java:225) + at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:930) + at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:358) + at org.eclipse.jetty.server.session.SessionHandler.doScope(SessionHandler.java:183) + at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:866) + at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:117) + at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:113) + at org.eclipse.jetty.server.Server.handle(Server.java:351) + at org.eclipse.jetty.server.HttpConnection.handleRequest(HttpConnection.java:594) + at org.eclipse.jetty.server.HttpConnection$RequestHandler.content(HttpConnection.java:1059) + at org.eclipse.jetty.http.HttpParser.parseNext(HttpParser.java:764) + at org.eclipse.jetty.http.HttpParser.parseAvailable(HttpParser.java:217) + at org.eclipse.jetty.server.HttpConnection.handle(HttpConnection.java:424) + at org.eclipse.jetty.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:506) + at org.eclipse.jetty.util.thread.QueuedThreadPool$2.run(QueuedThreadPool.java:436) + at java.lang.Thread.run(Thread.java:679) +2011-04-27 16:59:01,904 [qtp2042579307-41] ERROR - Wavelet [WaveletName localhost/w+1v66qilgtl2o6E/localhost/conv+root] couldn't be retrieved ** TODO Server side extensions configuration menu A way to specify the default extensions in a client of a wave server. ** TODO style injection: @@ -294,7 +369,7 @@ 2007-12-21 10:35:16,196 [btpool0-5] DEBUG - ContentManagerDefault.persist EXCEPTION => javax.persistence.EntityExistsException: org.hibernate.exception.ConstraintViolationException: could not insert: [org.ourproject.kune.platf.server.domain.Group] 2007-12-21 10:35:16,197 [btpool0-5] DEBUG - ContentManagerDefault.createContent EXCEPTION => javax.persistence.Entity ** vjrj <v> IconHyperlink.java and IconLabel.java to gwt1.5 - + * MID-TERM ** Enable two Waves per doc: 1 for the doc (no comments enabled), other for comments. Similar to docs.google.com comments approach. ** TODO start/stop init scripts Modified: trunk/TODO_done =================================================================== --- trunk/TODO_done 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/TODO_done 2011-04-29 12:02:17 UTC (rev 1329) @@ -63,6 +63,74 @@ :ARCHIVE_OLPATH: SHORT-TERM (URGENT) :ARCHIVE_CATEGORY: TODO :END: +* TODO WIAB History integration + :PROPERTIES: + :ARCHIVE_TIME: 2011-04-28 jue 23:50 + :ARCHIVE_FILE: ~/proyectos/dev/kune/trunk/TODO + :ARCHIVE_OLPATH: SHORT-TERM (URGENT) + :ARCHIVE_CATEGORY: TODO + :ARCHIVE_TODO: TODO + :END: +** Initial defpage #home +*** u: if logged: wave list (#inbox) else: signin +*** g: def project +*** p: idem +** #example.com/w+abcd +*** u: if logged: this wave else: signin and return to this +*** g: equivalent group page? no, only with a button-action +*** p: idem +** #site.doc.1 +*** u: if logged: wave list else signin (or also a button-action to go to open in the user-list) +*** g: group content +*** p: idem +** Some javadoc: +HistorySupport.java +WaverefEncoder.java + /** + * Takes a path segment which includes the domain and wave ID,and optionally + * the wavelet domain + ID and the blip ID, and converts it to a waveref + * object. Further tokens after 5 are silently ignored. Examples of valid URI + * path segments are: example.com/w+abcd example.com/w+abcd/~/conv+root + * example.com/w+abcd/~/conv+root/b+45kg + * + * @param path The path containing the domain and wave ID. + * @return The corresponding WaveRef object, or null if the path was invalid. + * @throws InvalidWaveRefException If the path contains less than 2 tokens or 3 tokens. + */ +* TODO WIAB History integration + :PROPERTIES: + :ARCHIVE_TIME: 2011-04-28 jue 23:50 + :ARCHIVE_FILE: ~/proyectos/dev/kune/trunk/TODO + :ARCHIVE_OLPATH: SHORT-TERM (URGENT) + :ARCHIVE_CATEGORY: TODO + :ARCHIVE_TODO: TODO + :END: +** Initial defpage #home +*** u: if logged: wave list (#inbox) else: signin +*** g: def project +*** p: idem +** #example.com/w+abcd +*** u: if logged: this wave else: signin and return to this +*** g: equivalent group page? no, only with a button-action +*** p: idem +** #site.doc.1 +*** u: if logged: wave list else signin (or also a button-action to go to open in the user-list) +*** g: group content +*** p: idem +** Some javadoc: +HistorySupport.java +WaverefEncoder.java + /** + * Takes a path segment which includes the domain and wave ID,and optionally + * the wavelet domain + ID and the blip ID, and converts it to a waveref + * object. Further tokens after 5 are silently ignored. Examples of valid URI + * path segments are: example.com/w+abcd example.com/w+abcd/~/conv+root + * example.com/w+abcd/~/conv+root/b+45kg + * + * @param path The path containing the domain and wave ID. + * @return The corresponding WaveRef object, or null if the path was invalid. + * @throws InvalidWaveRefException If the path contains less than 2 tokens or 3 tokens. + */ @@ -71,3 +139,5 @@ + + Added: trunk/img/kune-intro.png =================================================================== (Binary files differ) Property changes on: trunk/img/kune-intro.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/kune-intro.svg =================================================================== --- trunk/img/kune-intro.svg (rev 0) +++ trunk/img/kune-intro.svg 2011-04-29 12:02:17 UTC (rev 1329) @@ -0,0 +1,763 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="210mm" + height="297mm" + id="svg2" + version="1.1" + inkscape:version="0.48.1 r9760" + sodipodi:docname="kune-intro.svg"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.98994949" + inkscape:cx="448.08112" + inkscape:cy="520" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1080" + inkscape:window-height="1847" + inkscape:window-x="0" + inkscape:window-y="21" + inkscape:window-maximized="1" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Capa 1" + inkscape:groupmode="layer" + id="layer1"> + <rect + ry="15" + rx="15" + y="-23.259554" + x="51.411152" + height="643.46716" + width="759.63477" + id="rect3005" + style="color:#000000;fill:#ffe6d5;stroke:#a56941;stroke-width:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + ry="16.860992" + rx="14.920214" + y="112.55608" + x="53.431454" + height="506.29779" + width="755.59412" + id="rect10103" + style="color:#000000;fill:#ffccaa;fill-opacity:1;stroke:none;stroke-width:3.70400834000000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + style="color:#000000;fill:#a56941;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect9982" + width="151.52289" + height="91.923882" + x="52.421307" + y="111.09074" + rx="15.306123" + ry="17.278481" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <text + xml:space="preserve" + style="font-size:32px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="102.1117" + y="153.88293" + id="text2985" + sodipodi:linespacing="125%" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan2987" + x="102.1117" + y="153.88293" + style="font-size:32px;font-weight:bold;fill:#ffffff;-inkscape-font-specification:Ubuntu Bold">Users</tspan></text> + <rect + style="opacity:1;color:#000000;fill:#b77549;fill-opacity:1;stroke:none;stroke-width:3.70400834000000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect2989" + width="763.67542" + height="448.75012" + x="49.39085" + y="172.64462" + rx="15.079786" + ry="14.94451" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <text + sodipodi:linespacing="125%" + id="text2991" + y="152.87277" + x="269.09149" + style="font-size:32px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + style="font-size:32px;font-weight:bold;fill:#dd8a3d;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold" + y="152.87277" + x="269.09149" + id="tspan2993" + sodipodi:role="line">Groups</tspan></text> + <text + xml:space="preserve" + style="font-size:32px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="455.63461" + y="154.89308" + id="text2995" + sodipodi:linespacing="125%" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan2997" + x="455.63461" + y="154.89308" + style="font-size:32px;font-weight:bold;fill:#dd8a3d;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold">Public</tspan></text> + <text + sodipodi:linespacing="125%" + id="text2999" + y="153.88293" + x="611.29456" + style="font-size:32px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + style="font-size:32px;font-weight:bold;fill:#dd8a3d;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold" + y="153.88293" + x="611.29456" + sodipodi:role="line" + id="tspan3003">Institutions</tspan></text> + <g + id="g8708" + transform="matrix(0.69032837,0,0,0.69032837,-114.0733,304.29447)"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/userSpaceDisabled.png" + transform="matrix(1.1754752,0,0,2.3509505,-72.996319,700.21488)" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + sodipodi:ry="10" + sodipodi:rx="20" + sodipodi:cy="32.362183" + sodipodi:cx="90" + id="path3041" + style="color:#000000;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/userSpaceDisabled.png" + transform="matrix(4.9493694,0,0,4.9493694,-41.444089,695.31429)" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + sodipodi:ry="1" + sodipodi:rx="1" + sodipodi:cy="16.362183" + sodipodi:cx="15" + id="path3063" + style="opacity:0.5;color:#000000;fill:#d45500;fill-opacity:1;stroke:#d45500;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + </g> + <g + id="g8712" + transform="matrix(0.69032837,0,0,0.69032837,-108.20704,393.09429)"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceDisabled.png" + inkscape:transform-center-x="1.0789987" + transform="matrix(2.331168,0.83049401,-0.83049401,2.331168,13.440652,718.62706)" + inkscape:transform-center-y="-0.10734487" + d="m 35,17.362183 -4.755283,-3.454915 1.816357,-5.5901703 5.877852,-10e-8 1.816357,5.5901694 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="2.1991149" + sodipodi:arg1="1.5707963" + sodipodi:r2="4.045085" + sodipodi:r1="5" + sodipodi:cy="12.362183" + sodipodi:cx="35" + sodipodi:sides="5" + id="path4171" + style="opacity:0.5;color:#000000;fill:none;stroke:#28220b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceDisabled.png" + sodipodi:type="arc" + style="color:#000000;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3045" + sodipodi:cx="90" + sodipodi:cy="32.362183" + sodipodi:rx="20" + sodipodi:ry="10" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + transform="matrix(1.1754752,0,0,2.3509505,-21.027938,700.21488)" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceDisabled.png" + sodipodi:type="arc" + style="opacity:0.5;color:#000000;fill:#dd8a3d;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3065" + sodipodi:cx="15" + sodipodi:cy="16.362183" + sodipodi:rx="1" + sodipodi:ry="1" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,52.358512,668.43223)" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceDisabled.png" + transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,39.072522,663.0841)" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + sodipodi:ry="1" + sodipodi:rx="1" + sodipodi:cy="16.362183" + sodipodi:cx="15" + id="path3067" + style="opacity:0.5;color:#000000;fill:#69312f;fill-opacity:1;stroke:#69312f;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceDisabled.png" + sodipodi:type="arc" + style="opacity:0.5;color:#000000;fill:#28220b;fill-opacity:1;stroke:#28220b;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3069" + sodipodi:cx="15" + sodipodi:cy="16.362183" + sodipodi:rx="1" + sodipodi:ry="1" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,51.571882,682.96918)" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceDisabled.png" + transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,37.912422,686.69724)" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + sodipodi:ry="1" + sodipodi:rx="1" + sodipodi:cy="16.362183" + sodipodi:cx="15" + id="path3071" + style="opacity:0.5;color:#000000;fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceDisabled.png" + sodipodi:type="arc" + style="opacity:0.5;color:#000000;fill:#ffdb6b;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3073" + sodipodi:cx="15" + sodipodi:cy="16.362183" + sodipodi:rx="1" + sodipodi:ry="1" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + transform="matrix(5.5489598,1.9768537,-1.9768537,5.5489598,21.615452,655.42435)" /> + </g> + <g + id="g8695" + transform="matrix(0.69032837,0,0,0.69032837,56.354331,-430.15193)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/userSpaceEnabled.png" + sodipodi:type="arc" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4961" + sodipodi:cx="90" + sodipodi:cy="32.362183" + sodipodi:rx="20" + sodipodi:ry="10" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + transform="matrix(1.1754752,0,0,2.3509505,-73.660121,753.33034)" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/userSpaceEnabled.png" + sodipodi:type="arc" + style="color:#000000;fill:#d45500;fill-opacity:1;stroke:#d45500;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4971" + sodipodi:cx="15" + sodipodi:cy="16.362183" + sodipodi:rx="1" + sodipodi:ry="1" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + transform="matrix(4.9493694,0,0,4.9493694,-42.107891,748.42974)" /> + </g> + <g + id="g8699" + transform="matrix(0.69032837,0,0,0.69032837,186.96913,-430.15193)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + sodipodi:type="star" + style="color:#000000;fill:none;stroke:#28220b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4963" + sodipodi:sides="5" + sodipodi:cx="35" + sodipodi:cy="12.362183" + sodipodi:r1="5" + sodipodi:r2="4.045085" + sodipodi:arg1="1.5707963" + sodipodi:arg2="2.1991149" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 35,17.362183 -4.755283,-3.454915 1.816357,-5.5901703 5.877852,-10e-8 1.816357,5.5901694 z" + inkscape:transform-center-y="-0.10735044" + transform="matrix(2.331168,0.83049401,-0.83049401,2.331168,12.776852,771.74251)" + inkscape:transform-center-x="1.078998" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceEnabled.png" + transform="matrix(1.1754752,0,0,2.3509505,-21.691738,753.33034)" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + sodipodi:ry="10" + sodipodi:rx="20" + sodipodi:cy="32.362183" + sodipodi:cx="90" + id="path4965" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,51.694712,721.54769)" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + sodipodi:ry="1" + sodipodi:rx="1" + sodipodi:cy="16.362183" + sodipodi:cx="15" + id="path4973" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + sodipodi:type="arc" + style="color:#000000;fill:#69312f;fill-opacity:1;stroke:#69312f;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4975" + sodipodi:cx="15" + sodipodi:cy="16.362183" + sodipodi:rx="1" + sodipodi:ry="1" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,38.408722,716.19953)" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,50.908082,736.08463)" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + sodipodi:ry="1" + sodipodi:rx="1" + sodipodi:cy="16.362183" + sodipodi:cx="15" + id="path4977" + style="color:#000000;fill:#28220b;fill-opacity:1;stroke:#28220b;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + sodipodi:type="arc" + style="color:#000000;fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4979" + sodipodi:cx="15" + sodipodi:cy="16.362183" + sodipodi:rx="1" + sodipodi:ry="1" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,37.248612,739.8127)" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + transform="matrix(5.5489598,1.9768537,-1.9768537,5.5489598,20.951652,708.53981)" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + sodipodi:ry="1" + sodipodi:rx="1" + sodipodi:cy="16.362183" + sodipodi:cx="15" + id="path4981" + style="color:#000000;fill:#ffdb6b;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + </g> + <g + id="g8729" + transform="matrix(0.69032837,0,0,0.69032837,-226.87213,174.45352)"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + sodipodi:type="arc" + style="color:#000000;fill:#aaeeff;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4967" + sodipodi:cx="90" + sodipodi:cy="32.362183" + sodipodi:rx="20" + sodipodi:ry="10" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + transform="matrix(1.1754752,0,0,2.3509505,30.276632,753.33034)" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:2.47468472;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 130.79962,807.50532 c -2.85339,0.78923 -5.20625,2.69048 -7.74114,4.12698 -1.45578,1.08139 -3.17371,4.03552 -1.21347,5.32414 1.55176,0.2611 2.79811,-1.05921 4.32566,-1.15498 1.78407,-0.4112 3.60556,-0.7363 5.29696,-1.46265 2.88934,-0.9105 2.88934,-0.9105 3.18467,-1.97638 0.14032,-1.60483 -1.00047,-3.09256 -2.07745,-4.18939 -0.49137,-0.40285 -1.11497,-0.78049 -1.77523,-0.66772 z" + id="path4969" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:2.47468472;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 153.3922,823.22551 c -4.04703,2.06374 -8.81245,4.142 -10.56886,8.25203 -0.54013,1.26397 0.22272,2.75445 0.4124,4.10295 0.7708,1.43658 -1.11269,2.70312 -0.55672,4.14497 0.66534,1.49717 2.56652,1.27157 3.82727,0.79099 1.28493,-0.44158 -0.53582,-1.70575 0,0 0.58286,1.36335 5.36635,1.77935 6.80857,1.16016 1.38701,-0.50855 2.33091,-0.74837 2.99303,-1.90611 2.17102,-4.41676 3.23712,-9.41812 2.89588,-14.33661 -0.10641,-1.32539 -0.51397,-2.60792 -0.99259,-3.83098 -0.49507,-1.61389 -2.16711,0.0173 -2.82476,0.68071 -0.60256,0.42631 -1.2709,0.77633 -1.99422,0.94189 z" + id="path4983" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cacccccccccc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:connector-curvature="0" + id="path4985" + d="m 121.52672,824.27304 c -2.3826,0.90534 -4.95654,1.52602 -7.13172,2.85353 -1.8032,1.51882 -1.57875,4.29287 -0.64391,6.22636 1.14716,2.47466 2.05723,5.06419 3.4281,7.43042 1.32587,1.74784 -0.0893,0.98747 1.52127,2.46832 0.45524,0.54208 3.2913,3.28282 4.94937,2.47469 0.82652,-0.40286 0.61983,-1.62095 0.54826,-2.70337 0.52083,-2.24499 -0.82476,-4.39163 -0.7175,-6.65278 -0.0579,-2.83898 0.49943,-5.64398 0.8377,-8.45265 0.19302,-1.55725 -0.68561,-4.455 -2.79157,-3.64452 z" + style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:2.47468472;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:nodetypes="cccccacccc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/publicSpaceEnabled.png" + transform="matrix(1.1754752,0,0,2.3509505,30.276632,753.33034)" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + sodipodi:ry="10" + sodipodi:rx="20" + sodipodi:cy="32.362183" + sodipodi:cx="90" + id="path4987" + style="color:#000000;fill:none;stroke:#002255;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + </g> + <g + id="g8721" + transform="matrix(0.69032837,0,0,0.69032837,337.35987,-393.48482)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/publicSpaceDisabled.png" + transform="matrix(1.1754752,0,0,2.3509505,30.940442,700.21488)" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + sodipodi:ry="10" + sodipodi:rx="20" + sodipodi:cy="32.362183" + sodipodi:cx="90" + id="path3047" + style="color:#000000;fill:#d5e5ff;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/publicSpaceDisabled.png" + sodipodi:nodetypes="cccccccc" + inkscape:connector-curvature="0" + id="path3129" + d="m 131.46342,754.38987 c -2.85339,0.78922 -5.20625,2.69047 -7.74114,4.12697 -1.45578,1.08139 -3.17371,4.03552 -1.21347,5.32414 1.55176,0.26111 2.79811,-1.05921 4.32566,-1.15498 1.78407,-0.4112 3.60556,-0.7363 5.29696,-1.46264 2.88934,-0.91051 2.88934,-0.91051 3.18467,-1.97638 0.14032,-1.60484 -1.00047,-3.09257 -2.07744,-4.1894 -0.49138,-0.40285 -1.11498,-0.78048 -1.77524,-0.66771 z" + style="color:#000000;fill:#87deaa;fill-opacity:1;fill-rule:nonzero;stroke:#87deaa;stroke-width:2.47468472;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/publicSpaceDisabled.png" + sodipodi:nodetypes="cacccccccccc" + inkscape:connector-curvature="0" + id="path4991" + d="m 154.056,770.13557 c -4.04703,2.06371 -8.81245,4.14198 -10.56886,8.252 -0.54013,1.26397 0.22272,2.75445 0.4124,4.10296 0.7708,1.43658 -1.11269,2.70312 -0.55672,4.14497 0.66534,1.49716 2.56652,1.27157 3.82727,0.79098 1.28493,-0.44158 -0.53582,-1.70574 0,0 0.58286,1.36336 5.36635,1.77935 6.80857,1.16016 1.38701,-0.50854 2.33091,-0.74836 2.99304,-1.90608 2.17101,-4.41678 3.23711,-9.41815 2.89587,-14.33663 -0.10641,-1.3254 -0.51397,-2.60792 -0.99259,-3.83099 -0.49507,-1.61389 -2.16711,0.0174 -2.82476,0.68074 -0.60256,0.42628 -1.2709,0.7763 -1.99422,0.94189 z" + style="color:#000000;fill:#87deaa;fill-opacity:1;fill-rule:nonzero;stroke:#87deaa;stroke-width:2.47468472;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/publicSpaceDisabled.png" + sodipodi:nodetypes="cccccacccc" + style="color:#000000;fill:#87deaa;fill-opacity:1;fill-rule:nonzero;stroke:#87deaa;stroke-width:2.47468472;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 122.19052,771.15758 c -2.3826,0.90535 -4.95654,1.52602 -7.13172,2.85354 -1.8032,1.51881 -1.57875,4.29286 -0.64391,6.22635 1.14716,2.47467 2.05723,5.0642 3.42811,7.43042 1.32586,1.74785 -0.0893,0.98748 1.52126,2.46833 0.45524,0.54208 3.2913,3.28281 4.94937,2.47468 0.82652,-0.40286 0.61983,-1.62095 0.54826,-2.70337 0.52083,-2.24498 -0.82476,-4.39163 -0.7175,-6.65277 -0.0579,-2.83898 0.49944,-5.64399 0.8377,-8.45266 0.19303,-1.55724 -0.68561,-4.455 -2.79157,-3.64452 z" + id="path3125" + inkscape:connector-curvature="0" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/publicSpaceDisabled.png" + sodipodi:type="arc" + style="color:#000000;fill:none;stroke:#b3b3b3;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3007" + sodipodi:cx="90" + sodipodi:cy="32.362183" + sodipodi:rx="20" + sodipodi:ry="10" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + transform="matrix(1.1754752,0,0,2.3509505,30.940442,700.21488)" /> + <path + transform="matrix(1.1754752,0,0,2.3509505,30.940442,700.21488)" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + sodipodi:ry="10" + sodipodi:rx="20" + sodipodi:cy="32.362183" + sodipodi:cx="90" + id="path3141" + style="color:#000000;fill:none;stroke:#b3b3b3;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/publicSpaceDisabled.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + </g> + <g + id="g9950" + transform="matrix(1.1267151,0,0,1.1267151,438.15736,-63.180454)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + id="path2585" + d="m 273.08439,61.656431 c -0.94086,0 -1.84521,0.0038 -2.7527,0.06255 -0.0847,0.01722 -0.16503,0.0466 -0.25025,0.06255 -0.84477,0.157787 -1.67823,0.292338 -2.56501,0.312813 -0.12283,0.01722 -0.25319,-0.01836 -0.37537,0 -7.23791,1.089665 -13.35321,4.232391 -18.26793,9.446767 -5.73951,6.06158 -8.63346,13.323179 -8.63347,21.771374 0,8.542995 2.89397,15.853925 8.63347,21.896495 6.21303,6.51614 14.2855,9.75956 24.21126,9.75958 5.26591,-2e-5 10.3285,-1.30838 15.13985,-3.94137 4.81128,-2.55719 8.9947,-6.17652 12.57485,-10.76056 l -10.82313,-6.00589 c -4.65983,6.21305 -10.38519,9.32165 -17.20437,9.32165 -4.7356,0 -8.98159,-1.53619 -12.63741,-4.56698 -3.71271,-3.03077 -5.56801,-6.72237 -5.56796,-11.135945 l 49.48606,0 0,-2.50246 c -5e-5,-10.702335 -3.62514,-19.272304 -10.82312,-25.712732 -6.06157,-5.360601 -12.77627,-8.007783 -20.14477,-8.007859 z m -230.100847,0.43793 0,23.961011 -8.383224,0 0,12.262047 8.383224,0 0,25.024561 12.762525,0 0,-25.024561 7.695059,0 15.702918,25.024561 15.139855,0 -21.083194,-31.781201 20.144769,-28.277758 -15.452668,0 -15.577788,22.772351 -6.568951,0 0,-23.961011 -12.762525,0 z m 156.591197,0 c -2.19697,0.392104 -4.24408,1.030291 -6.13103,2.001968 -3.18232,1.704844 -5.69466,3.953222 -7.56992,6.756633 l 0,-7.569941 -12.82509,0 0,60.058959 12.82509,0 0,-33.658041 c -2e-5,-4.811275 1.35771,-8.502905 4.0665,-11.13593 2.72765,-2.632924 6.18568,-3.941333 10.44774,-3.941371 4.50823,3.8e-5 8.0288,1.20973 10.51032,3.691123 2.48138,2.481482 3.69105,6.370493 3.69113,11.636428 l 0,33.407791 12.82509,0 0,-36.223052 c -7e-5,-7.36852 -2.24843,-13.456553 -6.75664,-18.267934 -3.38123,-3.60845 -7.29356,-5.854486 -11.76155,-6.756633 l -9.32164,0 z m -97.22042,1.18866 0,34.784148 c -2e-5,8.145201 2.74589,14.730761 8.2581,19.769411 5.1144,4.73557 11.44922,7.13197 18.89354,7.13199 7.52004,-2e-5 13.82273,-2.39642 18.95611,-7.13199 5.51215,-5.03865 8.25804,-11.62421 8.25811,-19.769411 l 0,-34.784148 -12.82509,0 0,33.658038 c -7e-5,4.432511 -1.35779,8.038631 -4.06649,10.823121 -2.80351,2.87925 -6.21219,4.31674 -10.32264,4.31674 -3.95896,2e-5 -7.39407,-1.45642 -10.19751,-4.31674 -2.78453,-2.87919 -4.12909,-6.46636 -4.12905,-10.823121 l 0,-33.658038 -12.82508,0 z M 271.4578,73.16773 c 4.18619,6.4e-5 7.84165,1.173592 10.94824,3.503441 3.01177,2.386754 5.22976,5.863768 6.63151,10.447757 l -34.47133,0 c 1.00391,-4.413515 3.087,-7.841158 6.19357,-10.32264 3.0118,-2.40562 6.56857,-3.628494 10.69801,-3.628558 z" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + inkscape:connector-curvature="0" /> + <g + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + transform="matrix(0.43982058,0,0,0.4392609,-61.046168,-320.82474)" + id="g6020"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path6022" + d="m 60.321717,411.99998 377.014613,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path6024" + d="m 252.61203,788.60332 0,-377.01178" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path6026" + d="m 252.86937,597.15755 377.0124,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path6028" + d="m 437.45588,596.97447 0,-377.01491" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path6030" + d="m 372.87905,411.27704 64.93441,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + </g> + </g> + <text + sodipodi:linespacing="125%" + id="text2991-0" + y="27.185909" + x="367.7084" + style="font-size:46.11235046px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#69312f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + style="font-size:46.11235046px;font-weight:bold;text-align:end;text-anchor:end;fill:#69312f;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold" + y="27.185909" + x="367.7084" + id="tspan2993-2" + sodipodi:role="line">How can</tspan><tspan + style="font-size:46.11235046px;font-weight:bold;text-align:end;text-anchor:end;fill:#69312f;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold" + y="84.826347" + x="367.7084" + sodipodi:role="line" + id="tspan10105">be useful for</tspan></text> + <g + id="g10062" + transform="matrix(1.708345,0,0,1.708345,116.80048,-314.21383)"> + <path + sodipodi:type="arc" + style="color:#000000;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3145" + sodipodi:cx="90" + sodipodi:cy="32.362183" + sodipodi:rx="20" + sodipodi:ry="10" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + transform="matrix(0.475,0,0,0.95,-179.12059,360.07987)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/homeSpaceDisabled.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/homeSpaceDisabled.png" + sodipodi:nodetypes="cccccc" + inkscape:connector-curvature="0" + id="path3149" + d="m -140.69827,395.21049 0,-6.17998 3.95722,-3.78777 4.66874,4.1255 0,5.84225 z" + inkscape:transform-center-y="-0.48742846" + inkscape:transform-center-x="0.043758053" + style="color:#000000;fill:#e9c6af;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/homeSpaceDisabled.png" + inkscape:connector-curvature="0" + style="color:#000000;fill:#e9c6af;fill-opacity:1;fill-rule:nonzero;stroke:#e9c6af;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m -136.35815,385.24274 5.97512,5.6056" + id="path3729" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/homeSpaceDisabled.png" + id="path3731" + d="m -136.38303,385.24274 -5.97512,5.6056" + style="color:#000000;fill:#e9c6af;fill-opacity:1;fill-rule:nonzero;stroke:#e9c6af;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + </g> + <g + id="g10068" + transform="matrix(1.708345,0,0,1.708345,823.08995,-562.83086)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/homeSpaceEnabled.png" + transform="matrix(0.475,0,0,0.95,-179.12059,382.07987)" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + sodipodi:ry="10" + sodipodi:rx="20" + sodipodi:cy="32.362183" + sodipodi:cx="90" + id="path3757" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/homeSpaceEnabled.png" + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:transform-center-x="0.043758053" + inkscape:transform-center-y="-0.48742846" + d="m -140.69827,417.21049 0,-6.17998 3.95722,-3.78777 4.66874,4.1255 0,5.84225 z" + id="path3759" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/homeSpaceEnabled.png" + id="path3761" + d="m -136.35815,407.24274 5.97512,5.6056" + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/homeSpaceEnabled.png" + inkscape:connector-curvature="0" + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m -136.38303,407.24274 -5.97512,5.6056" + id="path3763" /> + </g> + <text + sodipodi:linespacing="173.00001%" + id="text10115" + y="236.91339" + x="74.030479" + style="font-size:34px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:173.00001383%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + style="font-size:34px;font-weight:normal;line-height:173.00001383%;fill:#ffffff;-inkscape-font-specification:Ubuntu" + y="236.91339" + x="74.030479" + id="tspan10117" + sodipodi:role="line">You can see Kune as a web tool for:</tspan><tspan + style="font-size:34px;font-weight:normal;line-height:173.00001383%;fill:#ffffff;-inkscape-font-specification:Ubuntu" + y="295.7334" + x="74.030479" + sodipodi:role="line" + id="tspan10119"># create your blogs / webs easily</tspan><tspan + style="font-size:34px;font-weight:normal;line-height:173.00001383%;fill:#ffffff;-inkscape-font-specification:Ubuntu" + y="354.55341" + x="74.030479" + sodipodi:role="line" + id="tspan10121"># communicate with your friends an colleagues</tspan><tspan + style="font-size:34px;font-weight:normal;line-height:173.00001383%;fill:#ffffff;-inkscape-font-specification:Ubuntu" + y="413.37341" + x="74.030479" + sodipodi:role="line" + id="tspan10125"># create and edit documents with your friends</tspan><tspan + style="font-size:34px;font-weight:normal;line-height:173.00001383%;fill:#ffffff;-inkscape-font-specification:Ubuntu" + y="472.19342" + x="74.030479" + sodipodi:role="line" + id="tspan10129">in real time</tspan></text> + </g> +</svg> Added: trunk/src/main/java/cc/kune/common/client/ui/EditEvent.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/EditEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/EditEvent.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -0,0 +1,38 @@ +package cc.kune.common.client.ui; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; + +public class EditEvent extends GwtEvent<EditEvent.EditHandler> { + + public interface EditHandler extends EventHandler { + + void fire(EditEvent event); + } + + public static final GwtEvent.Type<EditHandler> TYPE = new GwtEvent.Type<EditHandler>(); + + public static Type<EditHandler> getType() { + return TYPE; + } + + private final String text; + + public EditEvent(final String text) { + this.text = text; + } + + @Override + public com.google.gwt.event.shared.GwtEvent.Type<EditHandler> getAssociatedType() { + return TYPE; + } + + public String getText() { + return text; + } + + @Override + protected void dispatch(final EditHandler handler) { + handler.fire(this); + } +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/common/client/ui/EditEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/ui/EditableLabel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/EditableLabel.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/EditableLabel.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -0,0 +1,100 @@ +package cc.kune.common.client.ui; + +import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.common.client.ui.EditEvent.EditHandler; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.BlurEvent; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.KeyDownEvent; +import com.google.gwt.event.dom.client.MouseOutEvent; +import com.google.gwt.event.dom.client.MouseOverEvent; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.TextBox; +import com.google.gwt.user.client.ui.Widget; + +public class EditableLabel extends Composite implements HasEditHandler { + + interface EditableLabelUiBinder extends UiBinder<Widget, EditableLabel> { + } + + private static EditableLabelUiBinder uiBinder = GWT.create(EditableLabelUiBinder.class); + + private boolean editable; + @UiField + InlineLabel label; + @UiField + TextBox textbox; + private String tooltip; + + public EditableLabel() { + initWidget(uiBinder.createAndBindUi(this)); + label.setStylePrimaryName("k-editableLabel"); + editable = false; + tooltip = ""; + } + + @Override + public HandlerRegistration addEditHandler(final EditHandler handler) { + return addHandler(handler, EditEvent.getType()); + } + + private void finishEdit() { + label.setText(textbox.getText()); + label.setVisible(true); + textbox.setVisible(false); + fireEvent(new EditEvent(textbox.getValue())); + } + + @UiHandler("textbox") + void handleKeys(final KeyDownEvent event) { + if (event.getNativeKeyCode() == 13) { + finishEdit(); + } + } + + @UiHandler("textbox") + void onBlur(final BlurEvent event) { + finishEdit(); + } + + @UiHandler("label") + void onClick(final ClickEvent e) { + if (editable) { + label.setVisible(false); + textbox.setVisible(true); + textbox.setFocus(true); + textbox.selectAll(); + } + } + + @UiHandler("label") + void onMouseOut(final MouseOutEvent event) { + label.removeStyleDependentName("high"); + } + + @UiHandler("label") + void onMouseOver(final MouseOverEvent event) { + label.addStyleDependentName("high"); + } + + public void setEditable(final boolean editable) { + this.editable = editable; + Tooltip.to(label, editable ? tooltip : ""); + } + + public void setText(final String text) { + label.setText(text); + textbox.setText(text); + } + + public void setTooltip(final String tooltip) { + this.tooltip = tooltip; + } + +} Property changes on: trunk/src/main/java/cc/kune/common/client/ui/EditableLabel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/ui/EditableLabel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/EditableLabel.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/EditableLabel.ui.xml 2011-04-29 12:02:17 UTC (rev 1329) @@ -0,0 +1,11 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <ui:style> + .textbox { font-weight: bold; } + </ui:style> + <g:HTMLPanel> + <g:InlineLabel ui:field="label" /> + <g:TextBox styleName="{style.textbox} .gwtTextBox" width="100%" ui:field="textbox" visible="false" /> + </g:HTMLPanel> +</ui:UiBinder> \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/common/client/ui/EditableLabel.ui.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/ui/HasEditHandler.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/HasEditHandler.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/HasEditHandler.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -0,0 +1,11 @@ +package cc.kune.common.client.ui; + +import cc.kune.common.client.ui.EditEvent.EditHandler; + +import com.google.gwt.event.shared.HandlerRegistration; + +public interface HasEditHandler { + + HandlerRegistration addEditHandler(EditHandler handler); + +} Property changes on: trunk/src/main/java/cc/kune/common/client/ui/HasEditHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-04-29 12:02:17 UTC (rev 1329) @@ -3,19 +3,23 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui"> <ui:style> .label { - text-decoration: none; + text-decoration: none; } .label a:link { - text-decoration: none; - color: gray; + text-decoration: none; + color: gray; } - .pad { - /* white-space: nowrap; */ + .pad { /* white-space: nowrap; */ + outline: 0 none; } + + .self { + outline: 0 none; + } </ui:style> - <g:FocusPanel ui:field="self"> + <g:FocusPanel styleName="{style.self}" ui:field="self" > <g:FlowPanel styleName="{style.pad}" ui:field="flow"> <g:Image ui:field="iconLeft" /> <g:Image ui:field="iconRight" /> Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-04-29 12:02:17 UTC (rev 1329) @@ -617,4 +617,20 @@ color: #999999; } -/* End tabbar */ \ No newline at end of file +/* End tabbar */ + +.k-editableLabel { + font-weight: bold; + padding: 3px +} + +.k-editableLabel-high { + font-weight: bold; + background-color: #FFFBC1; + color: black !important; +} + +.k-editableLabel-high span { + background-color: #FFFBC1; + color: black !important; +} Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-29 12:02:17 UTC (rev 1329) @@ -17,6 +17,10 @@ font: 'Ubuntu', Arial; } +div, span { + outline: 0 none; +} + /* a { color: darkblue; @@ -375,6 +379,7 @@ .k-space-sel-btn { padding: 0 1px 0 1px; margin: 0 0 -2px; + outline: 0 none; } .k-sitebar-logo { @@ -862,6 +867,7 @@ border-radius: 5px; vertical-align: middle; line-height: 2em !important; + outline: 0 none; /* height: 26px !important; */ font-weight: bold; /* @@ -873,11 +879,13 @@ .k-sn-mainpanel .x-btn button:hover,.k-sn-mainpanel button:hover,button.k-button:hover { border: 2px orange solid; + outline: 0 none; /* background: #f0f0f0; */ } .k-sn-mainpanel .x-btn button:hover span,.k-sn-mainpanel button:hover span,button.k-button:hover span { color: brown !important; + outline: 0 none; } .k-sn-mainpanel .x-btn button:active,.k-sn-mainpanel button:active,button.k-button:active { @@ -1093,6 +1101,7 @@ .k-tool-item { display: block; cursor: pointer; + outline: 0 none; } .k-tool-item-focus { Modified: trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -28,10 +28,10 @@ import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; +import org.waveprotocol.wave.model.waveref.InvalidWaveRefException; import org.waveprotocol.wave.model.waveref.WaveRef; import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; -import cc.kune.blogs.shared.BlogsConstants; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.I18nNotFoundException; import cc.kune.core.client.errors.NameInUseException; @@ -45,7 +45,6 @@ import cc.kune.core.server.utils.FilenameUtils; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.RateResult; -import cc.kune.docs.shared.DocsConstants; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.I18nLanguage; @@ -66,235 +65,255 @@ @Singleton public class ContentManagerDefault extends DefaultManager<Content, Long> implements ContentManager { - private final ContainerFinder containerFinder; - private final ContentFinder contentFinder; - private final FinderService finder; - private final KuneWaveManager kuneWaveManager; - private final I18nLanguageFinder languageFinder; - private final ParticipantUtils participantUtils; - private final TagUserContentManager tagManager; - private final UserFinder userFinder; + private final ContainerFinder containerFinder; + private final ContentFinder contentFinder; + private final FinderService finder; + private final KuneWaveManager kuneWaveManager; + private final I18nLanguageFinder languageFinder; + private final ParticipantUtils participantUtils; + private final TagUserContentManager tagManager; + private final UserFinder userFinder; - @Inject - public ContentManagerDefault(final ContentFinder contentFinder, final ContainerFinder containerFinder, - final Provider<EntityManager> provider, final FinderService finder, final UserFinder userFinder, - final I18nLanguageFinder languageFinder, final TagUserContentManager tagManager, - final KuneWaveManager kuneWaveManager, final ParticipantUtils participantUtils) { - super(provider, Content.class); - this.contentFinder = contentFinder; - this.containerFinder = containerFinder; - this.finder = finder; - this.userFinder = userFinder; - this.languageFinder = languageFinder; - this.tagManager = tagManager; - this.kuneWaveManager = kuneWaveManager; - this.participantUtils = participantUtils; - } + @Inject + public ContentManagerDefault(final ContentFinder contentFinder, final ContainerFinder containerFinder, + final Provider<EntityManager> provider, final FinderService finder, final UserFinder userFinder, + final I18nLanguageFinder languageFinder, final TagUserContentManager tagManager, + final KuneWaveManager kuneWaveManager, final ParticipantUtils participantUtils) { + super(provider, Content.class); + this.contentFinder = contentFinder; + this.containerFinder = containerFinder; + this.finder = finder; + this.userFinder = userFinder; + this.languageFinder = languageFinder; + this.tagManager = tagManager; + this.kuneWaveManager = kuneWaveManager; + this.participantUtils = participantUtils; + } - @Override - public void addAuthor(final User user, final Long contentId, final String authorShortName) throws DefaultException { - final Content content = finder.getContent(contentId); - final User author = userFinder.getByShortName(authorShortName); - if (author == null) { - throw new UserNotFoundException(); - } - content.addAuthor(author); + @Override + public void addAuthor(final User user, final Long contentId, final String authorShortName) + throws DefaultException { + final Content content = finder.getContent(contentId); + final User author = userFinder.getByShortName(authorShortName); + if (author == null) { + throw new UserNotFoundException(); } + content.addAuthor(author); + } - @Override - public Content createContent(final String title, final String body, final User author, final Container container, - final String typeId) { - String contentBody; - FilenameUtils.checkBasicFilename(title); - final String newtitle = findInexistentTitle(container, title); - final Content newContent = new Content(); - newContent.addAuthor(author); - newContent.setLanguage(author.getLanguage()); - newContent.setTypeId(typeId); - container.addContent(newContent); - newContent.setContainer(container); - final Revision revision = new Revision(newContent); - revision.setTitle(newtitle); - // Duplicate in StateServiceDefault - if ((typeId.equals(DocsConstants.TYPE_DOCUMENT)) || (typeId.equals(BlogsConstants.TYPE_POST))) { - final WaveRef waveRef = kuneWaveManager.createWave(title, body, participantUtils.of(author.getShortName())); - contentBody = JavaWaverefEncoder.encodeToUriPathSegment(waveRef); - } else { - contentBody = body; - } - revision.setBody(contentBody); - newContent.addRevision(revision); - return persist(newContent); + @Override + public Content createContent(final String title, final String body, final User author, + final Container container, final String typeId) { + String contentBody; + FilenameUtils.checkBasicFilename(title); + final String newtitle = findInexistentTitle(container, title); + final Content newContent = new Content(); + newContent.addAuthor(author); + newContent.setLanguage(author.getLanguage()); + newContent.setTypeId(typeId); + container.addContent(newContent); + newContent.setContainer(container); + final Revision revision = new Revision(newContent); + revision.setTitle(newtitle); + // Duplicate in StateServiceDefault + if (newContent.isWave()) { + final WaveRef waveRef = kuneWaveManager.createWave(title, body, + participantUtils.of(author.getShortName())); + contentBody = JavaWaverefEncoder.encodeToUriPathSegment(waveRef); + } else { + contentBody = body; } + revision.setBody(contentBody); + newContent.addRevision(revision); + return persist(newContent); + } - private MultiFieldQueryParser createMultiFieldParser() { - final MultiFieldQueryParser parser = new MultiFieldQueryParser(DEF_GLOBAL_SEARCH_FIELDS, new StandardAnalyzer()); - return parser; - } + private MultiFieldQueryParser createMultiFieldParser() { + final MultiFieldQueryParser parser = new MultiFieldQueryParser(DEF_GLOBAL_SEARCH_FIELDS, + new StandardAnalyzer()); + return parser; + } - @Override - public boolean findIfExistsTitle(final Container container, final String title) { - return (contentFinder.findIfExistsTitle(container, title) > 0) - || (containerFinder.findIfExistsTitle(container, title) > 0); - } + @Override + public boolean findIfExistsTitle(final Container container, final String title) { + return (contentFinder.findIfExistsTitle(container, title) > 0) + || (containerFinder.findIfExistsTitle(container, title) > 0); + } - private String findInexistentTitle(final Container container, final String title) { - String initialTitle = String.valueOf(title); - while (findIfExistsTitle(container, initialTitle)) { - initialTitle = FileUtils.getNextSequentialFileName(initialTitle); - } - return initialTitle; + private String findInexistentTitle(final Container container, final String title) { + String initialTitle = String.valueOf(title); + while (findIfExistsTitle(container, initialTitle)) { + initialTitle = FileUtils.getNextSequentialFileName(initialTitle); } + return initialTitle; + } - @Override - public Double getRateAvg(final Content content) { - return finder.getRateAvg(content); - } + @Override + public Double getRateAvg(final Content content) { + return finder.getRateAvg(content); + } - @Override - public Long getRateByUsers(final Content content) { - return finder.getRateByUsers(content); - } + @Override + public Long getRateByUsers(final Content content) { + return finder.getRateByUsers(content); + } - @Override - public Double getRateContent(final User rater, final Content content) { - final Rate rate = finder.getRate(rater, content); - if (rate != null) { - return rate.getValue(); - } else { - return null; - } + @Override + public Double getRateContent(final User rater, final Content content) { + final Rate rate = finder.getRate(rater, content); + if (rate != null) { + return rate.getValue(); + } else { + return null; } + } - @Override - public RateResult rateContent(final User rater, final Long contentId, final Double value) throws DefaultException { - final Content content = finder.getContent(contentId); - final Rate oldRate = finder.getRate(rater, content); - if (oldRate == null) { - final Rate rate = new Rate(rater, content, value); - super.persist(rate, Rate.class); - } else { - oldRate.setValue(value); - super.persist(oldRate, Rate.class); - } - final Double rateAvg = getRateAvg(content); - final Long rateByUsers = getRateByUsers(content); - return new RateResult(rateAvg != null ? rateAvg : 0D, rateByUsers != null ? rateByUsers.intValue() : 0, value); + @Override + public RateResult rateContent(final User rater, final Long contentId, final Double value) + throws DefaultException { + final Content content = finder.getContent(contentId); + final Rate oldRate = finder.getRate(rater, content); + if (oldRate == null) { + final Rate rate = new Rate(rater, content, value); + super.persist(rate, Rate.class); + } else { + oldRate.setValue(value); + super.persist(oldRate, Rate.class); } + final Double rateAvg = getRateAvg(content); + final Long rateByUsers = getRateByUsers(content); + return new RateResult(rateAvg != null ? rateAvg : 0D, rateByUsers != null ? rateByUsers.intValue() + : 0, value); + } - @Override - public void removeAuthor(final User user, final Long contentId, final String authorShortName) - throws DefaultException { - final Content content = finder.getContent(contentId); - final User author = userFinder.getByShortName(authorShortName); - if (author == null) { - throw new UserNotFoundException(); - } - content.removeAuthor(author); + @Override + public void removeAuthor(final User user, final Long contentId, final String authorShortName) + throws DefaultException { + final Content content = finder.getContent(contentId); + final User author = userFinder.getByShortName(authorShortName); + if (author == null) { + throw new UserNotFoundException(); } + content.removeAuthor(author); + } - @Override - public Content renameContent(final User user, final Long contentId, final String newTitle) throws DefaultException { - final String newTitleWithoutNL = FilenameUtils.chomp(newTitle); - FilenameUtils.checkBasicFilename(newTitleWithoutNL); - final Content content = finder.getContent(contentId); - if (findIfExistsTitle(content.getContainer(), newTitleWithoutNL)) { - throw new NameInUseException(); - } - content.getLastRevision().setTitle(newTitleWithoutNL); - return content; + @Override + public Content renameContent(final User user, final Long contentId, final String newTitle) + throws DefaultException { + final String newTitleWithoutNL = FilenameUtils.chomp(newTitle); + FilenameUtils.checkBasicFilename(newTitleWithoutNL); + final Content content = finder.getContent(contentId); + if (findIfExistsTitle(content.getContainer(), newTitleWithoutNL)) { + throw new NameInUseException(); } - - @Override - public Content save(final User editor, final Content content) { - return persist(content); + content.getLastRevision().setTitle(newTitleWithoutNL); + if (content.isWave()) { + final String author = content.getAuthors().get(0).getShortName(); + try { + kuneWaveManager.setTitle( + JavaWaverefEncoder.decodeWaveRefFromPath(String.valueOf(content.getLastRevision().getBody())), + newTitle, author); + } catch (final InvalidWaveRefException e) { + throw new DefaultException("Error setting the wave title"); + } } + return content; + } - @Override - public Content save(final User editor, final Content content, final String body) { - final Revision revision = new Revision(content); - revision.setEditor(editor); - revision.setTitle(content.getTitle()); - revision.setBody(body); - content.addRevision(revision); - return persist(content); - } + @Override + public Content save(final User editor, final Content content) { + return persist(content); + } - @Override - public SearchResult<Content> search(final String search) { - return this.search(search, null, null); - } + @Override + public Content save(final User editor, final Content content, final String body) { + final Revision revision = new Revision(content); + revision.setEditor(editor); + revision.setTitle(content.getTitle()); + revision.setBody(body); + content.addRevision(revision); + return persist(content); + } - @Override - public SearchResult<Content> search(final String search, final Integer firstResult, final Integer maxResults) { - final MultiFieldQueryParser parser = createMultiFieldParser(); - Query query; - try { - query = parser.parse(search); - } catch (final ParseException e) { - throw new ServerManagerException("Error parsing search"); - } - return super.search(query, firstResult, maxResults); - } + @Override + public SearchResult<Content> search(final String search) { + return this.search(search, null, null); + } - @Override - public SearchResult<Content> searchMime(final String search, final Integer firstResult, final Integer maxResults, - final String groupShortName, final String mimetype) { - final List<Content> list = contentFinder.findMime(groupShortName, "%" + search + "%", mimetype, firstResult, - maxResults); - final Long count = contentFinder.findMimeCount(groupShortName, "%" + search + "%", mimetype); - return new SearchResult<Content>(count.intValue(), list); + @Override + public SearchResult<Content> search(final String search, final Integer firstResult, + final Integer maxResults) { + final MultiFieldQueryParser parser = createMultiFieldParser(); + Query query; + try { + query = parser.parse(search); + } catch (final ParseException e) { + throw new ServerManagerException("Error parsing search"); } + return super.search(query, firstResult, maxResults); + } - @Override - public SearchResult<?> searchMime(final String search, final Integer firstResult, final Integer maxResults, - final String groupShortName, final String mimetype, final String mimetype2) { - final List<Content> list = contentFinder.find2Mime(groupShortName, "%" + search + "%", mimetype, mimetype2, - firstResult, maxResults); - final Long count = contentFinder.find2MimeCount(groupShortName, "%" + search + "%", mimetype, mimetype2); - return new SearchResult<Content>(count.intValue(), list); - } + @Override + public SearchResult<Content> searchMime(final String search, final Integer firstResult, + final Integer maxResults, final String groupShortName, final String mimetype) { + final List<Content> list = contentFinder.findMime(groupShortName, "%" + search + "%", mimetype, + firstResult, maxResults); + final Long count = contentFinder.findMimeCount(groupShortName, "%" + search + "%", mimetype); + return new SearchResult<Content>(count.intValue(), list); + } - @Override - public I18nLanguage setLanguage(final User user, final Long contentId, final String languageCode) - throws DefaultException { - final Content content = finder.getContent(contentId); - final I18nLanguage language = languageFinder.findByCode(languageCode); - if (language == null) { - throw new I18nNotFoundException(); - } - content.setLanguage(language); - return language; - } + @Override + public SearchResult<?> searchMime(final String search, final Integer firstResult, + final Integer maxResults, final String groupShortName, final String mimetype, + final String mimetype2) { + final List<Content> list = contentFinder.find2Mime(groupShortName, "%" + search + "%", mimetype, + mimetype2, firstResult, maxResults); + final Long count = contentFinder.find2MimeCount(groupShortName, "%" + search + "%", mimetype, + mimetype2); + return new SearchResult<Content>(count.intValue(), list); + } - @Override - public void setPublishedOn(final User user, final Long contentId, final Date publishedOn) throws DefaultException { - final Content content = finder.getContent(contentId); - content.setPublishedOn(publishedOn); + @Override + public I18nLanguage setLanguage(final User user, final Long contentId, final String languageCode) + throws DefaultException { + final Content content = finder.getContent(contentId); + final I18nLanguage language = languageFinder.findByCode(languageCode); + if (language == null) { + throw new I18nNotFoundException(); } + content.setLanguage(language); + return language; + } - @Override - public Content setStatus(final Long contentId, final ContentStatus status) { - final Content content = finder.getContent(contentId); - content.setStatus(status); - switch (status) { - case publishedOnline: - content.setPublishedOn(new Date()); - content.setDeletedOn(null); - break; - case inTheDustbin: - content.setDeletedOn(new Date()); - content.setPublishedOn(null); - break; - default: - break; - } - return content; + @Override + public void setPublishedOn(final User user, final Long contentId, final Date publishedOn) + throws DefaultException { + final Content content = finder.getContent(contentId); + content.setPublishedOn(publishedOn); + } + + @Override + public Content setStatus(final Long contentId, final ContentStatus status) { + final Content content = finder.getContent(contentId); + content.setStatus(status); + switch (status) { + case publishedOnline: + content.setPublishedOn(new Date()); + content.setDeletedOn(null); + break; + case inTheDustbin: + content.setDeletedOn(new Date()); + content.setPublishedOn(null); + break; + default: + break; } + return content; + } - @Override - public void setTags(final User user, final Long contentId, final String tags) throws DefaultException { - final Content content = finder.getContent(contentId); - tagManager.setTags(user, content, tags); - } + @Override + public void setTags(final User user, final Long contentId, final String tags) throws DefaultException { + final Content content = finder.getContent(contentId); + tagManager.setTags(user, content, tags); + } } Modified: trunk/src/main/java/cc/kune/core/server/state/StateContent.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/state/StateContent.java 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/core/server/state/StateContent.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -29,130 +29,136 @@ public class StateContent extends StateContainer { - private List<User> authors; - private String content; - private AccessRights contentRights; - private Double currentUserRate; - private String documentId; - private BasicMimeType mimeType; - private Date publishedOn; - private Double rate; - private Integer rateByUsers; - private ContentStatus status; - private String tags; - private int version; - private String waveRef; + private List<User> authors; + private String content; + private AccessRights contentRights; + private Double currentUserRate; + private String documentId; + private boolean isWave; + private BasicMimeType mimeType; + private Date publishedOn; + private Double rate; + private Integer rateByUsers; + private ContentStatus status; + private String tags; + private int version; + private String waveRef; - public StateContent() { - } + public StateContent() { + } - public List<User> getAuthors() { - return authors; - } + public List<User> getAuthors() { + return authors; + } - public String getContent() { - return content; - } + public String getContent() { + return content; + } - public AccessRights getContentRights() { - return contentRights; - } + public AccessRights getContentRights() { + return contentRights; + } - public Double getCurrentUserRate() { - return currentUserRate; - } + public Double getCurrentUserRate() { + return currentUserRate; + } - public String getDocumentId() { - return documentId; - } + public String getDocumentId() { + return documentId; + } - public BasicMimeType getMimeType() { - return mimeType; - } + public BasicMimeType getMimeType() { + return mimeType; + } - public Date getPublishedOn() { - return publishedOn; - } + public Date getPublishedOn() { + return publishedOn; + } - public Double getRate() { - return rate; - } + public Double getRate() { + return rate; + } - public Integer getRateByUsers() { - return rateByUsers; - } + public Integer getRateByUsers() { + return rateByUsers; + } - public ContentStatus getStatus() { - return status; - } + public ContentStatus getStatus() { + return status; + } - public String getTags() { - return tags; - } + public String getTags() { + return tags; + } - public int getVersion() { - return version; - } + public int getVersion() { + return version; + } - public String getWaveRef() { - return waveRef; - } + public String getWaveRef() { + return waveRef; + } - public void setAuthors(final List<User> authors) { - this.authors = authors; - } + public boolean isWave() { + return waveRef != null; + } - public void setContent(final String content) { - this.content = content; - } + public void setAuthors(final List<User> authors) { + this.authors = authors; + } - public void setContentRights(final AccessRights contentRights) { - this.contentRights = contentRights; - } + public void setContent(final String content) { + this.content = content; + } - public void setCurrentUserRate(final Double currentUserRate) { - this.currentUserRate = currentUserRate; - } + public void setContentRights(final AccessRights contentRights) { + this.contentRights = contentRights; + } - public void setDocumentId(final String documentId) { - this.documentId = documentId; - } + public void setCurrentUserRate(final Double currentUserRate) { + this.currentUserRate = currentUserRate; + } - public void setMimeType(final BasicMimeType mimeType) { - this.mimeType = mimeType; - } + public void setDocumentId(final String documentId) { + this.documentId = documentId; + } - public void setPublishedOn(final Date publishedOn) { - this.publishedOn = publishedOn; - } + public void setMimeType(final BasicMimeType mimeType) { + this.mimeType = mimeType; + } - public void setRate(final Double rate) { - this.rate = rate; - } + public void setPublishedOn(final Date publishedOn) { + this.publishedOn = publishedOn; + } - public void setRateByUsers(final Integer rateByUsers) { - this.rateByUsers = rateByUsers; - } + public void setRate(final Double rate) { + this.rate = rate; + } - public void setStatus(final ContentStatus status) { - this.status = status; - } + public void setRateByUsers(final Integer rateByUsers) { + this.rateByUsers = rateByUsers; + } - public void setTags(final String tags) { - this.tags = tags; - } + public void setStatus(final ContentStatus status) { + this.status = status; + } - public void setVersion(final int version) { - this.version = version; - } + public void setTags(final String tags) { + this.tags = tags; + } - public void setWaveRef(final String waveRef) { - this.waveRef = waveRef; - } + public void setVersion(final int version) { + this.version = version; + } - @Override - public String toString() { - return "State[" + getStateToken() + "/" + getTypeId() + (mimeType != null ? "-" + mimeType : "") + "]"; - } + public void setWaveRef(final String waveRef) { + this.waveRef = waveRef; + } + @Override + public String toString() { + return "State[" + getStateToken() + "/" + getTypeId() + (mimeType != null ? "-" + mimeType : "") + + "]"; + } + } Modified: trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -19,9 +19,6 @@ */ package cc.kune.core.server.state; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; - import org.waveprotocol.wave.model.waveref.InvalidWaveRefException; import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; @@ -105,7 +102,7 @@ state.setVersion(content.getVersion()); final char[] text = revision.getBody(); final String textBody = text == null ? null : new String(text); - if (typeId.equals(TYPE_DOCUMENT) || (typeId.equals(TYPE_POST))) { + if (content.isWave()) { state.setWaveRef(textBody); try { final Wavelet wavelet = kuneWaveManager.fetchWavelet( Modified: trunk/src/main/java/cc/kune/domain/Content.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Content.java 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/domain/Content.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -54,8 +54,10 @@ import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.validator.NotNull; +import cc.kune.blogs.shared.BlogsConstants; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.docs.shared.DocsConstants; import cc.kune.domain.utils.HasStateToken; @Entity @@ -64,278 +66,283 @@ @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) public class Content implements HasStateToken { - public static final String GROUP = "group"; - public static final String MIMETYPE = "mimetype"; - public static final Content NO_CONTENT = new Content(); - public static final String TITLE = "title"; + public static final String GROUP = "group"; + public static final String MIMETYPE = "mimetype"; + public static final Content NO_CONTENT = new Content(); + public static final String TITLE = "title"; - @OneToOne(cascade = CascadeType.ALL) - private AccessLists accessLists; + @OneToOne(cascade = CascadeType.ALL) + private AccessLists accessLists; - @IndexedEmbedded - @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) - private List<User> authors; + @IndexedEmbedded + @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) + private List<User> authors; - @Fetch(FetchMode.JOIN) - @ContainedIn - @OneToMany(mappedBy = "content", cascade = CascadeType.ALL, fetch = FetchType.EAGER) - private Set<Comment> comments; + @Fetch(FetchMode.JOIN) + @ContainedIn + @OneToMany(mappedBy = "content", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + private Set<Comment> comments; - @ManyToOne - @JoinColumn - @IndexedEmbedded - private Container container; + @ManyToOne + @JoinColumn + @IndexedEmbedded + private Container container; - @Basic(optional = false) - private Long createdOn; + @Basic(optional = false) + private Long createdOn; - @Basic(optional = true) - private Date deletedOn; + @Basic(optional = true) + private Date deletedOn; - /** - * filename if is an uploaded content - */ - private String filename; + /** + * filename if is an uploaded content + */ + private String filename; - @Id - @DocumentId - @GeneratedValue - // @PMD:REVIEWED:ShortVariable: by vjrj on 21/05/09 15:28 - private Long id; + @Id + @DocumentId + @GeneratedValue + // @PMD:REVIEWED:ShortVariable: by vjrj on 21/05/09 15:28 + private Long id; - @IndexedEmbedded - @NotNull - @ManyToOne(fetch = FetchType.LAZY) - private I18nLanguage language; + @IndexedEmbedded + @NotNull + @ManyToOne(fetch = FetchType.LAZY) + private I18nLanguage language; - @IndexedEmbedded - @OneToOne(cascade = { CascadeType.ALL }) - private Revision lastRevision; + @IndexedEmbedded + @OneToOne(cascade = { CascadeType.ALL }) + private Revision lastRevision; - @OneToOne - private License license; + @OneToOne + private License license; - @IndexedEmbedded - @Embedded - private BasicMimeType mimeType; + @IndexedEmbedded + @Embedded + private BasicMimeType mimeType; - @Basic(optional = true) - private Date publishedOn; + @Basic(optional = true) + private Date publishedOn; - @Enumerated(EnumType.STRING) - @Column(nullable = false) - private ContentStatus status; + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private ContentStatus status; - @OneToMany(cascade = CascadeType.ALL) - private List<ContentTranslation> translations; + @OneToMany(cascade = CascadeType.ALL) + private List<ContentTranslation> translations; - // @NotNull?? - private String typeId; + // @NotNull?? + private String typeId; - @Version - private int version; + @Version + private int version; - public Content() { - translations = new ArrayList<ContentTranslation>(); - authors = new ArrayList<User>(); - comments = new HashSet<Comment>(); - createdOn = System.currentTimeMillis(); - lastRevision = new Revision(this); - accessLists = null; - status = ContentStatus.editingInProgress; - } + public Content() { + translations = new ArrayList<ContentTranslation>(); + authors = new ArrayList<User>(); + comments = new HashSet<Comment>(); + createdOn = System.currentTimeMillis(); + lastRevision = new Revision(this); + accessLists = null; + status = ContentStatus.editingInProgress; + } - public void addAuthor(final User user) { - if (!this.authors.contains(user)) { - this.authors.add(user); - } + public void addAuthor(final User user) { + if (!this.authors.contains(user)) { + this.authors.add(user); } + } - public void addComment(final Comment comment) { - // FIXME: something related with lazy initialization (workaround using - // size()) - comments.size(); - comments.add(comment); - } + public void addComment(final Comment comment) { + // FIXME: something related with lazy initialization (workaround using + // size()) + comments.size(); + comments.add(comment); + } - public void addRevision(final Revision revision) { - if (lastRevision == null) { - lastRevision = revision; - } else { - revision.setPrevious(lastRevision); - lastRevision = revision; - } + public void addRevision(final Revision revision) { + if (lastRevision == null) { + lastRevision = revision; + } else { + revision.setPrevious(lastRevision); + lastRevision = revision; } + } - @Transient - public AccessLists getAccessLists() { - return hasAccessList() ? accessLists : getContainer().getAccessLists(); - } + @Transient + public AccessLists getAccessLists() { + return hasAccessList() ? accessLists : getContainer().getAccessLists(); + } - public List<User> getAuthors() { - return authors; - } + public List<User> getAuthors() { + return authors; + } - public Set<Comment> getComments() { - return comments; - } + public Set<Comment> getComments() { + return comments; + } - public Container getContainer() { - return container; - } + public Container getContainer() { + return container; + } - public Long getCreatedOn() { - return createdOn; - } + public Long getCreatedOn() { + return createdOn; + } - public Date getDeletedOn() { - return deletedOn; - } + public Date getDeletedOn() { + return deletedOn; + } - public String getFilename() { - return filename; - } + public String getFilename() { + return filename; + } - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public I18nLanguage getLanguage() { - return language; - } + public I18nLanguage getLanguage() { + return language; + } - public Revision getLastRevision() { - return lastRevision; - } + public Revision getLastRevision() { + return lastRevision; + } - public License getLicense() { - return license; - } + public License getLicense() { + return license; + } - public BasicMimeType getMimeType() { - return mimeType; - } + public BasicMimeType getMimeType() { + return mimeType; + } - public Group getOwner(final Group group) { - return container.getOwner(); - } + public Group getOwner(final Group group) { + return container.getOwner(); + } - public Date getPublishedOn() { - return publishedOn; - } + public Date getPublishedOn() { + return publishedOn; + } - @Override - @Transient - public StateToken getStateToken() { - return getContainer().getStateToken().copy().setDocument(getId()); - } + @Override + @Transient + public StateToken getStateToken() { + return getContainer().getStateToken().copy().setDocument(getId()); + } - @Transient - public String getStateTokenEncoded() { - return getStateToken().getEncoded(); - } + @Transient + public String getStateTokenEncoded() { + return getStateToken().getEncoded(); + } - public ContentStatus getStatus() { - return status; - } + public ContentStatus getStatus() { + return status; + } - public String getTitle() { - return lastRevision.getTitle(); - } + public String getTitle() { + return lastRevision.getTitle(); + } - public List<ContentTranslation> getTranslations() { - return translations; - } + public List<ContentTranslation> getTranslations() { + return translations; + } - public String getTypeId() { - return typeId; - } + public String getTypeId() { + return typeId; + } - public int getVersion() { - return version; - } + public int getVersion() { + return version; + } - @Transient - public boolean hasAccessList() { - return accessLists != null; - } + @Transient + public boolean hasAccessList() { + return accessLists != null; + } - public void removeAuthor(final User user) { - this.authors.remove(user); - } + @Transient + public boolean isWave() { + return (typeId.equals(DocsConstants.TYPE_DOCUMENT)) || (typeId.equals(BlogsConstants.TYPE_POST)); + } - public void setAccessLists(final AccessLists accessLists) { - this.accessLists = accessLists; - } + public void removeAuthor(final User user) { + this.authors.remove(user); + } - public void setAuthors(final List<User> authors) { - this.authors = authors; - } + public void setAccessLists(final AccessLists accessLists) { + this.accessLists = accessLists; + } - public void setComments(final Set<Comment> comments) { - this.comments = comments; - } + public void setAuthors(final List<User> authors) { + this.authors = authors; + } - public void setContainer(final Container container) { - this.container = container; - } + public void setComments(final Set<Comment> comments) { + this.comments = comments; + } - public void setCreatedOn(final Long createdOn) { - this.createdOn = createdOn; - } + public void setContainer(final Container container) { + this.container = container; + } - public void setDeletedOn(final Date date) { - this.deletedOn = date; - } + public void setCreatedOn(final Long createdOn) { + this.createdOn = createdOn; + } - public void setFilename(final String filename) { - this.filename = filename; - } + public void setDeletedOn(final Date date) { + this.deletedOn = date; + } - // @PMD:REVIEWED:ShortVariable: by vjrj on 21/05/09 15:28 - public void setId(final Long id) { - this.id = id; - } + public void setFilename(final String filename) { + this.filename = filename; + } - public void setLanguage(final I18nLanguage language) { - this.language = language; - } + // @PMD:REVIEWED:ShortVariable: by vjrj on 21/05/09 15:28 + public void setId(final Long id) { + this.id = id; + } - public void setLastRevision(final Revision revision) { - this.lastRevision = revision; - } + public void setLanguage(final I18nLanguage language) { + this.language = language; + } - public void setLicense(final License license) { - this.license = license; - } + public void setLastRevision(final Revision revision) { + this.lastRevision = revision; + } - public void setMimeType(final BasicMimeType mimeType) { - this.mimeType = mimeType; - } + public void setLicense(final License license) { + this.license = license; + } - public void setPublishedOn(final Date publishedOn) { - this.publishedOn = publishedOn; - } + public void setMimeType(final BasicMimeType mimeType) { + this.mimeType = mimeType; + } - public void setStatus(final ContentStatus status) { - this.status = status; - } + public void setPublishedOn(final Date publishedOn) { + this.publishedOn = publishedOn; + } - public void setTranslations(final List<ContentTranslation> translations) { - this.translations = translations; - } + public void setStatus(final ContentStatus status) { + this.status = status; + } - public void setTypeId(final String typeId) { - this.typeId = typeId; - } + public void setTranslations(final List<ContentTranslation> translations) { + this.translations = translations; + } - public void setVersion(final int version) { - this.version = version; - } + public void setTypeId(final String typeId) { + this.typeId = typeId; + } - @Override - public String toString() { - return "Content[(" + getStateTokenEncoded() + "): " + getTitle() + "]"; - } + public void setVersion(final int version) { + this.version = version; + } + @Override + public String toString() { + return "Content[(" + getStateTokenEncoded() + "): " + getTitle() + "]"; + } + } Added: trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -0,0 +1,82 @@ +/* + * + * 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.actions; + +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.core.client.errors.NameInUseException; +import cc.kune.core.client.errors.NameNotPermittedException; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class RenameAction { + private final Provider<ContentServiceAsync> contentService; + private final I18nTranslationService i18n; + private final Session session; + + @Inject + public RenameAction(final I18nTranslationService i18n, final Session session, + final Provider<ContentServiceAsync> contentService) { + this.i18n = i18n; + this.session = session; + this.contentService = contentService; + } + + public void rename(final StateToken token, final String oldName, final String newName, + final RenameListener listener) { + if (!newName.equals(oldName)) { + NotifyUser.showProgress(i18n.t("Renaming")); + final AsyncCallback<StateAbstractDTO> asyncCallback = new AsyncCallback<StateAbstractDTO>() { + @Override + public void onFailure(final Throwable caught) { + NotifyUser.hideProgress(); + if (caught instanceof NameInUseException) { + NotifyUser.error(i18n.tWithNT("This name already exists", + "It is used when a file or a folder with the same name already exists")); + } else if (caught instanceof NameNotPermittedException) { + NotifyUser.error(i18n.tWithNT("This name is not permitted", + "It is used when a file or a folder does not have a permitted name")); + } else { + NotifyUser.error(i18n.t("Error renaming")); + } + listener.onFail(token, newName); + } + + @Override + public void onSuccess(final StateAbstractDTO state) { + NotifyUser.hideProgress(); + session.setCurrentState(state); + listener.onSuccess(token, state.getTitle()); + } + }; + if (token.isComplete()) { + contentService.get().renameContent(session.getUserHash(), token, newName, asyncCallback); + } else { + contentService.get().renameContainer(session.getUserHash(), token, newName, asyncCallback); + } + } + } +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/gspace/client/actions/RenameListener.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/RenameListener.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/actions/RenameListener.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -0,0 +1,11 @@ +package cc.kune.gspace.client.actions; + +import cc.kune.core.shared.domain.utils.StateToken; + +public interface RenameListener { + + void onFail(StateToken token, String oldTitle); + + void onSuccess(StateToken token, String title); + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/actions/RenameListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-04-29 12:02:17 UTC (rev 1329) @@ -63,14 +63,21 @@ left: 10px; } -.docHeader span { +.docHeader span,.docHeader input { color: #FFF; font-size: 26px; font-weight: bold; margin-left: 15px; font: 'UbuntuBold', Arial; + line-height: 1.3em; } +.docHeader input { + float: left; + width: 95% !important; + color: black !important; +} + .docHeader img { float: left; margin: 10px -10px 0 10px; @@ -124,8 +131,11 @@ -moz-border-radius-topright: 7px; border-top-right-radius: 7px; } -.docEditor div { overflow-y: visible; } +.docEditor div { + overflow-y: visible; +} + .docFooter { border-left: 1px solid #959595; border-right: 1px solid #959595; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2011-04-29 12:02:17 UTC (rev 1329) @@ -23,6 +23,7 @@ padding: 5px 10px; -moz-user-select: none; -khtml-user-select: none; + outline: 0; } .iconLeft { Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -20,14 +20,15 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.errors.UIException; -import cc.kune.common.client.ui.IconLabel; +import cc.kune.common.client.ui.EditableLabel; +import cc.kune.common.client.ui.HasEditHandler; import cc.kune.common.client.ui.UiUtils; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.registry.IconsRegistry; import cc.kune.core.shared.dto.StateContentDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.viewers.DocViewerPresenter.DocViewerView; -import cc.kune.wave.client.WaveClientManager; import cc.kune.wave.client.WebClient; import com.google.gwt.core.client.GWT; @@ -39,6 +40,8 @@ import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.ui.DeckPanel; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.InlineHTML; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; import com.google.gwt.user.client.ui.Widget; @@ -54,6 +57,7 @@ private RemoteViewServiceMultiplexer channel; @UiField DeckPanel deck; + private final EditableLabel editableTitle; private final GSpaceArmor gsArmor; private final IconsRegistry iconRegistry; private IdGenerator idGenerator; @@ -61,9 +65,10 @@ @UiField InlineHTML onlyViewPanel; private ProfileManager profiles; + private final FlowPanel title; + private final Image titleIcon; /** The wave panel, if a wave is open. */ private StagesProvider wave; - private final WaveClientManager waveClientManager; @UiField FramedPanel waveFrame; @UiField @@ -72,12 +77,17 @@ private final Widget widget; @Inject - public DocViewerPanel(final GSpaceArmor wsArmor, final WaveClientManager waveClientManager, - final ContentCapabilitiesRegistry capabilitiesRegistry) { + public DocViewerPanel(final GSpaceArmor wsArmor, + final ContentCapabilitiesRegistry capabilitiesRegistry, final I18nTranslationService i18n) { this.gsArmor = wsArmor; this.iconRegistry = capabilitiesRegistry.getIconsRegistry(); - this.waveClientManager = waveClientManager; widget = uiBinder.createAndBindUi(this); + title = new FlowPanel(); + titleIcon = new Image(); + editableTitle = new EditableLabel(); + editableTitle.setTooltip(i18n.t("Click to edit")); + title.add(titleIcon); + title.add(editableTitle); } @Override @@ -104,6 +114,11 @@ clear(); } + @Override + public HasEditHandler getEditTitle() { + return editableTitle; + } + private WaveRef getWaveRef(final String waveRefS) { try { return GwtWaverefEncoder.decodeWaveRefFromPath(waveRefS); @@ -132,11 +147,8 @@ @Override public void setContent(final StateContentDTO state) { - final ForIsWidget docHeader = gsArmor.getDocHeader(); - UiUtils.clear(docHeader); - docHeader.add(new IconLabel((ImageResource) iconRegistry.getContentTypeIcon(state.getTypeId(), - state.getMimeType()), state.getTitle())); final boolean editable = state.getContentRights().isEditable(); + setTitle(state, editable); if (editable) { initWaveClientIfNeeded(); setEditableWaveContent(state.getWaveRef(), false); @@ -151,6 +163,11 @@ deck.showWidget(1); } + @Override + public void setEditableTitle(final String title) { + editableTitle.setText(title); + } + private void setEditableWaveContent(final String waveRefS, final boolean isNewWave) { final WaveRef waveRef = getWaveRef(waveRefS); @@ -173,4 +190,19 @@ } }); } + + private void setTitle(final StateContentDTO state, final boolean editable) { + final ForIsWidget docHeader = gsArmor.getDocHeader(); + UiUtils.clear(docHeader); + final ImageResource resource = (ImageResource) iconRegistry.getContentTypeIcon(state.getTypeId(), + state.getMimeType()); + final boolean hasIcon = resource != null; + if (hasIcon) { + titleIcon.setResource(resource); + } + titleIcon.setVisible(hasIcon); + editableTitle.setText(state.getTitle()); + editableTitle.setEditable(editable); + docHeader.add(title); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPresenter.java 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPresenter.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -5,83 +5,122 @@ import cc.kune.blogs.client.actions.BlogsClientActions; import cc.kune.blogs.shared.BlogsConstants; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.ui.EditEvent; +import cc.kune.common.client.ui.EditEvent.EditHandler; +import cc.kune.common.client.ui.HasEditHandler; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.HasContent; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.docs.client.actions.DocsClientActions; import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.actions.ActionGroups; +import cc.kune.gspace.client.actions.RenameAction; +import cc.kune.gspace.client.actions.RenameListener; import cc.kune.gspace.client.tool.ContentViewer; import cc.kune.gspace.client.tool.ContentViewerSelector; import com.google.gwt.event.shared.EventBus; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.inject.Inject; +import com.google.inject.Provider; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; import com.gwtplatform.mvp.client.proxy.Proxy; import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; -public class DocViewerPresenter extends Presenter<DocViewerPresenter.DocViewerView, DocViewerPresenter.DocViewerProxy> - implements ContentViewer { +public class DocViewerPresenter extends + Presenter<DocViewerPresenter.DocViewerView, DocViewerPresenter.DocViewerProxy> implements + ContentViewer { - @ProxyCodeSplit - public interface DocViewerProxy extends Proxy<DocViewerPresenter> { - } + @ProxyCodeSplit + public interface DocViewerProxy extends Proxy<DocViewerPresenter> { + } - public interface DocViewerView extends View { + public interface DocViewerView extends View { - void attach(); + void attach(); - void clear(); + void clear(); - void detach(); + void detach(); - void setActions(GuiActionDescCollection actions); + HasEditHandler getEditTitle(); - void setContent(StateContentDTO state); - } + void setActions(GuiActionDescCollection actions); - private final ActionRegistryByType actionsRegistry; - private final Session session; + void setContent(StateContentDTO state); - @Inject - public DocViewerPresenter(final EventBus eventBus, final DocViewerView view, final DocViewerProxy proxy, - final Session session, final ContentViewerSelector viewerSelector, - final ActionRegistryByType actionsRegistry, final DocsClientActions docsActions, - final BlogsClientActions blogActions) { - super(eventBus, view, proxy); - this.session = session; - this.actionsRegistry = actionsRegistry; - viewerSelector.register(this, true, DocsConstants.TYPE_DOCUMENT); - viewerSelector.register(this, true, BlogsConstants.TYPE_POST); - } + void setEditableTitle(String title); + } - @Override - public void attach() { - getView().attach(); - } + private final ActionRegistryByType actionsRegistry; + private HandlerRegistration editHandler; + private final Provider<RenameAction> renameAction; + private final Session session; - @Override - public void detach() { - getView().detach(); - } + @Inject + public DocViewerPresenter(final EventBus eventBus, final DocViewerView view, + final DocViewerProxy proxy, final Session session, final ContentViewerSelector viewerSelector, + final ActionRegistryByType actionsRegistry, final DocsClientActions docsActions, + final BlogsClientActions blogActions, final Provider<RenameAction> renameAction) { + super(eventBus, view, proxy); + this.session = session; + this.actionsRegistry = actionsRegistry; + this.renameAction = renameAction; + viewerSelector.register(this, true, DocsConstants.TYPE_DOCUMENT); + viewerSelector.register(this, true, BlogsConstants.TYPE_POST); + } - @Override - protected void revealInParent() { - RevealRootContentEvent.fire(this, this); + @Override + public void attach() { + getView().attach(); + if (editHandler == null) { + createEditHandler(); } + } - @Override - public void setContent(@Nonnull final HasContent state) { - getView().clear(); - final StateContentDTO stateContent = (StateContentDTO) state; - final AccessRights rights = stateContent.getContentRights(); - final GuiActionDescCollection actions = actionsRegistry.getCurrentActions(stateContent.getGroup(), - stateContent.getTypeId(), session.isLogged(), rights, ActionGroups.VIEW); - getView().setActions(actions); - getView().setContent(stateContent); - } + private void createEditHandler() { + editHandler = getView().getEditTitle().addEditHandler(new EditHandler() { + @Override + public void fire(final EditEvent event) { + renameAction.get().rename(session.getCurrentStateToken(), session.getCurrentState().getTitle(), + event.getText(), new RenameListener() { + @Override + public void onFail(final StateToken token, final String oldTitle) { + getView().setEditableTitle(oldTitle); + } + + @Override + public void onSuccess(final StateToken token, final String title) { + getView().setEditableTitle(title); + } + }); + } + }); + } + + @Override + public void detach() { + getView().detach(); + } + + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } + + @Override + public void setContent(@Nonnull final HasContent state) { + getView().clear(); + final StateContentDTO stateContent = (StateContentDTO) state; + final AccessRights rights = stateContent.getContentRights(); + final GuiActionDescCollection actions = actionsRegistry.getCurrentActions(stateContent.getGroup(), + stateContent.getTypeId(), session.isLogged(), rights, ActionGroups.VIEW); + getView().setActions(actions); + getView().setContent(stateContent); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml 2011-04-29 12:02:17 UTC (rev 1329) @@ -32,6 +32,7 @@ border-bottom: 1px solid #F3F3F3; line-height: 1.3em; height: 28px; + outline: 0; } .title { Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveManager.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveManager.java 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveManager.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -7,10 +7,12 @@ public interface KuneWaveManager { - WaveRef createWave(String message, ParticipantId participants); + WaveRef createWave(String message, ParticipantId participants); - WaveRef createWave(String title, String message, ParticipantId... participantsArray); + WaveRef createWave(String title, String message, ParticipantId... participantsArray); - Wavelet fetchWavelet(WaveRef waveRef, String author); + Wavelet fetchWavelet(WaveRef waveRef, String author); + void setTitle(WaveRef waveName, String title, String author); + } Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -140,33 +140,31 @@ OperationUtil.executeOperation(request, operationRegistry, context, participantUtils.of(author)); final String reqId = request.getId(); final JsonRpcResponse response = context.getResponse(reqId); - if (response != null) { - if (response.isError()) { - onFailure(context.getResponse(reqId).getErrorMessage()); - } else { - // Duplicate code from WaveService - final WaveletData waveletData = (WaveletData) response.getData().get(ParamsProperty.WAVELET_DATA); - final Map<String, Blip> blips = new HashMap<String, Blip>(); - final Map<String, BlipThread> threads = new HashMap<String, BlipThread>(); - wavelet = Wavelet.deserialize(opQueue, blips, threads, waveletData); + if (response != null && response.isError()) { + onFailure(context.getResponse(reqId).getErrorMessage()); + } else { + // Duplicate code from WaveService + final WaveletData waveletData = (WaveletData) response.getData().get(ParamsProperty.WAVELET_DATA); + final Map<String, Blip> blips = new HashMap<String, Blip>(); + final Map<String, BlipThread> threads = new HashMap<String, BlipThread>(); + wavelet = Wavelet.deserialize(opQueue, blips, threads, waveletData); - // Deserialize threads. - @SuppressWarnings("unchecked") - final Map<String, BlipThread> tempThreads = (Map<String, BlipThread>) response.getData().get( - ParamsProperty.THREADS); - for (final Map.Entry<String, BlipThread> entry : tempThreads.entrySet()) { - final BlipThread thread = entry.getValue(); - threads.put(entry.getKey(), - new BlipThread(thread.getId(), thread.getLocation(), thread.getBlipIds(), blips)); - } + // Deserialize threads. + @SuppressWarnings("unchecked") + final Map<String, BlipThread> tempThreads = (Map<String, BlipThread>) response.getData().get( + ParamsProperty.THREADS); + for (final Map.Entry<String, BlipThread> entry : tempThreads.entrySet()) { + final BlipThread thread = entry.getValue(); + threads.put(entry.getKey(), + new BlipThread(thread.getId(), thread.getLocation(), thread.getBlipIds(), blips)); + } - // Deserialize blips. - @SuppressWarnings("unchecked") - final Map<String, BlipData> blipDatas = (Map<String, BlipData>) response.getData().get( - ParamsProperty.BLIPS); - for (final Map.Entry<String, BlipData> entry : blipDatas.entrySet()) { - blips.put(entry.getKey(), Blip.deserialize(opQueue, wavelet, entry.getValue())); - } + // Deserialize blips. + @SuppressWarnings("unchecked") + final Map<String, BlipData> blipDatas = (Map<String, BlipData>) response.getData().get( + ParamsProperty.BLIPS); + for (final Map.Entry<String, BlipData> entry : blipDatas.entrySet()) { + blips.put(entry.getKey(), Blip.deserialize(opQueue, wavelet, entry.getValue())); } } return wavelet; @@ -177,4 +175,31 @@ LOG.error(errorMsg); throw new DefaultException(errorMsg); } + + @Override + public void setTitle(final WaveRef waveName, final String title, final String author) { + final Wavelet wavelet = fetchWavelet(waveName, author); + final OperationQueue opQueue = new OperationQueue(); + opQueue.setTitleOfWavelet(wavelet, title); + final OperationContextImpl context = new OperationContextImpl(waveletProvider, + converterManager.getEventDataConverter(ProtocolVersion.DEFAULT), conversationUtil); + final OperationRequest request = opQueue.getPendingOperations().get(0); + OperationUtil.executeOperation(request, operationRegistry, context, participantUtils.of(author)); + final String reqId = request.getId(); + final JsonRpcResponse response = context.getResponse(reqId); + if (response != null && response.isError()) { + onFailure(context.getResponse(reqId).getErrorMessage()); + } + OperationUtil.submitDeltas(context, waveletProvider, new SubmitRequestListener() { + @Override + public void onFailure(final String arg0) { + KuneWaveManagerDefault.this.onFailure("Wave set title failed, onFailure: " + arg0); + } + + @Override + public void onSuccess(final int arg0, final HashedVersion arg1, final long arg2) { + LOG.info("Wave set title success: " + arg1); + } + }); + } } Modified: trunk/src/test/java/cc/kune/wave/server/KuneWaveManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/wave/server/KuneWaveManagerDefaultTest.java 2011-04-28 19:05:37 UTC (rev 1328) +++ trunk/src/test/java/cc/kune/wave/server/KuneWaveManagerDefaultTest.java 2011-04-29 12:02:17 UTC (rev 1329) @@ -1,5 +1,6 @@ package cc.kune.wave.server; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -18,36 +19,53 @@ public class KuneWaveManagerDefaultTest extends IntegrationTest { - private static final String MESSAGE = "testing"; - private static final String TITLE = "title"; - @Inject - KuneWaveManagerDefault manager; - @Inject - ParticipantUtils participantUtils; + private static final String MESSAGE = "testing"; + private static final String TITLE = "title"; + private static final String TITLENEW = "titleNew"; + @Inject + KuneWaveManagerDefault manager; + @Inject + ParticipantUtils participantUtils; - @Before - public void before() { - new IntegrationTestHelper(this); + @Before + public void before() { + new IntegrationTestHelper(this); - } + } - @Test - public void createWave() throws DefaultException, IOException { - doLogin(); - final WaveRef waveletName = manager.createWave(MESSAGE, participantUtils.of(getSiteAdminShortName())); - assertNotNull(waveletName); - final Wavelet fetchWavelet = manager.fetchWavelet(waveletName, getSiteAdminShortName()); - assertNotNull(fetchWavelet); - assertTrue(fetchWavelet.getRootBlip().getContent().contains(MESSAGE)); - } + @Test + public void createWave() throws DefaultException, IOException { + doLogin(); + final WaveRef waveletName = manager.createWave(MESSAGE, participantUtils.of(getSiteAdminShortName())); + assertNotNull(waveletName); + final Wavelet fetchWavelet = manager.fetchWavelet(waveletName, getSiteAdminShortName()); + assertNotNull(fetchWavelet); + assertTrue(fetchWavelet.getRootBlip().getContent().contains(MESSAGE)); + } - @Test - public void createWaveWithTitle() throws DefaultException, IOException { - doLogin(); - final WaveRef waveletName = manager.createWave(TITLE, MESSAGE, participantUtils.of(getSiteAdminShortName())); - assertNotNull(waveletName); - final Wavelet fetchWavelet = manager.fetchWavelet(waveletName, getSiteAdminShortName()); - assertNotNull(fetchWavelet); - assertTrue(fetchWavelet.getRootBlip().getContent().contains(MESSAGE)); - } + @Test + public void createWaveWithTitle() throws DefaultException, IOException { + doLogin(); + final WaveRef waveletName = manager.createWave(TITLE, MESSAGE, + participantUtils.of(getSiteAdminShortName())); + assertNotNull(waveletName); + final Wavelet fetchWavelet = manager.fetchWavelet(waveletName, getSiteAdminShortName()); + assertNotNull(fetchWavelet); + assertTrue(fetchWavelet.getRootBlip().getContent().contains(MESSAGE)); + assertEquals(TITLE, fetchWavelet.getTitle()); + } + + @Test + public void setTitle() throws DefaultException, IOException { + doLogin(); + final WaveRef waveletName = manager.createWave(TITLE, MESSAGE, + participantUtils.of(getSiteAdminShortName())); + assertNotNull(waveletName); + manager.setTitle(waveletName, TITLENEW, getSiteAdminShortName()); + final Wavelet fetchWavelet = manager.fetchWavelet(waveletName, getSiteAdminShortName()); + assertNotNull(fetchWavelet); + assertTrue(fetchWavelet.getRootBlip().getContent().contains(MESSAGE)); + assertEquals(TITLENEW, fetchWavelet.getTitle()); + } + }

1 0

r1328 - in trunk/src/main/java/cc/kune/core/client: sitebar state
by Vicente J. Ruiz Jurado 28 Apr '11

28 Apr '11

Author: vjrj_ Date: 2011-04-28 21:05:37 +0200 (Thu, 28 Apr 2011) New Revision: 1328 Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java trunk/src/main/java/cc/kune/core/client/state/Session.java trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java Log: Session expiration improved Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2011-04-28 18:56:20 UTC (rev 1327) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2011-04-28 19:05:37 UTC (rev 1328) @@ -28,8 +28,6 @@ import cc.kune.core.client.auth.WaveClientSimpleAuthenticator; import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.errors.SessionExpiredEvent; -import cc.kune.core.client.errors.SessionExpiredEvent.SessionExpiredHandler; import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.errors.UserMustBeLoggedException; import cc.kune.core.client.notify.spiner.ProgressHideEvent; @@ -49,110 +47,99 @@ public class SitebarSignOutLink extends ButtonDescriptor { - public static class BeforeSignOut extends BeforeActionCollection { - private static final long serialVersionUID = 2326033703822323868L; - } + public static class BeforeSignOut extends BeforeActionCollection { + private static final long serialVersionUID = 2326033703822323868L; + } - public static class SitebarSignOutAction extends AbstractExtendedAction { + public static class SitebarSignOutAction extends AbstractExtendedAction { - private final BeforeSignOut beforeSignOut; - private final CookiesManager cookiesManager; - private final EventBus eventBus; - private final Session session; - private final Provider<UserServiceAsync> userService; - private final WaveClientSimpleAuthenticator waveAuth; + private final BeforeSignOut beforeSignOut; + private final CookiesManager cookiesManager; + private final EventBus eventBus; + private final Session session; + private final Provider<UserServiceAsync> userService; + private final WaveClientSimpleAuthenticator waveAuth; - @Inject - public SitebarSignOutAction(final EventBus eventBus, final I18nTranslationService i18n, - final BeforeSignOut beforeSignOut, final Provider<UserServiceAsync> userService, final Session session, - final CookiesManager cookiesManager, final WaveClientSimpleAuthenticator waveAuth) { - super(); - this.eventBus = eventBus; - this.userService = userService; - this.session = session; - this.cookiesManager = cookiesManager; - this.beforeSignOut = beforeSignOut; - this.waveAuth = waveAuth; - putValue(Action.NAME, i18n.t("Sign out")); - } + @Inject + public SitebarSignOutAction(final EventBus eventBus, final I18nTranslationService i18n, + final BeforeSignOut beforeSignOut, final Provider<UserServiceAsync> userService, + final Session session, final CookiesManager cookiesManager, + final WaveClientSimpleAuthenticator waveAuth) { + super(); + this.eventBus = eventBus; + this.userService = userService; + this.session = session; + this.cookiesManager = cookiesManager; + this.beforeSignOut = beforeSignOut; + this.waveAuth = waveAuth; + putValue(Action.NAME, i18n.t("Sign out")); + } - @Override - public void actionPerformed(final ActionEvent event) { - eventBus.fireEvent(new ProgressShowEvent()); - if (beforeSignOut.checkBeforeAction()) { - waveAuth.doLogout(new AsyncCallback<Void>() { - @Override - public void onFailure(final Throwable caught) { - onLogoutFail(caught); - } + @Override + public void actionPerformed(final ActionEvent event) { + eventBus.fireEvent(new ProgressShowEvent()); + if (beforeSignOut.checkBeforeAction()) { + waveAuth.doLogout(new AsyncCallback<Void>() { + @Override + public void onFailure(final Throwable caught) { + onLogoutFail(caught); + } - @Override - public void onSuccess(final Void result) { - userService.get().logout(session.getUserHash(), new AsyncCallback<Void>() { - @Override - public void onFailure(final Throwable caught) { - onLogoutFail(caught); - } + @Override + public void onSuccess(final Void result) { + userService.get().logout(session.getUserHash(), new AsyncCallback<Void>() { + @Override + public void onFailure(final Throwable caught) { + onLogoutFail(caught); + } - @Override - public void onSuccess(final Void arg0) { - eventBus.fireEvent(new ProgressHideEvent()); - clientUIsignOut(); - } - - }); - } - }); - } else { + @Override + public void onSuccess(final Void arg0) { eventBus.fireEvent(new ProgressHideEvent()); - } - } + session.signOut(); + } - public void clientUIsignOut() { - cookiesManager.removeCookie(); - session.setUserHash(null); - session.setCurrentUserInfo(null); - } - - private void onLogoutFail(final Throwable caught) { - eventBus.fireEvent(new ProgressHideEvent()); - if (caught instanceof SessionExpiredException) { - clientUIsignOut(); - } else if (caught instanceof UserMustBeLoggedException) { - clientUIsignOut(); - } else { - throw new UIException("Other kind of exception in doLogout", caught); - } - } - + }); + } + }); + } else { + eventBus.fireEvent(new ProgressHideEvent()); + } } - public static final String SITE_SIGN_OUT = "k-ssolp-lb"; - @Inject - public SitebarSignOutLink(final SitebarSignOutAction action, final EventBus eventBus, - final ErrorHandler errorHandler, final Session session) { - super(action); - setId(SITE_SIGN_OUT); - setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); - setVisible(session.isLogged()); - setStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor"); - session.onUserSignIn(true, new UserSignInHandler() { - @Override - public void onUserSignIn(final UserSignInEvent event) { - SitebarSignOutLink.this.setVisible(true); - } - }); - session.onUserSignOut(true, new UserSignOutHandler() { - @Override - public void onUserSignOut(final UserSignOutEvent event) { - SitebarSignOutLink.this.setVisible(false); - } - }); - eventBus.addHandler(SessionExpiredEvent.getType(), new SessionExpiredHandler() { - @Override - public void onSessionExpired(final SessionExpiredEvent event) { - action.clientUIsignOut(); - } - }); + private void onLogoutFail(final Throwable caught) { + eventBus.fireEvent(new ProgressHideEvent()); + if (caught instanceof SessionExpiredException) { + session.signOut(); + } else if (caught instanceof UserMustBeLoggedException) { + session.signOut(); + } else { + throw new UIException("Other kind of exception in doLogout", caught); + } } + + } + public static final String SITE_SIGN_OUT = "k-ssolp-lb"; + + @Inject + public SitebarSignOutLink(final SitebarSignOutAction action, final EventBus eventBus, + final ErrorHandler errorHandler, final Session session) { + super(action); + setId(SITE_SIGN_OUT); + setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); + setVisible(session.isLogged()); + setStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor"); + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + SitebarSignOutLink.this.setVisible(true); + } + }); + session.onUserSignOut(true, new UserSignOutHandler() { + @Override + public void onUserSignOut(final UserSignOutEvent event) { + SitebarSignOutLink.this.setVisible(false); + } + }); + } } Modified: trunk/src/main/java/cc/kune/core/client/state/Session.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-04-28 18:56:20 UTC (rev 1327) +++ trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-04-28 19:05:37 UTC (rev 1328) @@ -61,121 +61,121 @@ public interface Session { - /** - * Duration remembering login: 2 weeks - */ - int SESSION_DURATION = 1000 * 60 * 60 * 24 * 14; - // int SESSION_DURATION = 1000; + /** + * Duration remembering login: 2 weeks + */ + int SESSION_DURATION = 1000 * 60 * 60 * 24 * 14; + // int SESSION_DURATION = 1000; - String USERHASH = "k007userHash"; + String USERHASH = "k007userHash"; - void check(AsyncCallbackSimple<Void> callback); + void check(AsyncCallbackSimple<Void> callback); - StateContainerDTO getContainerState(); + StateContainerDTO getContainerState(); - StateContentDTO getContentState(); + StateContentDTO getContentState(); - List<I18nCountryDTO> getCountries(); + List<I18nCountryDTO> getCountries(); - Object[][] getCountriesArray(); + Object[][] getCountriesArray(); - String getCurrentCCversion(); + String getCurrentCCversion(); - String getCurrentGroupShortName(); + String getCurrentGroupShortName(); - I18nLanguageDTO getCurrentLanguage(); + I18nLanguageDTO getCurrentLanguage(); - StateAbstractDTO getCurrentState(); + StateAbstractDTO getCurrentState(); - StateToken getCurrentStateToken(); + StateToken getCurrentStateToken(); - UserSimpleDTO getCurrentUser(); + UserSimpleDTO getCurrentUser(); - UserInfoDTO getCurrentUserInfo(); + UserInfoDTO getCurrentUserInfo(); - LicenseDTO getDefLicense(); + LicenseDTO getDefLicense(); - String getGalleryPermittedExtensions(); + String getGalleryPermittedExtensions(); - Collection<ToolSimpleDTO> getGroupTools(); + Collection<ToolSimpleDTO> getGroupTools(); - int getImgCropsize(); + int getImgCropsize(); - int getImgIconsize(); + int getImgIconsize(); - int getImgResizewidth(); + int getImgResizewidth(); - int getImgThumbsize(); + int getImgThumbsize(); - InitDataDTO getInitData(); + InitDataDTO getInitData(); - List<I18nLanguageSimpleDTO> getLanguages(); + List<I18nLanguageSimpleDTO> getLanguages(); - Object[][] getLanguagesArray(); + Object[][] getLanguagesArray(); - List<LicenseDTO> getLicenses(); + List<LicenseDTO> getLicenses(); - boolean getShowDeletedContent(); + boolean getShowDeletedContent(); - String getSiteUrl(); + String getSiteUrl(); - Object[][] getTimezones(); + Object[][] getTimezones(); - String getUserHash(); + String getUserHash(); - Collection<ToolSimpleDTO> getUserTools(); + Collection<ToolSimpleDTO> getUserTools(); - boolean inSameToken(StateToken token); + boolean inSameToken(StateToken token); - boolean isCurrentStateAContent(); + boolean isCurrentStateAContent(); - boolean isCurrentStateAGroup(); + boolean isCurrentStateAGroup(); - boolean isCurrentStateAPerson(); + boolean isCurrentStateAPerson(); - boolean isInCurrentUserSpace(); + boolean isInCurrentUserSpace(); - boolean isLogged(); + boolean isLogged(); - boolean isNotLogged(); + boolean isNotLogged(); - void onAppStart(boolean fireNow, AppStartEvent.AppStartHandler handler); + void onAppStart(boolean fireNow, AppStartEvent.AppStartHandler handler); - @Deprecated - void onInitDataReceived(Listener<InitDataDTO> listener); + @Deprecated + void onInitDataReceived(Listener<InitDataDTO> listener); - /** - * @param fireNow - * if @true the handler is fired after added if the user is - * loggedin - * @param handler - */ - void onUserSignIn(boolean fireNow, UserSignInEvent.UserSignInHandler handler); + /** + * @param fireNow + * if @true the handler is fired after added if the user is loggedin + * @param handler + */ + void onUserSignIn(boolean fireNow, UserSignInEvent.UserSignInHandler handler); - @Deprecated - void onUserSignIn(Listener<UserInfoDTO> listener); + @Deprecated + void onUserSignIn(Listener<UserInfoDTO> listener); - void onUserSignInOrSignOut(boolean fireNow, UserSignInOrSignOutEvent.UserSignInOrSignOutHandler handler); + void onUserSignInOrSignOut(boolean fireNow, UserSignInOrSignOutEvent.UserSignInOrSignOutHandler handler); - /** - * @param fireNow - * if @true the handler is fired after added if the user is - * loggedin - * @param handler - */ - void onUserSignOut(boolean fireNow, UserSignOutEvent.UserSignOutHandler handler); + /** + * @param fireNow + * if @true the handler is fired after added if the user is loggedin + * @param handler + */ + void onUserSignOut(boolean fireNow, UserSignOutEvent.UserSignOutHandler handler); - @Deprecated - void onUserSignOut(Listener0 listener); + @Deprecated + void onUserSignOut(Listener0 listener); - void setCurrentLanguage(final I18nLanguageDTO currentLanguage); + void setCurrentLanguage(final I18nLanguageDTO currentLanguage); - void setCurrentState(final StateAbstractDTO currentState); + void setCurrentState(final StateAbstractDTO currentState); - void setCurrentUserInfo(UserInfoDTO currentUserInfo); + void setCurrentUserInfo(UserInfoDTO currentUserInfo); - void setInitData(InitDataDTO initData); + void setInitData(InitDataDTO initData); - void setUserHash(String userHash); + void setUserHash(String userHash); + void signOut(); + } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-04-28 18:56:20 UTC (rev 1327) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-04-28 19:05:37 UTC (rev 1328) @@ -25,6 +25,7 @@ import cc.kune.common.client.errors.NotImplementedException; import cc.kune.common.client.log.Log; import cc.kune.core.client.cookies.CookiesManager; +import cc.kune.core.client.errors.SessionExpiredEvent; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -53,325 +54,340 @@ import com.google.inject.Provider; public class SessionDefault implements Session { - private Object[][] countriesArray; - private I18nLanguageDTO currentLanguage; - private StateAbstractDTO currentState; - private UserInfoDTO currentUserInfo; - private final EventBus eventBus; - private InitDataDTO initData; - private Object[][] languagesArray; - private Object[][] timezonesArray; - private String userHash; - private final Provider<UserServiceAsync> userServiceProvider; + private final CookiesManager cookieManager; + private Object[][] countriesArray; + private I18nLanguageDTO currentLanguage; + private StateAbstractDTO currentState; + private UserInfoDTO currentUserInfo; + private final EventBus eventBus; + private InitDataDTO initData; + private Object[][] languagesArray; + private Object[][] timezonesArray; + private String userHash; + private final Provider<UserServiceAsync> userServiceProvider; - @Inject - public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider, - final EventBus eventBus) { - this.eventBus = eventBus; - this.userHash = cookieManager.getCurrentCookie(); - this.userHash = userHash == null || userHash.equals("null") ? null : userHash; - this.userServiceProvider = userServiceProvider; - languagesArray = null; - } + @Inject + public SessionDefault(final CookiesManager cookieManager, + final Provider<UserServiceAsync> userServiceProvider, final EventBus eventBus) { + this.cookieManager = cookieManager; + this.eventBus = eventBus; + this.userHash = cookieManager.getCurrentCookie(); + this.userHash = userHash == null || userHash.equals("null") ? null : userHash; + this.userServiceProvider = userServiceProvider; + languagesArray = null; + eventBus.addHandler(SessionExpiredEvent.getType(), new SessionExpiredEvent.SessionExpiredHandler() { + @Override + public void onSessionExpired(final SessionExpiredEvent event) { + signOut(); + } + }); + } - @Override - public void check(final AsyncCallbackSimple<Void> callback) { - Log.debug("Checking session (userhash: " + getUserHash() + ")"); - userServiceProvider.get().onlyCheckSession(getUserHash(), callback); - } + @Override + public void check(final AsyncCallbackSimple<Void> callback) { + Log.debug("Checking session (userhash: " + getUserHash() + ")"); + userServiceProvider.get().onlyCheckSession(getUserHash(), callback); + } - @Override - public StateContainerDTO getContainerState() { - return (StateContainerDTO) currentState; - } + @Override + public StateContainerDTO getContainerState() { + return (StateContainerDTO) currentState; + } - @Override - public StateContentDTO getContentState() { - return (StateContentDTO) currentState; - } + @Override + public StateContentDTO getContentState() { + return (StateContentDTO) currentState; + } - @Override - public List<I18nCountryDTO> getCountries() { - return initData.getCountries(); - } + @Override + public List<I18nCountryDTO> getCountries() { + return initData.getCountries(); + } - @Override - public Object[][] getCountriesArray() { - if (countriesArray == null) { - countriesArray = mapCountries(); - } - return countriesArray; + @Override + public Object[][] getCountriesArray() { + if (countriesArray == null) { + countriesArray = mapCountries(); } + return countriesArray; + } - @Override - public String getCurrentCCversion() { - return initData.getCurrentCCversion(); - } + @Override + public String getCurrentCCversion() { + return initData.getCurrentCCversion(); + } - @Override - public String getCurrentGroupShortName() { - return currentState == null ? null : currentState.getStateToken().getGroup(); - } + @Override + public String getCurrentGroupShortName() { + return currentState == null ? null : currentState.getStateToken().getGroup(); + } - @Override - public I18nLanguageDTO getCurrentLanguage() { - return currentLanguage; - } + @Override + public I18nLanguageDTO getCurrentLanguage() { + return currentLanguage; + } - @Override - public StateAbstractDTO getCurrentState() { - return currentState; - } + @Override + public StateAbstractDTO getCurrentState() { + return currentState; + } - @Override - public StateToken getCurrentStateToken() { - return currentState == null ? null : currentState.getStateToken(); - } + @Override + public StateToken getCurrentStateToken() { + return currentState == null ? null : currentState.getStateToken(); + } - @Override - public UserSimpleDTO getCurrentUser() { - return currentUserInfo == null ? null : currentUserInfo.getUser(); - } + @Override + public UserSimpleDTO getCurrentUser() { + return currentUserInfo == null ? null : currentUserInfo.getUser(); + } - @Override - public UserInfoDTO getCurrentUserInfo() { - return currentUserInfo; - } + @Override + public UserInfoDTO getCurrentUserInfo() { + return currentUserInfo; + } - @Override - public LicenseDTO getDefLicense() { - return initData.getDefaultLicense(); - } + @Override + public LicenseDTO getDefLicense() { + return initData.getDefaultLicense(); + } - @Override - public String getGalleryPermittedExtensions() { - return initData.getGalleryPermittedExtensions(); - } + @Override + public String getGalleryPermittedExtensions() { + return initData.getGalleryPermittedExtensions(); + } - @Override - public Collection<ToolSimpleDTO> getGroupTools() { - return initData.getGroupTools(); - } + @Override + public Collection<ToolSimpleDTO> getGroupTools() { + return initData.getGroupTools(); + } - @Override - public int getImgCropsize() { - return initData.getImgCropsize(); - } + @Override + public int getImgCropsize() { + return initData.getImgCropsize(); + } - @Override - public int getImgIconsize() { - return initData.getImgIconsize(); - } + @Override + public int getImgIconsize() { + return initData.getImgIconsize(); + } - @Override - public int getImgResizewidth() { - return initData.getImgResizewidth(); - } + @Override + public int getImgResizewidth() { + return initData.getImgResizewidth(); + } - @Override - public int getImgThumbsize() { - return initData.getImgThumbsize(); - } + @Override + public int getImgThumbsize() { + return initData.getImgThumbsize(); + } - @Override - public InitDataDTO getInitData() { - return initData; - } + @Override + public InitDataDTO getInitData() { + return initData; + } - @Override - public List<I18nLanguageSimpleDTO> getLanguages() { - return initData.getLanguages(); - } + @Override + public List<I18nLanguageSimpleDTO> getLanguages() { + return initData.getLanguages(); + } - @Override - public Object[][] getLanguagesArray() { - if (languagesArray == null) { - languagesArray = mapLangs(); - } - return languagesArray; + @Override + public Object[][] getLanguagesArray() { + if (languagesArray == null) { + languagesArray = mapLangs(); } + return languagesArray; + } - @Override - public List<LicenseDTO> getLicenses() { - return initData.getLicenses(); - } + @Override + public List<LicenseDTO> getLicenses() { + return initData.getLicenses(); + } - @Override - public boolean getShowDeletedContent() { - return currentUserInfo == null ? false : currentUserInfo.getShowDeletedContent(); - } + @Override + public boolean getShowDeletedContent() { + return currentUserInfo == null ? false : currentUserInfo.getShowDeletedContent(); + } - @Override - public String getSiteUrl() { - final String baseURL = GWT.getModuleBaseURL(); - return baseURL.substring(0, baseURL.lastIndexOf("/" + GWT.getModuleName())); - } + @Override + public String getSiteUrl() { + final String baseURL = GWT.getModuleBaseURL(); + return baseURL.substring(0, baseURL.lastIndexOf("/" + GWT.getModuleName())); + } - @Override - public Object[][] getTimezones() { - if (timezonesArray == null) { - mapTimezones(); - } - return timezonesArray; + @Override + public Object[][] getTimezones() { + if (timezonesArray == null) { + mapTimezones(); } + return timezonesArray; + } - @Override - public String getUserHash() { - return userHash; - } + @Override + public String getUserHash() { + return userHash; + } - @Override - public Collection<ToolSimpleDTO> getUserTools() { - return initData.getUserTools(); - } + @Override + public Collection<ToolSimpleDTO> getUserTools() { + return initData.getUserTools(); + } - @Override - public boolean inSameToken(final StateToken token) { - return getCurrentStateToken().equals(token); - } + @Override + public boolean inSameToken(final StateToken token) { + return getCurrentStateToken().equals(token); + } - @Override - public boolean isCurrentStateAContent() { - return currentState instanceof StateContentDTO; - } + @Override + public boolean isCurrentStateAContent() { + return currentState instanceof StateContentDTO; + } - @Override - public boolean isCurrentStateAGroup() { - return currentState == null ? false : !currentState.getGroup().isPersonal(); - } + @Override + public boolean isCurrentStateAGroup() { + return currentState == null ? false : !currentState.getGroup().isPersonal(); + } - @Override - public boolean isCurrentStateAPerson() { - return currentState == null ? false : currentState.getGroup().isPersonal(); - } + @Override + public boolean isCurrentStateAPerson() { + return currentState == null ? false : currentState.getGroup().isPersonal(); + } - @Override - public boolean isInCurrentUserSpace() { - if (!isLogged()) { - return false; - } - if (getCurrentStateToken().getGroup().equals(getCurrentUser().getShortName())) { - return true; - } - return false; + @Override + public boolean isInCurrentUserSpace() { + if (!isLogged()) { + return false; } - - @Override - public boolean isLogged() { - return userHash != null; + if (getCurrentStateToken().getGroup().equals(getCurrentUser().getShortName())) { + return true; } + return false; + } - @Override - public boolean isNotLogged() { - return !isLogged(); - } + @Override + public boolean isLogged() { + return userHash != null; + } - private Object[][] mapCountries() { - assert initData != null; - final Object[][] objs = new Object[initData.getCountries().size()][1]; - int i = 0; - for (final I18nCountryDTO country : initData.getCountries()) { - final Object[] obj = new Object[] { country.getCode(), country.getEnglishName() }; - objs[i++] = obj; - } - return objs; - } + @Override + public boolean isNotLogged() { + return !isLogged(); + } - private Object[][] mapLangs() { - assert initData != null; - final Object[][] objs = new Object[initData.getLanguages().size()][1]; - int i = 0; - for (final I18nLanguageSimpleDTO language : initData.getLanguages()) { - final Object[] obj = new Object[] { language.getCode(), language.getEnglishName() }; - objs[i++] = obj; - } - return objs; + private Object[][] mapCountries() { + assert initData != null; + final Object[][] objs = new Object[initData.getCountries().size()][1]; + int i = 0; + for (final I18nCountryDTO country : initData.getCountries()) { + final Object[] obj = new Object[] { country.getCode(), country.getEnglishName() }; + objs[i++] = obj; } + return objs; + } - private void mapTimezones() { - assert initData != null; - timezonesArray = new Object[initData.getTimezones().length][1]; - for (int i = 0; i < getTimezones().length; i++) { - final Object[] obj = new Object[] { initData.getTimezones()[i] }; - timezonesArray[i] = obj; - } + private Object[][] mapLangs() { + assert initData != null; + final Object[][] objs = new Object[initData.getLanguages().size()][1]; + int i = 0; + for (final I18nLanguageSimpleDTO language : initData.getLanguages()) { + final Object[] obj = new Object[] { language.getCode(), language.getEnglishName() }; + objs[i++] = obj; } + return objs; + } - @Override - public void onAppStart(final boolean fireNow, final AppStartHandler handler) { - eventBus.addHandler(AppStartEvent.getType(), handler); - if (fireNow && initData != null) { - handler.onAppStart(new AppStartEvent(initData)); - } + private void mapTimezones() { + assert initData != null; + timezonesArray = new Object[initData.getTimezones().length][1]; + for (int i = 0; i < getTimezones().length; i++) { + final Object[] obj = new Object[] { initData.getTimezones()[i] }; + timezonesArray[i] = obj; } + } - @Override - public void onInitDataReceived(final Listener<InitDataDTO> listener) { - throw new NotImplementedException(); + @Override + public void onAppStart(final boolean fireNow, final AppStartHandler handler) { + eventBus.addHandler(AppStartEvent.getType(), handler); + if (fireNow && initData != null) { + handler.onAppStart(new AppStartEvent(initData)); } + } - @Override - public void onUserSignIn(final boolean fireNow, final UserSignInHandler handler) { - eventBus.addHandler(UserSignInEvent.getType(), handler); - if (fireNow && isLogged() && currentUserInfo != null) { - handler.onUserSignIn(new UserSignInEvent(currentUserInfo)); - } - } + @Override + public void onInitDataReceived(final Listener<InitDataDTO> listener) { + throw new NotImplementedException(); + } - @Override - public void onUserSignIn(final Listener<UserInfoDTO> listener) { - throw new NotImplementedException(); + @Override + public void onUserSignIn(final boolean fireNow, final UserSignInHandler handler) { + eventBus.addHandler(UserSignInEvent.getType(), handler); + if (fireNow && isLogged() && currentUserInfo != null) { + handler.onUserSignIn(new UserSignInEvent(currentUserInfo)); } + } - @Override - public void onUserSignInOrSignOut(final boolean fireNow, final UserSignInOrSignOutHandler handler) { - eventBus.addHandler(UserSignInOrSignOutEvent.getType(), handler); - if (fireNow) { - handler.onUserSignInOrSignOut(new UserSignInOrSignOutEvent(isLogged())); - } - } + @Override + public void onUserSignIn(final Listener<UserInfoDTO> listener) { + throw new NotImplementedException(); + } - @Override - public void onUserSignOut(final boolean fireNow, final UserSignOutHandler handler) { - eventBus.addHandler(UserSignOutEvent.getType(), handler); - if (fireNow && isNotLogged()) { - handler.onUserSignOut(new UserSignOutEvent()); - } + @Override + public void onUserSignInOrSignOut(final boolean fireNow, final UserSignInOrSignOutHandler handler) { + eventBus.addHandler(UserSignInOrSignOutEvent.getType(), handler); + if (fireNow) { + handler.onUserSignInOrSignOut(new UserSignInOrSignOutEvent(isLogged())); } + } - @Override - public void onUserSignOut(final Listener0 listener) { - throw new NotImplementedException(); + @Override + public void onUserSignOut(final boolean fireNow, final UserSignOutHandler handler) { + eventBus.addHandler(UserSignOutEvent.getType(), handler); + if (fireNow && isNotLogged()) { + handler.onUserSignOut(new UserSignOutEvent()); } + } - @Override - public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) { - this.currentLanguage = currentLanguage; - } + @Override + public void onUserSignOut(final Listener0 listener) { + throw new NotImplementedException(); + } - @Override - public void setCurrentState(final StateAbstractDTO currentState) { - this.currentState = currentState; - } + @Override + public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) { + this.currentLanguage = currentLanguage; + } - @Override - public void setCurrentUserInfo(final UserInfoDTO currentUserInfo) { - this.currentUserInfo = currentUserInfo; - if (currentUserInfo != null) { - eventBus.fireEvent(new UserSignInEvent(this.currentUserInfo)); - } else { - eventBus.fireEvent(new UserSignOutEvent()); - } - eventBus.fireEvent(new UserSignInOrSignOutEvent(isLogged())); - } + @Override + public void setCurrentState(final StateAbstractDTO currentState) { + this.currentState = currentState; + } - @Override - public void setInitData(final InitDataDTO initData) { - this.initData = initData; + @Override + public void setCurrentUserInfo(final UserInfoDTO currentUserInfo) { + this.currentUserInfo = currentUserInfo; + if (currentUserInfo != null) { + eventBus.fireEvent(new UserSignInEvent(this.currentUserInfo)); + } else { + eventBus.fireEvent(new UserSignOutEvent()); } + eventBus.fireEvent(new UserSignInOrSignOutEvent(isLogged())); + } - @Override - public void setUserHash(final String userHash) { - this.userHash = userHash; - } + @Override + public void setInitData(final InitDataDTO initData) { + this.initData = initData; + } + + @Override + public void setUserHash(final String userHash) { + this.userHash = userHash; + } + + @Override + public void signOut() { + cookieManager.removeCookie(); + setUserHash(null); + setCurrentUserInfo(null); + } }

1 0

r1327 - in trunk/src/main/java/cc/kune: core/public gspace/client gspace/client/resources gspace/client/viewers wave/client
by Vicente J. Ruiz Jurado 28 Apr '11

28 Apr '11

Author: vjrj_ Date: 2011-04-28 20:56:20 +0200 (Thu, 28 Apr 2011) New Revision: 1327 Modified: trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.ui.xml trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java trunk/src/main/java/cc/kune/wave/client/WebClient.java Log: WIAB editor in GSpace Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-28 18:00:03 UTC (rev 1326) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-28 18:56:20 UTC (rev 1327) @@ -1126,4 +1126,9 @@ .k-ent-header-btn * { font-size: 13px !important; -} \ No newline at end of file +} + +table.k-folder-viewer { + border: 5px solid #FFF; + border-collapse: separate; +} Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-04-28 18:00:03 UTC (rev 1326) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-04-28 18:56:20 UTC (rev 1327) @@ -42,159 +42,161 @@ public class GSpaceArmorImpl extends Composite implements GSpaceArmor { - interface WsArmorImplUiBinder extends UiBinder<Widget, GSpaceArmorImpl> { - } + interface WsArmorImplUiBinder extends UiBinder<Widget, GSpaceArmorImpl> { + } - private static WsArmorImplUiBinder uiBinder = GWT.create(WsArmorImplUiBinder.class); + private static WsArmorImplUiBinder uiBinder = GWT.create(WsArmorImplUiBinder.class); - @UiField - VerticalPanel docContainer; - @UiField - FlowPanel docFooter; - @UiField - FlowPanel docHeader; - @UiField - FlowPanel docSubheader; - @UiField - FlowPanel entityFooter; - @UiField - FlowPanel entityHeader; - @UiField - VerticalPanel entityToolsCenter; - @UiField - VerticalPanel entityToolsNorth; - @UiField - VerticalPanel entityToolsSouth; - private final ActionFlowPanel footerToolbar; - @UiField - SplitLayoutPanel groupSpace; - private final ActionFlowPanel headerToolbar; - @UiField - SimplePanel homeSpace; - @UiField - DockLayoutPanel mainpanel; - @UiField - SimplePanel publicSpace; - @UiField - FlowPanel sitebar; - @UiField - DockLayoutPanel splitCenter; - @UiField - DockLayoutPanel splitEast; - private final ActionFlowPanel subheaderToolbar; - @UiField - TabLayoutPanel tabs; - @UiField - FlowPanel userSpace; + @UiField + VerticalPanel docContainer; + @UiField + FlowPanel docFooter; + @UiField + FlowPanel docHeader; + @UiField + FlowPanel docSubheader; + @UiField + FlowPanel entityFooter; + @UiField + FlowPanel entityHeader; + @UiField + VerticalPanel entityToolsCenter; + @UiField + VerticalPanel entityToolsNorth; + @UiField + VerticalPanel entityToolsSouth; + private final ActionFlowPanel footerToolbar; + @UiField + SplitLayoutPanel groupSpace; + private final ActionFlowPanel headerToolbar; + @UiField + SimplePanel homeSpace; + @UiField + DockLayoutPanel mainpanel; + @UiField + SimplePanel publicSpace; + @UiField + FlowPanel sitebar; + @UiField + DockLayoutPanel splitCenter; + @UiField + DockLayoutPanel splitEast; + private final ActionFlowPanel subheaderToolbar; + @UiField + TabLayoutPanel tabs; + @UiField + FlowPanel userSpace; - @Inject - public GSpaceArmorImpl(final Provider<ActionFlowPanel> toolbarProv) { - initWidget(uiBinder.createAndBindUi(this)); - groupSpace.setWidgetMinSize(splitEast, 150); - tabs.setStyleName("k-spaces"); - homeSpace.add(RootPanel.get("k-home-wrapper")); - DOM.setStyleAttribute((Element) groupSpace.getWidgetContainerElement(splitEast), "overflow", "visible"); - DOM.setStyleAttribute((Element) splitEast.getWidgetContainerElement(entityToolsCenter), "overflow", "visible"); - footerToolbar = toolbarProv.get(); - headerToolbar = toolbarProv.get(); - subheaderToolbar = toolbarProv.get(); - getDocHeader().add(headerToolbar); - getDocSubheader().add(subheaderToolbar); - getDocFooter().add(footerToolbar); - } + @Inject + public GSpaceArmorImpl(final Provider<ActionFlowPanel> toolbarProv) { + initWidget(uiBinder.createAndBindUi(this)); + groupSpace.setWidgetMinSize(splitEast, 150); + tabs.setStyleName("k-spaces"); + homeSpace.add(RootPanel.get("k-home-wrapper")); + DOM.setStyleAttribute((Element) groupSpace.getWidgetContainerElement(splitEast), "overflow", + "visible"); + DOM.setStyleAttribute((Element) splitEast.getWidgetContainerElement(entityToolsCenter), "overflow", + "visible"); + footerToolbar = toolbarProv.get(); + headerToolbar = toolbarProv.get(); + subheaderToolbar = toolbarProv.get(); + getDocHeader().add(headerToolbar); + getDocSubheader().add(subheaderToolbar); + getDocFooter().add(footerToolbar); + } - @Override - public ForIsWidget getDocContainer() { - return docContainer; - } + @Override + public ForIsWidget getDocContainer() { + return docContainer; + } - @Override - public ForIsWidget getDocFooter() { - return docFooter; - } + @Override + public ForIsWidget getDocFooter() { + return docFooter; + } - @Override - public ForIsWidget getDocHeader() { - return docHeader; - } + @Override + public ForIsWidget getDocHeader() { + return docHeader; + } - @Override - public ForIsWidget getDocSubheader() { - return docSubheader; - } + @Override + public ForIsWidget getDocSubheader() { + return docSubheader; + } - @Override - public ForIsWidget getEntityFooter() { - return entityFooter; - } + @Override + public ForIsWidget getEntityFooter() { + return entityFooter; + } - @Override - public ForIsWidget getEntityHeader() { - return entityHeader; - } + @Override + public ForIsWidget getEntityHeader() { + return entityHeader; + } - @Override - public ForIsWidget getEntityToolsCenter() { - return entityToolsCenter; - } + @Override + public ForIsWidget getEntityToolsCenter() { + return entityToolsCenter; + } - @Override - public ForIsWidget getEntityToolsNorth() { - return entityToolsNorth; - } + @Override + public ForIsWidget getEntityToolsNorth() { + return entityToolsNorth; + } - @Override - public ForIsWidget getEntityToolsSouth() { - return entityToolsSouth; - } + @Override + public ForIsWidget getEntityToolsSouth() { + return entityToolsSouth; + } - @Override - public IsActionExtensible getFooterToolbar() { - return footerToolbar; - } + @Override + public IsActionExtensible getFooterToolbar() { + return footerToolbar; + } - @Override - public IsActionExtensible getHeaderToolbar() { - return headerToolbar; - } + @Override + public IsActionExtensible getHeaderToolbar() { + return headerToolbar; + } - @Override - public SimplePanel getPublicSpace() { - return publicSpace; - } + @Override + public SimplePanel getPublicSpace() { + return publicSpace; + } - @Override - public ForIsWidget getSitebar() { - return sitebar; - } + @Override + public ForIsWidget getSitebar() { + return sitebar; + } - @Override - public IsActionExtensible getSubheaderToolbar() { - return subheaderToolbar; - } + @Override + public IsActionExtensible getSubheaderToolbar() { + return subheaderToolbar; + } - @Override - public ForIsWidget getUserSpace() { - return userSpace; - } + @Override + public ForIsWidget getUserSpace() { + return userSpace; + } - @Override - public void selectGroupSpace() { - tabs.selectTab(groupSpace); - } + @Override + public void selectGroupSpace() { + tabs.selectTab(groupSpace); + } - @Override - public void selectHomeSpace() { - tabs.selectTab(homeSpace); - } + @Override + public void selectHomeSpace() { + tabs.selectTab(homeSpace); + } - @Override - public void selectPublicSpace() { - tabs.selectTab(publicSpace); - } + @Override + public void selectPublicSpace() { + tabs.selectTab(publicSpace); + } - @Override - public void selectUserSpace() { - tabs.selectTab(userSpace); - } + @Override + public void selectUserSpace() { + tabs.selectTab(userSpace); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-04-28 18:00:03 UTC (rev 1326) +++ trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-04-28 18:56:20 UTC (rev 1327) @@ -123,8 +123,8 @@ -webkit-border-top-right-radius: 7px; -moz-border-radius-topright: 7px; border-top-right-radius: 7px; - padding: 5px; } +.docEditor div { overflow-y: visible; } .docFooter { border-left: 1px solid #959595; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-04-28 18:00:03 UTC (rev 1326) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-04-28 18:56:20 UTC (rev 1327) @@ -1,6 +1,25 @@ package cc.kune.gspace.client.viewers; +import org.waveprotocol.box.webclient.client.ClientIdGenerator; +import org.waveprotocol.box.webclient.client.RemoteViewServiceMultiplexer; +import org.waveprotocol.box.webclient.client.Session; +import org.waveprotocol.box.webclient.client.SimpleWaveStore; +import org.waveprotocol.box.webclient.client.StagesProvider; +import org.waveprotocol.box.webclient.client.WaveWebSocketClient; +import org.waveprotocol.box.webclient.search.WaveStore; +import org.waveprotocol.box.webclient.widget.frame.FramedPanel; +import org.waveprotocol.box.webclient.widget.loading.LoadingIndicator; +import org.waveprotocol.wave.client.account.ProfileManager; +import org.waveprotocol.wave.client.account.impl.ProfileManagerImpl; +import org.waveprotocol.wave.client.widget.common.ImplPanel; +import org.waveprotocol.wave.model.id.IdGenerator; +import org.waveprotocol.wave.model.wave.ParticipantId; +import org.waveprotocol.wave.model.waveref.InvalidWaveRefException; +import org.waveprotocol.wave.model.waveref.WaveRef; +import org.waveprotocol.wave.util.escapers.GwtWaverefEncoder; + import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.errors.UIException; import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.UiUtils; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; @@ -9,12 +28,16 @@ import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.viewers.DocViewerPresenter.DocViewerView; import cc.kune.wave.client.WaveClientManager; +import cc.kune.wave.client.WebClient; import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.Document; +import com.google.gwt.dom.client.Element; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.Command; import com.google.gwt.user.client.ui.DeckPanel; import com.google.gwt.user.client.ui.InlineHTML; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; @@ -28,24 +51,24 @@ private static DocsViewerPanelUiBinder uiBinder = GWT.create(DocsViewerPanelUiBinder.class); - // private RemoteViewServiceMultiplexer channel; + private RemoteViewServiceMultiplexer channel; @UiField DeckPanel deck; private final GSpaceArmor gsArmor; private final IconsRegistry iconRegistry; - // private IdGenerator idGenerator; - // private final Element loading = new LoadingIndicator().getElement(); + private IdGenerator idGenerator; + private final Element loading = new LoadingIndicator().getElement(); @UiField InlineHTML onlyViewPanel; - // private ProfileManager profiles; + private ProfileManager profiles; /** The wave panel, if a wave is open. */ - // private StagesProvider wave; - // private final WaveClientManager waveClientManager; - // @UiField - // FramedPanel waveFrame; - // @UiField - // ImplPanel waveHolder; - // private final WaveStore waveStore = new SimpleWaveStore(); + private StagesProvider wave; + private final WaveClientManager waveClientManager; + @UiField + FramedPanel waveFrame; + @UiField + ImplPanel waveHolder; + private final WaveStore waveStore = new SimpleWaveStore(); private final Widget widget; @Inject @@ -53,7 +76,7 @@ final ContentCapabilitiesRegistry capabilitiesRegistry) { this.gsArmor = wsArmor; this.iconRegistry = capabilitiesRegistry.getIconsRegistry(); - // this.waveClientManager = waveClientManager; + this.waveClientManager = waveClientManager; widget = uiBinder.createAndBindUi(this); } @@ -81,27 +104,26 @@ clear(); } - // private WaveRef getWaveRef(final String waveRefS) { - // try { - // return GwtWaverefEncoder.decodeWaveRefFromPath(waveRefS); - // } catch (final InvalidWaveRefException e) { - // throw new UIException("Invalid waveref: " + waveRefS); - // } - // } - // - // private void initWaveClientIfNeeded() { - // if (channel == null) { - // final WaveWebSocketClient webSocket = new - // WaveWebSocketClient(WebClient.useSocketIO(), - // WebClient.getWebSocketBaseUrl(GWT.getModuleBaseURL())); - // webSocket.connect(); - // channel = new RemoteViewServiceMultiplexer(webSocket, - // new ParticipantId(Session.get().getAddress()).getAddress()); - // profiles = new ProfileManagerImpl(); - // idGenerator = ClientIdGenerator.create(); - // } - // } + private WaveRef getWaveRef(final String waveRefS) { + try { + return GwtWaverefEncoder.decodeWaveRefFromPath(waveRefS); + } catch (final InvalidWaveRefException e) { + throw new UIException("Invalid waveref: " + waveRefS); + } + } + private void initWaveClientIfNeeded() { + if (channel == null) { + final WaveWebSocketClient webSocket = new WaveWebSocketClient(WebClient.useSocketIO(), + WebClient.getWebSocketBaseUrl(GWT.getModuleBaseURL())); + webSocket.connect(); + channel = new RemoteViewServiceMultiplexer(webSocket, + new ParticipantId(Session.get().getAddress()).getAddress()); + profiles = new ProfileManagerImpl(Session.get().getDomain()); + idGenerator = ClientIdGenerator.create(); + } + } + @Override public void setActions(final GuiActionDescCollection actions) { gsArmor.getSubheaderToolbar().clear(); @@ -112,47 +134,43 @@ public void setContent(final StateContentDTO state) { final ForIsWidget docHeader = gsArmor.getDocHeader(); UiUtils.clear(docHeader); - // docHeader.add(new InlineLabel(state.getTitle())); docHeader.add(new IconLabel((ImageResource) iconRegistry.getContentTypeIcon(state.getTypeId(), state.getMimeType()), state.getTitle())); final boolean editable = state.getContentRights().isEditable(); if (editable) { - // initWaveClientIfNeeded(); - // setEditableWaveContent(state.getWaveRef(), false); + initWaveClientIfNeeded(); + setEditableWaveContent(state.getWaveRef(), false); // waveHolder.clear(); - // waveHolder.add(new Label(state.getContent() + - // " (but here goes the Wave editor -we are testing it-)")); - onlyViewPanel.setHTML(SafeHtmlUtils.fromTrustedString(state.getContent())); + // waveHolder.add(new Label(state.getContent() + // + " (but here goes the Wave editor -we are testing it-)")); + // onlyViewPanel.setHTML(SafeHtmlUtils.fromTrustedString(state.getContent())); } else { onlyViewPanel.setHTML(SafeHtmlUtils.fromTrustedString(state.getContent())); } // deck.showWidget(editable ? 0 : 1); deck.showWidget(1); } - // - // private void setEditableWaveContent(final String waveRefS, final boolean - // isNewWave) { - // final WaveRef waveRef = getWaveRef(waveRefS); - // - // if (wave != null) { - // wave.destroy(); - // wave = null; - // } - // - // // Release the display:none. - // // UIObject.setVisible(waveFrame.getElement(), true); - // waveHolder.getElement().appendChild(loading); - // final Element holder = - // waveHolder.getElement().appendChild(Document.get().createDivElement()); - // final StagesProvider wave = new StagesProvider(holder, waveHolder, - // waveRef, channel, idGenerator, profiles, - // waveStore, isNewWave); - // this.wave = wave; - // wave.load(new Command() { - // @Override - // public void execute() { - // loading.removeFromParent(); - // } - // }); - // } + + private void setEditableWaveContent(final String waveRefS, final boolean isNewWave) { + final WaveRef waveRef = getWaveRef(waveRefS); + + if (wave != null) { + wave.destroy(); + wave = null; + } + + // Release the display:none. + // UIObject.setVisible(waveFrame.getElement(), true); + waveHolder.getElement().appendChild(loading); + final Element holder = waveHolder.getElement().appendChild(Document.get().createDivElement()); + final StagesProvider wave = new StagesProvider(holder, waveHolder, waveRef, channel, idGenerator, + profiles, waveStore, isNewWave); + this.wave = wave; + wave.load(new Command() { + @Override + public void execute() { + loading.removeFromParent(); + } + }); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.ui.xml 2011-04-28 18:00:03 UTC (rev 1326) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.ui.xml 2011-04-28 18:56:20 UTC (rev 1327) @@ -4,24 +4,23 @@ xmlns:w='urn:import:org.waveprotocol.wave.client.widget.common'> <ui:style> .wavePanel { - margin: 0 0 0 0; + margin: 0 0 0 0; } .waveHolder { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; } </ui:style> <g:HTMLPanel width="100%" height="100%"> <g:DeckPanel ui:field="deck" addStyleNames="k-doc-content-deck"> -  -  -  - <g:InlineHTML ui:field="delete" /> + <f:FramedPanel ui:field="waveFrame" addStyleNames="{style.wavePanel}"> + </f:FramedPanel> + <w:ImplPanel ui:field="waveHolder" addStyleNames="{style.waveHolder}" /> + <g:InlineHTML ui:field="onlyViewPanel" /> </g:DeckPanel> </g:HTMLPanel> Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-04-28 18:00:03 UTC (rev 1326) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-04-28 18:56:20 UTC (rev 1327) @@ -47,6 +47,7 @@ this.guiProvider = guiProvider; this.res = res; widget = uiBinder.createAndBindUi(this); + widget.addStyleName("k-folder-viewer"); } @Override Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-04-28 18:00:03 UTC (rev 1326) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-04-28 18:56:20 UTC (rev 1327) @@ -262,9 +262,13 @@ * Returns <code>ws://yourhost[:port]/</code>. */ // XXX check formatting wrt GPE - private native String getWebSocketBaseUrl(String moduleBase) /*-{return "ws" + /:\/\/[^\/]+/.exec(moduleBase)[0] + "/";}-*/; + public native static String getWebSocketBaseUrl(String moduleBase) /*-{ + return "ws" + /:\/\/[^\/]+/.exec(moduleBase)[0] + "/"; + }-*/; - private native boolean useSocketIO() /*-{ return !!$wnd.__useSocketIO }-*/; + public native static boolean useSocketIO() /*-{ + return !!$wnd.__useSocketIO + }-*/; /** */

1 0

28 Apr '11

Author: vjrj_ Date: 2011-04-28 20:00:03 +0200 (Thu, 28 Apr 2011) New Revision: 1326 Added: trunk/src/main/java/cc/kune/common/public/images/corner.png trunk/src/main/java/cc/kune/common/public/images/corner_ie6.png Modified: trunk/script/repopubli.sh trunk/src/main/java/cc/kune/chat/client/snd/SndClickEvent.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPanel.java trunk/src/main/java/cc/kune/wave/client/WebClient.java trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java trunk/src/main/java/cc/kune/wave/server/WaveMain.java Log: WIAB updated, minor fixes Modified: trunk/script/repopubli.sh =================================================================== --- trunk/script/repopubli.sh 2011-04-28 13:50:23 UTC (rev 1325) +++ trunk/script/repopubli.sh 2011-04-28 18:00:03 UTC (rev 1326) @@ -5,7 +5,7 @@ echo "$0 -j target/emite-0.4.6-emiteuimodule.jar -g com.calclab.emite -a emite -v 0.4.6" } -PACKAGING=jar +PACKAGING='jar' while getopts “hg:a:v:j:s” OPTION do @@ -27,7 +27,7 @@ JAR=$OPTARG ;; s) - PACKAGING=java-source + PACKAGING='java-source -DgeneratePom=false' ;; ?) usage @@ -47,5 +47,5 @@ -Dversion=$VER \ -Dpackaging=$PACKAGING \ -Dfile=$JAR \ - -DrepositoryId=kune.ourproject.org \ - -Durl=scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/ + -Durl=scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/ \ + -DrepositoryId=kune.ourproject.org Modified: trunk/src/main/java/cc/kune/chat/client/snd/SndClickEvent.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/snd/SndClickEvent.java 2011-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/chat/client/snd/SndClickEvent.java 2011-04-28 18:00:03 UTC (rev 1326) @@ -7,7 +7,7 @@ public class SndClickEvent extends GwtEvent<SndClickEvent.SndClickHandler> { - public interface HasClickHandlers extends HasHandlers { + public interface HasSndClickHandlers extends HasHandlers { HandlerRegistration addSndClickHandler(SndClickHandler handler); } Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-04-28 18:00:03 UTC (rev 1326) @@ -24,6 +24,7 @@ import cc.kune.common.client.ui.dialogs.BasicTopDialog; import cc.kune.common.client.ui.dialogs.MessageToolbar; +import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.logical.shared.HasCloseHandlers; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.DecoratedTabPanel; @@ -31,149 +32,161 @@ import com.google.gwt.user.client.ui.Widget; public abstract class AbstractTabbedDialogPanel implements AbstractTabbedDialogView { - private BasicTopDialog dialog; - private final String dialogId; - private final String errorLabelId; - private final String firstBtnId; - private final String firstBtnTitle; - private final int height; - private String iconCls; - private final NotifyLevelImages images; - private MessageToolbar messageErrorBar; - private final int minHeight; - private final int minWidth; - private final boolean modal; - private final String sndBtnId; - private final String sndBtnTitle; - private DecoratedTabPanel tabPanel; - private String title; - private final int width; + private BasicTopDialog dialog; + private final String dialogId; + private final String errorLabelId; + private final String firstBtnId; + private final String firstBtnTitle; + private final int height; + private String iconCls; + private final NotifyLevelImages images; + private MessageToolbar messageErrorBar; + private final int minHeight; + private final int minWidth; + private final boolean modal; + private final String sndBtnId; + private final String sndBtnTitle; + private DecoratedTabPanel tabPanel; + private String title; + private final int width; - public AbstractTabbedDialogPanel(final String dialogId, final String title, final int width, final int height, - final int minWidth, final int minHeight, final boolean modal, final NotifyLevelImages images, - final String errorLabelId, final String firstBtnTitle, final String firstBtnId, final String sndBtnTitle, - final String sndBtnId) { - this.dialogId = dialogId; - this.title = title; - this.width = width; - this.height = height; - this.modal = modal; - this.images = images; - this.errorLabelId = errorLabelId; - // Not used: - this.minWidth = minWidth; - this.minHeight = minHeight; - this.firstBtnTitle = firstBtnTitle; - this.firstBtnId = firstBtnId; - this.sndBtnTitle = sndBtnTitle; - this.sndBtnId = sndBtnId; - } + public AbstractTabbedDialogPanel(final String dialogId, final String title, final int width, + final int height, final int minWidth, final int minHeight, final boolean modal, + final NotifyLevelImages images, final String errorLabelId, final String firstBtnTitle, + final String firstBtnId, final String sndBtnTitle, final String sndBtnId) { + this.dialogId = dialogId; + this.title = title; + this.width = width; + this.height = height; + this.modal = modal; + this.images = images; + this.errorLabelId = errorLabelId; + // Not used: + this.minWidth = minWidth; + this.minHeight = minHeight; + this.firstBtnTitle = firstBtnTitle; + this.firstBtnId = firstBtnId; + this.sndBtnTitle = sndBtnTitle; + this.sndBtnId = sndBtnId; + } - @Override - public void activateTab(final int index) { - createDialogIfNecessary(); - tabPanel.selectTab(index); - } + @Override + public void activateTab(final int index) { + createDialogIfNecessary(); + tabPanel.selectTab(index); + } - @Override - public void addTab(final IsWidget view, final IsWidget tabWidget) { - createDialogIfNecessary(); - tabPanel.add(view, tabWidget); - } + @Override + public void addTab(final IsWidget view, final IsWidget tabWidget) { + createDialogIfNecessary(); + tabPanel.add(view, tabWidget); + } - @Override - public void createAndShow() { - show(); - setFirstTabActive(); - } + @Override + public void createAndShow() { + show(); + setFirstTabActive(); + } - private void createDialog() { - dialog = new BasicTopDialog.Builder(dialogId, true, modal).autoscroll(true).width(width).height(height).icon( - iconCls).firstButtonId(firstBtnId).firstButtonTitle(firstBtnTitle).sndButtonId(dialogId).sndButtonTitle( - sndBtnTitle).build(); - messageErrorBar = new MessageToolbar(images, errorLabelId); - tabPanel = new DecoratedTabPanel(); - dialog.getInnerPanel().add(tabPanel); - } + private void createDialog() { + dialog = new BasicTopDialog.Builder(dialogId, true, modal).autoscroll(true).width(width).height( + height).icon(iconCls).firstButtonId(firstBtnId).firstButtonTitle(firstBtnTitle).sndButtonId( + dialogId).sndButtonTitle(sndBtnTitle).build(); + messageErrorBar = new MessageToolbar(images, errorLabelId); + tabPanel = new DecoratedTabPanel(); + dialog.getInnerPanel().add(tabPanel); + } - private void createDialogIfNecessary() { - if (dialog == null) { - createDialog(); - } + private void createDialogIfNecessary() { + if (dialog == null) { + createDialog(); } + } - @Override - public void destroy() { - if (dialog != null) { - dialog.removeFromParent(); - dialog = null; - } + @Override + public void destroy() { + if (dialog != null) { + dialog.removeFromParent(); + dialog = null; } + } - public HasCloseHandlers<?> getClose() { - return dialog.getClose(); - } + public HasCloseHandlers<?> getClose() { + createDialogIfNecessary(); + return dialog.getClose(); + } - public Widget getWidget() { - return dialog; - } + public HasClickHandlers getFirstBtn() { + createDialogIfNecessary(); + return dialog.getFirstBtn(); + } - @Override - public void hide() { - if (dialog != null) { - if (dialog.isVisible()) { - dialog.hide(); - } - } - } + public HasClickHandlers getSecondBtn() { + createDialogIfNecessary(); + return dialog.getSecondBtn(); + } - @Override - public void hideMessages() { - if (dialog != null) { - messageErrorBar.hideErrorMessage(); - } - } + public Widget getWidget() { + createDialogIfNecessary(); + return dialog; + } - @Override - public void insertTab(final IsWidget tab, final IsWidget tabTitle, final int index) { - createDialogIfNecessary(); - tabPanel.insert(tab, tabTitle, index); + @Override + public void hide() { + if (dialog != null) { + if (dialog.isVisible()) { + dialog.hide(); + } } + } - public boolean isVisible() { - createDialogIfNecessary(); - return dialog.isVisible(); + @Override + public void hideMessages() { + if (dialog != null) { + messageErrorBar.hideErrorMessage(); } + } - @Override - public void setErrorMessage(final String message, final NotifyLevel level) { - messageErrorBar.setErrorMessage(message, level); - } + @Override + public void insertTab(final IsWidget tab, final IsWidget tabTitle, final int index) { + createDialogIfNecessary(); + tabPanel.insert(tab, tabTitle, index); + } - public void setFirstTabActive() { - tabPanel.selectTab(0); - } + public boolean isVisible() { + createDialogIfNecessary(); + return dialog.isVisible(); + } - public void setIcon(final ImageResource icon) { - dialog.setTitleIcon(icon); - } + @Override + public void setErrorMessage(final String message, final NotifyLevel level) { + messageErrorBar.setErrorMessage(message, level); + } - public void setIconCls(final String iconCls) { - this.iconCls = iconCls; - if (dialog != null) { - dialog.setTitleIcon(iconCls); - } + public void setFirstTabActive() { + tabPanel.selectTab(0); + } + + public void setIcon(final ImageResource icon) { + dialog.setTitleIcon(icon); + } + + public void setIconCls(final String iconCls) { + this.iconCls = iconCls; + if (dialog != null) { + dialog.setTitleIcon(iconCls); } + } - public void setTitle(final String title) { - this.title = title; - if (dialog != null) { - dialog.setTitle(title); - } + public void setTitle(final String title) { + this.title = title; + if (dialog != null) { + dialog.setTitle(title); } + } - public void show() { - createDialogIfNecessary(); - dialog.showCentered(); - } + public void show() { + createDialogIfNecessary(); + dialog.showCentered(); + } } Added: trunk/src/main/java/cc/kune/common/public/images/corner.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/common/public/images/corner.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/common/public/images/corner_ie6.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/common/public/images/corner_ie6.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-04-28 18:00:03 UTC (rev 1326) @@ -531,4 +531,90 @@ _filter: chroma(color = pink); } -/* end tooltip */ \ No newline at end of file +/* end tooltip */ + +/* tabbar */ + +.gwt-DecoratedTabBar { +} +.gwt-DecoratedTabBar .gwt-TabBarFirst { + width: 5px; /* first tab distance from the left */ +} +.gwt-DecoratedTabBar .gwt-TabBarRest { +} +.gwt-DecoratedTabBar .gwt-TabBarItem { + border-collapse: collapse; + margin-left: 6px; +} +.gwt-DecoratedTabBar .tabTopCenter { + padding: 0px; + background: #e3e3e3; +} +.gwt-DecoratedTabBar .tabTopLeft, +.gwt-DecoratedTabBar .tabTopRight { + padding: 0px; + zoom: 1; +} +.gwt-DecoratedTabBar .tabTopLeftInner, +.gwt-DecoratedTabBar .tabTopRightInner { + width: 6px; + height: 6px; +} +.gwt-DecoratedTabBar .tabTopLeft { + background: url(images/corner.png) no-repeat 0px -55px; + -background: url(images/corner_ie6.png) no-repeat 0px -55px; +} +.gwt-DecoratedTabBar .tabTopRight { + background: url(images/corner.png) no-repeat -6px -55px; + -background: url(images/corner_ie6.png) no-repeat -6px -55px; +} +* html .gwt-DecoratedTabBar .tabTopLeftInner, +* html .gwt-DecoratedTabBar .tabTopRightInner { + width: 6px; + height: 6px; + overflow: hidden; +} +.gwt-DecoratedTabBar .tabMiddleLeft, +.gwt-DecoratedTabBar .tabMiddleRight { + width: 6px; + padding: 0px; + background: #e3e3e3 url(images/hborder.png) repeat-x 0px -1463px; +} +.gwt-DecoratedTabBar .tabMiddleLeftInner, +.gwt-DecoratedTabBar .tabMiddleRightInner { + width: 1px; + height: 1px; +} +.gwt-DecoratedTabBar .tabMiddleCenter { + padding: 0px 4px 2px 4px; + cursor: pointer; + cursor: hand; + color: black; + font-weight: bold; + text-align: center; + background: #e3e3e3 url(images/hborder.png) repeat-x 0px -1463px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopCenter { + background: #747474; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopLeft { + background-position: 0px -61px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopRight { + background-position: -6px -61px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleLeft, +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleRight { + background: #bcbcbc url(images/hborder.png) repeat-x 0px -2511px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleCenter { + cursor: default; + background: #bcbcbc url(images/hborder.png) repeat-x 0px -2511px; + color: white; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-disabled .tabMiddleCenter { + cursor: default; + color: #999999; +} + +/* End tabbar */ \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2011-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2011-04-28 18:00:03 UTC (rev 1326) @@ -42,124 +42,128 @@ import com.google.inject.Inject; import com.google.inject.Singleton; +import com.google.wave.api.Wavelet; @Singleton public class StateServiceDefault implements StateService { - private final ContentManager contentManager; - private final GroupManager groupManager; - private final I18nTranslationService i18n; - private final KuneWaveManager kuneWaveManager; - private final AccessRightsService rightsService; - private final SocialNetworkManager socialNetworkManager; - private final TagUserContentManager tagManager; + private final ContentManager contentManager; + private final GroupManager groupManager; + private final I18nTranslationService i18n; + private final KuneWaveManager kuneWaveManager; + private final AccessRightsService rightsService; + private final SocialNetworkManager socialNetworkManager; + private final TagUserContentManager tagManager; - @Inject - public StateServiceDefault(final GroupManager groupManager, final SocialNetworkManager socialNetworkManager, - final ContentManager contentManager, final TagUserContentManager tagManager, - final AccessRightsService rightsService, final I18nTranslationService i18n, - final KuneWaveManager kuneWaveManager) { - this.groupManager = groupManager; - this.socialNetworkManager = socialNetworkManager; - this.contentManager = contentManager; - this.tagManager = tagManager; - this.rightsService = rightsService; - this.i18n = i18n; - this.kuneWaveManager = kuneWaveManager; - } + @Inject + public StateServiceDefault(final GroupManager groupManager, + final SocialNetworkManager socialNetworkManager, final ContentManager contentManager, + final TagUserContentManager tagManager, final AccessRightsService rightsService, + final I18nTranslationService i18n, final KuneWaveManager kuneWaveManager) { + this.groupManager = groupManager; + this.socialNetworkManager = socialNetworkManager; + this.contentManager = contentManager; + this.tagManager = tagManager; + this.rightsService = rightsService; + this.i18n = i18n; + this.kuneWaveManager = kuneWaveManager; + } - private Container calculateRootContainer(final Container container) { - return container.isRoot() ? container : container.getAbsolutePath().get(0); - } + private Container calculateRootContainer(final Container container) { + return container.isRoot() ? container : container.getAbsolutePath().get(0); + } - @Override - public StateContainer create(final User userLogged, final Container container) { - final StateContainer state = new StateContainer(); - state.setTitle(container.getName()); - state.setTypeId(container.getTypeId()); - state.setLanguage(container.getLanguage()); - state.setStateToken(container.getStateToken()); - state.setRootContainer(calculateRootContainer(container)); - state.setLicense(container.getOwner().getDefaultLicense()); - state.setAccessLists(container.getAccessLists()); - final Group group = container.getOwner(); - setCommon(state, userLogged, group, container); - return state; - } + @Override + public StateContainer create(final User userLogged, final Container container) { + final StateContainer state = new StateContainer(); + state.setTitle(container.getName()); + state.setTypeId(container.getTypeId()); + state.setLanguage(container.getLanguage()); + state.setStateToken(container.getStateToken()); + state.setRootContainer(calculateRootContainer(container)); + state.setLicense(container.getOwner().getDefaultLicense()); + state.setAccessLists(container.getAccessLists()); + final Group group = container.getOwner(); + setCommon(state, userLogged, group, container); + return state; + } - @Override - public StateContent create(final User userLogged, final Content content) { - final StateContent state = new StateContent(); - final String typeId = content.getTypeId(); - state.setTypeId(typeId); - state.setMimeType(content.getMimeType()); - state.setDocumentId(content.getId().toString()); - state.setLanguage(content.getLanguage()); - state.setPublishedOn(content.getPublishedOn()); - state.setAuthors(content.getAuthors()); - state.setTags(tagManager.getTagsAsString(userLogged, content)); - state.setStatus(content.getStatus()); - state.setStateToken(content.getStateToken()); - final Revision revision = content.getLastRevision(); - state.setTitle(revision.getTitle()); - state.setVersion(content.getVersion()); - final char[] text = revision.getBody(); - final String textBody = text == null ? null : new String(text); - if (typeId.equals(TYPE_DOCUMENT) || (typeId.equals(TYPE_POST))) { - state.setWaveRef(textBody); - try { - state.setContent(kuneWaveManager.fetchWavelet(JavaWaverefEncoder.decodeWaveRefFromPath(textBody), - content.getAuthors().get(0).getShortName()).getRootBlip().getContent()); - } catch (final InvalidWaveRefException e) { - throw new DefaultException("Error retriving Wave"); - } - } else { - state.setContent(textBody); - } - final Container container = content.getContainer(); - state.setRootContainer(calculateRootContainer(container)); - final License license = content.getLicense(); - final Group group = container.getOwner(); - state.setLicense(license == null ? group.getDefaultLicense() : license); - state.setContentRights(rightsService.get(userLogged, content.getAccessLists())); - state.setAccessLists(content.getAccessLists()); - setCommon(state, userLogged, group, container); - if (userLogged != User.UNKNOWN_USER) { - state.setCurrentUserRate(contentManager.getRateContent(userLogged, content)); - } - // FIXME: user RateResult - final Double rateAvg = contentManager.getRateAvg(content); - state.setRate(rateAvg != null ? rateAvg : 0D); - final Long rateByUsers = contentManager.getRateByUsers(content); - state.setRateByUsers(rateByUsers != null ? rateByUsers.intValue() : 0); - return state; + @Override + public StateContent create(final User userLogged, final Content content) { + final StateContent state = new StateContent(); + final String typeId = content.getTypeId(); + state.setTypeId(typeId); + state.setMimeType(content.getMimeType()); + state.setDocumentId(content.getId().toString()); + state.setLanguage(content.getLanguage()); + state.setPublishedOn(content.getPublishedOn()); + state.setAuthors(content.getAuthors()); + state.setTags(tagManager.getTagsAsString(userLogged, content)); + state.setStatus(content.getStatus()); + state.setStateToken(content.getStateToken()); + final Revision revision = content.getLastRevision(); + state.setVersion(content.getVersion()); + final char[] text = revision.getBody(); + final String textBody = text == null ? null : new String(text); + if (typeId.equals(TYPE_DOCUMENT) || (typeId.equals(TYPE_POST))) { + state.setWaveRef(textBody); + try { + final Wavelet wavelet = kuneWaveManager.fetchWavelet( + JavaWaverefEncoder.decodeWaveRefFromPath(textBody), + content.getAuthors().get(0).getShortName()); + state.setContent(wavelet.getRootBlip().getContent()); + state.setTitle(wavelet.getTitle()); + } catch (final InvalidWaveRefException e) { + throw new DefaultException("Error retriving Wave"); + } + } else { + state.setContent(textBody); + state.setTitle(revision.getTitle()); } - - @Override - public StateNoContent createNoHome(final User userLogged, final String groupShortName) { - final Group group = groupManager.findByShortName(groupShortName); - assert (group.isPersonal()); - final StateNoContent state = new StateNoContent(); - state.setGroup(group); - state.setEnabledTools(groupManager.findEnabledTools(group.getId())); - setSocialNetwork(state, userLogged, group); - state.setStateToken(group.getStateToken()); - state.setTitle("<h2>" + i18n.t("This user does not have a homepage") + "</h2>"); - return state; + final Container container = content.getContainer(); + state.setRootContainer(calculateRootContainer(container)); + final License license = content.getLicense(); + final Group group = container.getOwner(); + state.setLicense(license == null ? group.getDefaultLicense() : license); + state.setContentRights(rightsService.get(userLogged, content.getAccessLists())); + state.setAccessLists(content.getAccessLists()); + setCommon(state, userLogged, group, container); + if (userLogged != User.UNKNOWN_USER) { + state.setCurrentUserRate(contentManager.getRateContent(userLogged, content)); } + // FIXME: user RateResult + final Double rateAvg = contentManager.getRateAvg(content); + state.setRate(rateAvg != null ? rateAvg : 0D); + final Long rateByUsers = contentManager.getRateByUsers(content); + state.setRateByUsers(rateByUsers != null ? rateByUsers.intValue() : 0); + return state; + } - private void setCommon(final StateContainer state, final User userLogged, final Group group, - final Container container) { - state.setToolName(container.getToolName()); - state.setGroup(group); - state.setContainer(container); - state.setContainerRights(rightsService.get(userLogged, container.getAccessLists())); - state.setEnabledTools(groupManager.findEnabledTools(group.getId())); - state.setTagCloudResult(tagManager.getTagCloudResultByGroup(group)); - setSocialNetwork(state, userLogged, group); - } + @Override + public StateNoContent createNoHome(final User userLogged, final String groupShortName) { + final Group group = groupManager.findByShortName(groupShortName); + assert (group.isPersonal()); + final StateNoContent state = new StateNoContent(); + state.setGroup(group); + state.setEnabledTools(groupManager.findEnabledTools(group.getId())); + setSocialNetwork(state, userLogged, group); + state.setStateToken(group.getStateToken()); + state.setTitle("<h2>" + i18n.t("This user does not have a homepage") + "</h2>"); + return state; + } - private void setSocialNetwork(final StateAbstract state, final User userLogged, final Group group) { - state.setSocialNetworkData(socialNetworkManager.getSocialNetworkData(userLogged, group)); - } + private void setCommon(final StateContainer state, final User userLogged, final Group group, + final Container container) { + state.setToolName(container.getToolName()); + state.setGroup(group); + state.setContainer(container); + state.setContainerRights(rightsService.get(userLogged, container.getAccessLists())); + state.setEnabledTools(groupManager.findEnabledTools(group.getId())); + state.setTagCloudResult(tagManager.getTagCloudResultByGroup(group)); + setSocialNetwork(state, userLogged, group); + } + + private void setSocialNetwork(final StateAbstract state, final User userLogged, final Group group) { + state.setSocialNetworkData(socialNetworkManager.getSocialNetworkData(userLogged, group)); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java 2011-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java 2011-04-28 18:00:03 UTC (rev 1326) @@ -23,6 +23,7 @@ public interface EntityOptionsView extends AbstractTabbedDialogView { - int HEIGHT = 270; + int HEIGHT = 270; + int WIDTH = 400; } Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-04-28 18:00:03 UTC (rev 1326) @@ -26,44 +26,52 @@ import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.i18n.I18nTranslationService; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; public class GroupOptionsPanel extends AbstractTabbedDialogPanel implements GroupOptionsView { - public static final String GROUP_OP_PANEL_ID = "k-gop-diagpan"; - public static final String GROUP_OPTIONS_ERROR_ID = "k-gop-err-mess"; - private final EntityHeader entityHeader; - private final GroupOptionsCollection entityPreferencesGroup; + public static final String GROUP_OP_PANEL_ID = "k-gop-diagpan"; + public static final String GROUP_OPTIONS_ERROR_ID = "k-gop-err-mess"; + private final EntityHeader entityHeader; + private final GroupOptionsCollection entityPreferencesGroup; - @Inject - public GroupOptionsPanel(final EntityHeader entityHeader, final I18nTranslationService i18n, - final NotifyLevelImages images, final GroupOptionsCollection entityOptionsGroup) { - super(GROUP_OP_PANEL_ID, "", 400, HEIGHT + 80, 400, HEIGHT + 80, false, images, GROUP_OPTIONS_ERROR_ID, - i18n.t("Close"), null, null, null); - this.entityHeader = entityHeader; - this.entityPreferencesGroup = entityOptionsGroup; - super.setIconCls("k-options-icon"); - super.setTitle(i18n.t(CoreMessages.GROUP_OPTIONS_DIALOG_TITLE)); - } + @Inject + public GroupOptionsPanel(final EntityHeader entityHeader, final I18nTranslationService i18n, + final NotifyLevelImages images, final GroupOptionsCollection entityOptionsGroup) { + super(GROUP_OP_PANEL_ID, "", WIDTH, HEIGHT + 80, WIDTH, HEIGHT + 80, false, images, + GROUP_OPTIONS_ERROR_ID, i18n.t("Close"), null, null, null); + this.entityHeader = entityHeader; + this.entityPreferencesGroup = entityOptionsGroup; + super.setIconCls("k-options-icon"); + super.setTitle(i18n.t(CoreMessages.GROUP_OPTIONS_DIALOG_TITLE)); + } - @Override - public void addAction(final GuiActionDescrip descriptor) { - entityHeader.addAction(descriptor); - } + @Override + public void addAction(final GuiActionDescrip descriptor) { + entityHeader.addAction(descriptor); + } - @Override - public Widget asWidget() { - return super.getWidget(); - } + @Override + public Widget asWidget() { + return super.getWidget(); + } - @Override - public void createAndShow() { - createAndShowItImpl(); - } + @Override + public void createAndShow() { + createAndShowItImpl(); + } - private void createAndShowItImpl() { - entityPreferencesGroup.createAll(); - super.createAndShow(); - } + private void createAndShowItImpl() { + super.getFirstBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + hide(); + } + }); + entityPreferencesGroup.createAll(); + super.createAndShow(); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-04-28 18:00:03 UTC (rev 1326) @@ -25,38 +25,46 @@ import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.i18n.I18nTranslationService; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; public class UserOptionsPanel extends AbstractTabbedDialogPanel implements UserOptionsView { - public static final String USER_OP_PANEL_ID = "k-uop-diagpan"; - public static final String USER_OPTIONS_ERROR_ID = "k-uop-err-mess"; + public static final String USER_OP_PANEL_ID = "k-uop-diagpan"; + public static final String USER_OPTIONS_ERROR_ID = "k-uop-err-mess"; - private final UserOptionsCollection userPreferencesGroup; + private final UserOptionsCollection userPreferencesGroup; - @Inject - public UserOptionsPanel(final EntityHeader entityHeader, final I18nTranslationService i18n, - final NotifyLevelImages images, final UserOptionsCollection userOptionsGroup) { - super(USER_OP_PANEL_ID, "", 400, HEIGHT + 80, 400, HEIGHT + 80, false, images, USER_OPTIONS_ERROR_ID, - i18n.t("Close"), null, null, null); - this.userPreferencesGroup = userOptionsGroup; - super.setIconCls("k-options-icon"); - super.setTitle(i18n.t(CoreMessages.USER_OPTIONS_DIALOG_TITLE)); - } + @Inject + public UserOptionsPanel(final EntityHeader entityHeader, final I18nTranslationService i18n, + final NotifyLevelImages images, final UserOptionsCollection userOptionsGroup) { + super(USER_OP_PANEL_ID, "", WIDTH, HEIGHT + 80, WIDTH, HEIGHT + 80, false, images, + USER_OPTIONS_ERROR_ID, i18n.t("Close"), null, null, null); + this.userPreferencesGroup = userOptionsGroup; + super.setIconCls("k-options-icon"); + super.setTitle(i18n.t(CoreMessages.USER_OPTIONS_DIALOG_TITLE)); + } - @Override - public Widget asWidget() { - return super.getWidget(); - } + @Override + public Widget asWidget() { + return super.getWidget(); + } - @Override - public void createAndShow() { - createAndShowItImpl(); - } + @Override + public void createAndShow() { + createAndShowItImpl(); + } - private void createAndShowItImpl() { - userPreferencesGroup.createAll(); - super.createAndShow(); - } + private void createAndShowItImpl() { + super.getFirstBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + hide(); + } + }); + userPreferencesGroup.createAll(); + super.createAndShow(); + } } Modified: 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-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java 2011-04-28 18:00:03 UTC (rev 1326) @@ -37,51 +37,48 @@ public class EntityOptionsDefLicensePanel extends Composite implements EntityOptionsDefLicenseView { - private final Button change; - private final Image licenseImage; - private final IconLabel tabTitle; + 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")); - // super.setIconCls("k-copyleft-icon"); - // super.setFrame(true); - // super.getFormPanel().setButtonAlign(Position.LEFT); - final VerticalPanel vp = new VerticalPanel(); - final Label intro = new Label(); - 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):")); - vp.add(intro); + public EntityOptionsDefLicensePanel(final I18nTranslationService i18n, final CoreResources res) { + tabTitle = new IconLabel(res.copyleft(), i18n.t("License")); + final VerticalPanel vp = new VerticalPanel(); + final Label intro = new Label(); + 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):")); + vp.add(intro); + licenseImage = new Image(); + vp.add(licenseImage); + licenseImage.addStyleName("kune-pointer"); + change = new Button(i18n.t("Change")); + initWidget(vp); + super.setHeight(String.valueOf(EntityOptionsView.HEIGHT)); + super.setWidth(String.valueOf(EntityOptionsView.WIDTH)); + } - licenseImage = new Image(); - vp.add(licenseImage); - licenseImage.addStyleName("kune-pointer"); - change = new Button(i18n.t("Change")); - initWidget(vp); - super.setHeight(String.valueOf(EntityOptionsView.HEIGHT)); - } + @Override + public HasClickHandlers getChange() { + return change; + } - @Override - public HasClickHandlers getChange() { - return change; - } + @Override + public HasClickHandlers getLicenseImage() { + return licenseImage; + } - @Override - public HasClickHandlers getLicenseImage() { - return licenseImage; - } + @Override + public IsWidget getTabTitle() { + return tabTitle; + } - @Override - public IsWidget getTabTitle() { - return tabTitle; - } + @Override + public void openWindow(final String url) { + KuneWindowUtils.open(url); + } - @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()); - } + @Override + public void setLicense(final LicenseDTO defaultLicense) { + licenseImage.setUrl(defaultLicense.getImageUrl()); + Tooltip.to(licenseImage, defaultLicense.getLongName()); + } } Modified: 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-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPanel.java 2011-04-28 18:00:03 UTC (rev 1326) @@ -46,171 +46,172 @@ public class EntityOptionsLogoPanel extends Composite implements EntityOptionsLogoView { - public static final String ICON_UPLD_SERVLET = "servlets/EntityLogoUploadManager"; - private final Label dialogInfoLabel; - private final FileUpload fileUpload = new FileUpload(); - private final FormPanel form = new FormPanel(); - private final I18nTranslationService i18n; - private OnAcceptCallback onAccept; - private final IconLabel tabTitle; - private final Hidden tokenField; - private final Hidden userhashField; + public static final String ICON_UPLD_SERVLET = "servlets/EntityLogoUploadManager"; + private final Label dialogInfoLabel; + private final FileUpload fileUpload = new FileUpload(); + private final FormPanel form = new FormPanel(); + private final I18nTranslationService i18n; + private OnAcceptCallback onAccept; + private final IconLabel tabTitle; + private final Hidden tokenField; + private final Hidden userhashField; - // private final TextField file; + // private final TextField file; - 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(), ""); - // super.setButtonAlign(HorizontalAlignment.LEFT); - // super.setFrame(true); - // super.setAutoScroll(false); - // super.setBorder(false); - // super.setFileUpload(true); - // super.setWidth(400); - // super.setIconCls("k-picture-icon"); - // super.setMethod(Method.POST); - // super.setUrl(ICON_UPLD_SERVLET); - // super.setWaitMsgTarget(true); - // super.setHideLabels(true); - // super.setPadding(10); - // super.addFormListener(new FormListener() { - // @Override - // public boolean doBeforeAction(final Form form) { - // return true; - // } - // - // @Override - // public void onActionComplete(final Form form, final int httpStatus, - // final String responseText) { - // presenter.onSubmitComplete(httpStatus, responseText); - // } - // - // @Override - // public void onActionFailed(final Form form, final int httpStatus, - // final String responseText) { - // presenter.onSubmitFailed(httpStatus, responseText); - // } - // }); - // super.add(dialogInfoLabel); - // file = new TextField("File", inputId); - // final EventCallback keyListener = new EventCallback() { - // @Override - // public void execute(final EventObject e) { - // // setEnableFileField(); - // } - // }; - // file.addKeyPressListener(keyListener); - // file.setId(inputId); - // file.setInputType("file"); - // super.add(file); - // final FieldListenerAdapter changeListener = new - // FieldListenerAdapter() { - // @Override - // public void onChange(final Field field, final Object newVal, final - // Object oldVal) { - // NotifyUser.info("change"); - // // setEnableFileField(); - // } - // }; - // // Don't works: - // file.addListener(changeListener); - // setId(panelId); - // - // sendButton.setId(buttonId); - // super.addButton(sendButton); + 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(), ""); + // super.setButtonAlign(HorizontalAlignment.LEFT); + // super.setFrame(true); + // super.setAutoScroll(false); + // super.setBorder(false); + // super.setFileUpload(true); + // super.setWidth(400); + // super.setIconCls("k-picture-icon"); + // super.setMethod(Method.POST); + // super.setUrl(ICON_UPLD_SERVLET); + // super.setWaitMsgTarget(true); + // super.setHideLabels(true); + // super.setPadding(10); + // super.addFormListener(new FormListener() { + // @Override + // public boolean doBeforeAction(final Form form) { + // return true; + // } + // + // @Override + // public void onActionComplete(final Form form, final int httpStatus, + // final String responseText) { + // presenter.onSubmitComplete(httpStatus, responseText); + // } + // + // @Override + // public void onActionFailed(final Form form, final int httpStatus, + // final String responseText) { + // presenter.onSubmitFailed(httpStatus, responseText); + // } + // }); + // super.add(dialogInfoLabel); + // file = new TextField("File", inputId); + // final EventCallback keyListener = new EventCallback() { + // @Override + // public void execute(final EventObject e) { + // // setEnableFileField(); + // } + // }; + // file.addKeyPressListener(keyListener); + // file.setId(inputId); + // file.setInputType("file"); + // super.add(file); + // final FieldListenerAdapter changeListener = new + // FieldListenerAdapter() { + // @Override + // public void onChange(final Field field, final Object newVal, final + // Object oldVal) { + // NotifyUser.info("change"); + // // setEnableFileField(); + // } + // }; + // // Don't works: + // file.addListener(changeListener); + // setId(panelId); + // + // sendButton.setId(buttonId); + // super.addButton(sendButton); - dialogInfoLabel = new Label(); + dialogInfoLabel = new Label(); - form.setEncoding(FormPanel.ENCODING_MULTIPART); - form.setMethod(FormPanel.METHOD_POST); - form.setAction(GWT.getModuleBaseURL() + ICON_UPLD_SERVLET); + form.setEncoding(FormPanel.ENCODING_MULTIPART); + form.setMethod(FormPanel.METHOD_POST); + form.setAction(GWT.getModuleBaseURL() + ICON_UPLD_SERVLET); - userhashField = new Hidden(FileConstants.HASH, FileConstants.HASH); - tokenField = new Hidden(FileConstants.TOKEN, FileConstants.TOKEN); + userhashField = new Hidden(FileConstants.HASH, FileConstants.HASH); + tokenField = new Hidden(FileConstants.TOKEN, FileConstants.TOKEN); - final VerticalPanel holder = new VerticalPanel(); + final VerticalPanel holder = new VerticalPanel(); - fileUpload.setName("upload"); - holder.add(dialogInfoLabel); - holder.add(fileUpload); - holder.add(userhashField); - holder.add(tokenField); - holder.add(new Button(i18n.t("Send"), new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - Log.info("You selected: " + fileUpload.getFilename(), null); - form.submit(); - } - })); + fileUpload.setName("upload"); + holder.add(dialogInfoLabel); + holder.add(fileUpload); + holder.add(userhashField); + holder.add(tokenField); + holder.add(new Button(i18n.t("Send"), new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + Log.info("You selected: " + fileUpload.getFilename(), null); + form.submit(); + } + })); - form.addSubmitHandler(new FormPanel.SubmitHandler() { - @Override - public void onSubmit(final SubmitEvent event) { - // final String filename = file.getValueAsString(); - // if (filename != null && filename.length() > 0) { - // getForm().submit(); - // } + form.addSubmitHandler(new FormPanel.SubmitHandler() { + @Override + public void onSubmit(final SubmitEvent event) { + // final String filename = file.getValueAsString(); + // if (filename != null && filename.length() > 0) { + // getForm().submit(); + // } - if (!"".equalsIgnoreCase(fileUpload.getFilename())) { - GWT.log("UPLOADING FILE????", null); - // NOW WHAT???? - } else { - event.cancel(); // cancel the event - } + if (!"".equalsIgnoreCase(fileUpload.getFilename())) { + GWT.log("UPLOADING FILE????", null); + // NOW WHAT???? + } else { + event.cancel(); // cancel the event + } - } - }); + } + }); - form.addSubmitCompleteHandler(new FormPanel.SubmitCompleteHandler() { - @Override - public void onSubmitComplete(final SubmitCompleteEvent event) { - CurrentLogoChangedEvent.fire(eventBus); - } - }); - form.add(holder); - initWidget(form); - setHeight(String.valueOf(EntityOptionsView.HEIGHT)); - } + form.addSubmitCompleteHandler(new FormPanel.SubmitCompleteHandler() { + @Override + public void onSubmitComplete(final SubmitCompleteEvent event) { + CurrentLogoChangedEvent.fire(eventBus); + } + }); + form.add(holder); + initWidget(form); + setHeight(String.valueOf(EntityOptionsView.HEIGHT)); + setWidth(String.valueOf(EntityOptionsView.WIDTH)); + } - @Override - public OnAcceptCallback getOnSubmit() { - // TODO Auto-generated method stub - return null; - } + @Override + public OnAcceptCallback getOnSubmit() { + // TODO Auto-generated method stub + return null; + } - @Override - public IsWidget getTabTitle() { - return tabTitle; - } + @Override + public IsWidget getTabTitle() { + return tabTitle; + } - public void reset() { - form.reset(); - } + public void reset() { + form.reset(); + } - @Override - public void setNormalGroupsLabels() { - dialogInfoLabel.setText(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) - + TextUtils.brbr()); - tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_NORMAL_TITLE); - } + @Override + public void setNormalGroupsLabels() { + dialogInfoLabel.setText(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) + + TextUtils.brbr()); + tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_NORMAL_TITLE); + } - @Override - public void setPersonalGroupsLabels() { - dialogInfoLabel.setText(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) - + "<br/><br/>"); - tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_PERSON_TITLE); - } + @Override + public void setPersonalGroupsLabels() { + dialogInfoLabel.setText(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) + + "<br/><br/>"); + tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_PERSON_TITLE); + } - @Override - public void setUploadParams(final String userHash, final String token) { - userhashField.setValue(userHash); - tokenField.setValue(token); - } + @Override + public void setUploadParams(final String userHash, final String token) { + userhashField.setValue(userHash); + tokenField.setValue(token); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2011-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2011-04-28 18:00:03 UTC (rev 1326) @@ -41,92 +41,95 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; -public class EntityOptionsPublicSpaceConfPanel extends VerticalPanel implements EntityOptionsPublicSpaceConfView { +public class EntityOptionsPublicSpaceConfPanel extends VerticalPanel implements + EntityOptionsPublicSpaceConfView { - private final Image backImage; - private final Button clearBtn; - private final Label currentBackLabel; - private final FileDownloadUtils downUtils; - private final Label noBackLabel; - private final IconLabel tabTitle; + private final Image backImage; + private final Button clearBtn; + private final Label currentBackLabel; + private final FileDownloadUtils downUtils; + private final Label noBackLabel; + private final IconLabel tabTitle; - public EntityOptionsPublicSpaceConfPanel(final I18nTranslationService i18n, final FileDownloadUtils downUtils, - final CoreResources res) { - this.downUtils = downUtils; - tabTitle = new IconLabel(res.themeChoose(), i18n.t("Style")); - // super.setIconCls("k-colors-icon"); - // super.setAutoScroll(true); - // super.setBorder(false); - super.setHeight(String.valueOf(EntityOptionsView.HEIGHT)); - // super.setFrame(true); - // super.setPaddings(10); + public EntityOptionsPublicSpaceConfPanel(final I18nTranslationService i18n, + final FileDownloadUtils downUtils, final CoreResources res) { + this.downUtils = downUtils; + tabTitle = new IconLabel(res.themeChoose(), i18n.t("Style")); + // super.setIconCls("k-colors-icon"); + // super.setAutoScroll(true); + // super.setBorder(false); + super.setHeight(String.valueOf(EntityOptionsView.HEIGHT)); + super.setWidth(String.valueOf(EntityOptionsView.WIDTH)); + // super.setFrame(true); + // super.setPaddings(10); - final HorizontalPanel wsHP = new HorizontalPanel(); - final Label wsThemeInfo = new Label(i18n.t("Change this workspace theme:")); - // final Widget toolbarWsChange = (Widget) wsSelector.getView(); - // toolbarWsChange.addStyleName("kune-Margin-Medium-l"); - wsHP.add(wsThemeInfo); - // wsHP.add(toolbarWsChange); - add(wsHP); - final VerticalPanel backPanel = new VerticalPanel(); - currentBackLabel = new Label(i18n.t("Current background image: ")); - noBackLabel = new Label(i18n.t("Also you can upload any image and select it later as background.")); - backImage = new Image(); - backImage.addStyleName("kune-Margin-Medium-trbl"); - noBackLabel.addStyleName("kune-Margin-Medium-tb"); - clearBtn = new Button(i18n.t("Clear")); - Tooltip.to(clearBtn, i18n.t("Remove current background image")); - backPanel.add(noBackLabel); - backPanel.add(currentBackLabel); - backPanel.add(backImage); - backPanel.add(clearBtn); - add(backPanel); - 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 HorizontalPanel wsHP = new HorizontalPanel(); + final Label wsThemeInfo = new Label(i18n.t("Change this workspace theme:")); + // final Widget toolbarWsChange = (Widget) wsSelector.getView(); + // toolbarWsChange.addStyleName("kune-Margin-Medium-l"); + wsHP.add(wsThemeInfo); + // wsHP.add(toolbarWsChange); + add(wsHP); + final VerticalPanel backPanel = new VerticalPanel(); + currentBackLabel = new Label(i18n.t("Current background image: ")); + noBackLabel = new Label(i18n.t("Also you can upload any image and select it later as background.")); + backImage = new Image(); + backImage.addStyleName("kune-Margin-Medium-trbl"); + noBackLabel.addStyleName("kune-Margin-Medium-tb"); + clearBtn = new Button(i18n.t("Clear")); + Tooltip.to(clearBtn, i18n.t("Remove current background image")); + backPanel.add(noBackLabel); + backPanel.add(currentBackLabel); + backPanel.add(backImage); + backPanel.add(clearBtn); + add(backPanel); + 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() { + final VerticalPanel stylesPanel = new VerticalPanel(); + final ClickHandler clickHandler = new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - NotifyUser.info(TextUtils.IN_DEVELOPMENT_P); - } - }; - 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); - } - add(stylesPanel); - setBackImageVisibleImpl(false); + @Override + public void onClick(final ClickEvent event) { + NotifyUser.info(TextUtils.IN_DEVELOPMENT_P); + } + }; + 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); } + add(stylesPanel); + setBackImageVisibleImpl(false); + } - @Override - public void clearBackImage() { - setBackImageVisibleImpl(false); - } + @Override + public void clearBackImage() { + setBackImageVisibleImpl(false); + } - @Override - public HasClickHandlers getClearBtn() { - return clearBtn; - } + @Override + public HasClickHandlers getClearBtn() { + return clearBtn; + } - @Override - public IsWidget getTabTitle() { - return tabTitle; - } + @Override + public IsWidget getTabTitle() { + return tabTitle; + } - @Override - public void setBackImage(final StateToken token) { - backImage.setUrl(downUtils.getImageResizedUrl(token, ImageSize.thumb)); - setBackImageVisibleImpl(true); - } + @Override + public void setBackImage(final StateToken token) { + backImage.setUrl(downUtils.getImageResizedUrl(token, ImageSize.thumb)); + setBackImageVisibleImpl(true); + } - private void setBackImageVisibleImpl(final boolean visible) { - backImage.setVisible(visible); - currentBackLabel.setVisible(visible); - clearBtn.setVisible(visible); - noBackLabel.setVisible(!visible); - } + private void setBackImageVisibleImpl(final boolean visible) { + backImage.setVisible(visible); + currentBackLabel.setVisible(visible); + clearBtn.setVisible(visible); + noBackLabel.setVisible(!visible); + } } Modified: 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-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPanel.java 2011-04-28 18:00:03 UTC (rev 1326) @@ -41,96 +41,96 @@ 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 IconLabel tabTitle; + private final HashMap<String, CheckBox> fields; + private final I18nTranslationService i18n; + private final IconLabel tabTitle; - public EntityOptionsToolsConfPanel(final I18nTranslationService i18n, final CoreResources res) { - tabTitle = new IconLabel(res.kunePreferences(), i18n.t("Tools")); - this.i18n = i18n; - super.setHeight(EntityOptionsView.HEIGHT); - super.setFrame(true); - super.add(new HiddenField()); - super.getFormPanel().setLabelWidth(20); - fields = new HashMap<String, CheckBox>(); - } + public EntityOptionsToolsConfPanel(final I18nTranslationService i18n, final CoreResources res) { + 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>(); + } - @Override - public void add(final ToolSimpleDTO tool, final ClickHandler handler) { - final CheckBox checkbox = new CheckBox(); - checkbox.setFieldLabel(tool.getRootName()); - checkbox.setValue(false); - checkbox.addListener(Events.Change, new Listener<BaseEvent>() { - @Override - public void handleEvent(final BaseEvent be) { - handler.onClick(null); - // presenter.onCheck(tool, checked); - } - }); - super.add(checkbox); - fields.put(tool.getName(), checkbox); - doLayoutIfNeeded(); - } + @Override + public void add(final ToolSimpleDTO tool, final ClickHandler handler) { + final CheckBox checkbox = new CheckBox(); + checkbox.setFieldLabel(tool.getRootName()); + checkbox.setValue(false); + checkbox.addListener(Events.Change, new Listener<BaseEvent>() { + @Override + public void handleEvent(final BaseEvent be) { + handler.onClick(null); + // presenter.onCheck(tool, checked); + } + }); + super.add(checkbox); + fields.put(tool.getName(), checkbox); + doLayoutIfNeeded(); + } - @Override - public Widget asWidget() { - return super.getFormPanel(); - } + @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:"));// + - // "<br/><br/>"); - super.add(label); - } + @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:")); + super.add(label); + } - private void doLayoutIfNeeded() { - if (super.getFormPanel().isRendered()) { - super.getFormPanel().layout(); - } + private void doLayoutIfNeeded() { + if (super.getFormPanel().isRendered()) { + super.getFormPanel().layout(); } + } - @Override - public IsWidget getTabTitle() { - return tabTitle; - } + @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; + 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 boolean isChecked(final String tool) { + final CheckBox field = getTool(tool); + return field.getValue(); + } - @Override - public void setChecked(final String tool, final boolean checked) { - final CheckBox field = getTool(tool); - field.setValue(checked); - } + @Override + public void setChecked(final String tool, final boolean checked) { + final CheckBox field = getTool(tool); + field.setValue(checked); + } - @Override - public void setEnabled(final String tool, final boolean enabled) { - final CheckBox field = getTool(tool); - if (enabled) { - field.enable(); - } else { - field.disable(); - } + @Override + public void setEnabled(final String tool, final boolean enabled) { + final CheckBox field = getTool(tool); + if (enabled) { + field.enable(); + } else { + field.disable(); } + } - @Override - public void setTooltip(final String tool, final String tip) { - final CheckBox field = getTool(tool); - Tooltip.to(field, tip); - } + @Override + public void setTooltip(final String tool, final String tip) { + final CheckBox field = getTool(tool); + Tooltip.to(field, tip); + } } Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-04-28 18:00:03 UTC (rev 1326) @@ -103,7 +103,7 @@ // Please also see WebClientDemo.gwt.xml. private static final Logger REMOTE_LOG = Logger.getLogger("REMOTE_LOG"); - private final ProfileManager profiles = new ProfileManagerImpl(); + private final ProfileManager profiles = new ProfileManagerImpl(Session.get().getDomain()); @UiField SplitLayoutPanel splitPanel; @@ -262,13 +262,9 @@ * Returns <code>ws://yourhost[:port]/</code>. */ // XXX check formatting wrt GPE - public native static String getWebSocketBaseUrl(String moduleBase) /*-{ - return "ws" + /:\/\/[^\/]+/.exec(moduleBase)[0] + "/"; -}-*/; + private native String getWebSocketBaseUrl(String moduleBase) /*-{return "ws" + /:\/\/[^\/]+/.exec(moduleBase)[0] + "/";}-*/; - public native static boolean useSocketIO() /*-{ - return !!$wnd.__useSocketIO -}-*/; + private native boolean useSocketIO() /*-{ return !!$wnd.__useSocketIO }-*/; /** */ Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java 2011-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java 2011-04-28 18:00:03 UTC (rev 1326) @@ -40,139 +40,141 @@ import com.google.wave.api.impl.WaveletData; public class KuneWaveManagerDefault implements KuneWaveManager { - public static final Log LOG = LogFactory.getLog(KuneWaveManagerDefault.class); + public static final Log LOG = LogFactory.getLog(KuneWaveManagerDefault.class); - private static final String NO_TITLE = ""; + private static final String NO_TITLE = ""; - private final ConversationUtil conversationUtil; - private final EventDataConverterManager converterManager; - private final String domain; - private final OperationServiceRegistry operationRegistry; - private final ParticipantUtils participantUtils; - private final WaveletProvider waveletProvider; + private final ConversationUtil conversationUtil; + private final EventDataConverterManager converterManager; + private final String domain; + private final OperationServiceRegistry operationRegistry; + private final ParticipantUtils participantUtils; + private final WaveletProvider waveletProvider; - @Inject - public KuneWaveManagerDefault(final EventDataConverterManager converterManager, - @Named("DataApiRegistry") final OperationServiceRegistry operationRegistry, - final WaveletProvider waveletProvider, final ConversationUtil conversationUtil, - final ParticipantUtils participantUtils, @Named(CoreSettings.WAVE_SERVER_DOMAIN) final String domain) { - this.converterManager = converterManager; - this.waveletProvider = waveletProvider; - this.conversationUtil = conversationUtil; - this.operationRegistry = operationRegistry; - this.participantUtils = participantUtils; - this.domain = domain; - } + @Inject + public KuneWaveManagerDefault(final EventDataConverterManager converterManager, + @Named("DataApiRegistry") final OperationServiceRegistry operationRegistry, + final WaveletProvider waveletProvider, final ConversationUtil conversationUtil, + final ParticipantUtils participantUtils, + @Named(CoreSettings.WAVE_SERVER_DOMAIN) final String domain) { + this.converterManager = converterManager; + this.waveletProvider = waveletProvider; + this.conversationUtil = conversationUtil; + this.operationRegistry = operationRegistry; + this.participantUtils = participantUtils; + this.domain = domain; + } - @Override - public WaveRef createWave(final String message, final ParticipantId participant) { - return createWave(NO_TITLE, message, participant); + @Override + public WaveRef createWave(final String message, final ParticipantId participant) { + return createWave(NO_TITLE, message, participant); + } + + @Override + public WaveRef createWave(@Nonnull final String title, final String message, + @Nonnull final ParticipantId... participantsArray) { + String newWaveId = null; + String newWaveletId = null; + final Set<String> participants = new HashSet<String>(); + for (final ParticipantId participant : participantsArray) { + participants.add(participant.toString()); } - - @Override - public WaveRef createWave(@Nonnull final String title, final String message, - @Nonnull final ParticipantId... participantsArray) { - String newWaveId = null; - String newWaveletId = null; - final Set<String> participants = new HashSet<String>(); - for (final ParticipantId participant : participantsArray) { - participants.add(participant.toString()); + final ParticipantId user = participantsArray[0]; + final OperationQueue opQueue = new OperationQueue(); + final Wavelet newWavelet = opQueue.createWavelet(domain, participants); + opQueue.setTitleOfWavelet(newWavelet, title); + final Blip rootBlip = newWavelet.getRootBlip(); + rootBlip.append(new com.google.wave.api.Markup(message).getText()); + final OperationContextImpl context = new OperationContextImpl(waveletProvider, + converterManager.getEventDataConverter(ProtocolVersion.DEFAULT), conversationUtil); + for (final OperationRequest req : opQueue.getPendingOperations()) { + OperationUtil.executeOperation(req, operationRegistry, context, user); + final String reqId = req.getId(); + final JsonRpcResponse response = context.getResponse(reqId); + if (response != null) { + if (response.isError()) { + onFailure(context.getResponse(reqId).getErrorMessage()); + } else { + final Object responseWaveId = response.getData().get(ParamsProperty.WAVE_ID); + final Object responseWaveletId = response.getData().get(ParamsProperty.WAVELET_ID); + if (responseWaveId != null && responseWaveletId != null) { + // This is serialized use + // ApiIdSerializer.instance().deserialiseWaveId (see + // WaveService) + newWaveId = (String) responseWaveId; + newWaveletId = (String) responseWaveletId; + } } - final ParticipantId user = participantsArray[0]; - final OperationQueue opQueue = new OperationQueue(); - final Wavelet newWavelet = opQueue.createWavelet(domain, participants); - final Blip rootBlip = newWavelet.getRootBlip(); - rootBlip.append(new com.google.wave.api.Markup(message).getText()); - final OperationContextImpl context = new OperationContextImpl(waveletProvider, - converterManager.getEventDataConverter(ProtocolVersion.DEFAULT), conversationUtil); - for (final OperationRequest req : opQueue.getPendingOperations()) { - OperationUtil.executeOperation(req, operationRegistry, context, user); - final String reqId = req.getId(); - final JsonRpcResponse response = context.getResponse(reqId); - if (response != null) { - if (response.isError()) { - onFailure(context.getResponse(reqId).getErrorMessage()); - } else { - final Object responseWaveId = response.getData().get(ParamsProperty.WAVE_ID); - final Object responseWaveletId = response.getData().get(ParamsProperty.WAVELET_ID); - if (responseWaveId != null && responseWaveletId != null) { - // This is serialized use - // ApiIdSerializer.instance().deserialiseWaveId (see - // WaveService) - newWaveId = (String) responseWaveId; - newWaveletId = (String) responseWaveletId; - } - } - } - } - OperationUtil.submitDeltas(context, waveletProvider, new SubmitRequestListener() { - @Override - public void onFailure(final String arg0) { - KuneWaveManagerDefault.this.onFailure("Wave creation failed, onFailure: " + arg0); - } + } + } + OperationUtil.submitDeltas(context, waveletProvider, new SubmitRequestListener() { + @Override + public void onFailure(final String arg0) { + KuneWaveManagerDefault.this.onFailure("Wave creation failed, onFailure: " + arg0); + } - @Override - public void onSuccess(final int arg0, final HashedVersion arg1, final long arg2) { - LOG.info("Wave creation success: " + arg1); - } - }); - LOG.info("WaveId: " + newWaveId + " waveletId: " + newWaveletId); - WaveRef wavename; - try { - wavename = WaveRef.of(ApiIdSerializer.instance().deserialiseWaveId(newWaveId), - ApiIdSerializer.instance().deserialiseWaveletId(newWaveletId)); - } catch (final InvalidIdException e) { - throw new DefaultException("Error getting wave id"); - } - return wavename; + @Override + public void onSuccess(final int arg0, final HashedVersion arg1, final long arg2) { + LOG.info("Wave creation success: " + arg1); + } + }); + LOG.info("WaveId: " + newWaveId + " waveletId: " + newWaveletId); + WaveRef wavename; + try { + wavename = WaveRef.of(ApiIdSerializer.instance().deserialiseWaveId(newWaveId), + ApiIdSerializer.instance().deserialiseWaveletId(newWaveletId)); + } catch (final InvalidIdException e) { + throw new DefaultException("Error getting wave id"); } + return wavename; + } - @Override - public Wavelet fetchWavelet(final WaveRef waveName, final String author) { - Wavelet wavelet = null; - final OperationQueue opQueue = new OperationQueue(); - opQueue.fetchWavelet(waveName.getWaveId(), waveName.getWaveletId()); - final OperationContextImpl context = new OperationContextImpl(waveletProvider, - converterManager.getEventDataConverter(ProtocolVersion.DEFAULT), conversationUtil); - final OperationRequest request = opQueue.getPendingOperations().get(0); - OperationUtil.executeOperation(request, operationRegistry, context, participantUtils.of(author)); - final String reqId = request.getId(); - final JsonRpcResponse response = context.getResponse(reqId); - if (response != null) { - if (response.isError()) { - onFailure(context.getResponse(reqId).getErrorMessage()); - } else { - // Duplicate code from WaveService - final WaveletData waveletData = (WaveletData) response.getData().get(ParamsProperty.WAVELET_DATA); - final Map<String, Blip> blips = new HashMap<String, Blip>(); - final Map<String, BlipThread> threads = new HashMap<String, BlipThread>(); - wavelet = Wavelet.deserialize(opQueue, blips, threads, waveletData); + @Override + public Wavelet fetchWavelet(final WaveRef waveName, final String author) { + Wavelet wavelet = null; + final OperationQueue opQueue = new OperationQueue(); + opQueue.fetchWavelet(waveName.getWaveId(), waveName.getWaveletId()); + final OperationContextImpl context = new OperationContextImpl(waveletProvider, + converterManager.getEventDataConverter(ProtocolVersion.DEFAULT), conversationUtil); + final OperationRequest request = opQueue.getPendingOperations().get(0); + OperationUtil.executeOperation(request, operationRegistry, context, participantUtils.of(author)); + final String reqId = request.getId(); + final JsonRpcResponse response = context.getResponse(reqId); + if (response != null) { + if (response.isError()) { + onFailure(context.getResponse(reqId).getErrorMessage()); + } else { + // Duplicate code from WaveService + final WaveletData waveletData = (WaveletData) response.getData().get(ParamsProperty.WAVELET_DATA); + final Map<String, Blip> blips = new HashMap<String, Blip>(); + final Map<String, BlipThread> threads = new HashMap<String, BlipThread>(); + wavelet = Wavelet.deserialize(opQueue, blips, threads, waveletData); - // Deserialize threads. - @SuppressWarnings("unchecked") - final Map<String, BlipThread> tempThreads = (Map<String, BlipThread>) response.getData().get( - ParamsProperty.THREADS); - for (final Map.Entry<String, BlipThread> entry : tempThreads.entrySet()) { - final BlipThread thread = entry.getValue(); - threads.put(entry.getKey(), - new BlipThread(thread.getId(), thread.getLocation(), thread.getBlipIds(), blips)); - } + // Deserialize threads. + @SuppressWarnings("unchecked") + final Map<String, BlipThread> tempThreads = (Map<String, BlipThread>) response.getData().get( + ParamsProperty.THREADS); + for (final Map.Entry<String, BlipThread> entry : tempThreads.entrySet()) { + final BlipThread thread = entry.getValue(); + threads.put(entry.getKey(), + new BlipThread(thread.getId(), thread.getLocation(), thread.getBlipIds(), blips)); + } - // Deserialize blips. - @SuppressWarnings("unchecked") - final Map<String, BlipData> blipDatas = (Map<String, BlipData>) response.getData().get( - ParamsProperty.BLIPS); - for (final Map.Entry<String, BlipData> entry : blipDatas.entrySet()) { - blips.put(entry.getKey(), Blip.deserialize(opQueue, wavelet, entry.getValue())); - } - } + // Deserialize blips. + @SuppressWarnings("unchecked") + final Map<String, BlipData> blipDatas = (Map<String, BlipData>) response.getData().get( + ParamsProperty.BLIPS); + for (final Map.Entry<String, BlipData> entry : blipDatas.entrySet()) { + blips.put(entry.getKey(), Blip.deserialize(opQueue, wavelet, entry.getValue())); } - return wavelet; + } } + return wavelet; + } - private void onFailure(final String message) { - final String errorMsg = TextUtils.notEmpty(message) ? message : "Wave operation failed"; - LOG.error(errorMsg); - throw new DefaultException(errorMsg); - } + private void onFailure(final String message) { + final String errorMsg = TextUtils.notEmpty(message) ? message : "Wave operation failed"; + LOG.error(errorMsg); + throw new DefaultException(errorMsg); + } } Modified: trunk/src/main/java/cc/kune/wave/server/WaveMain.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/WaveMain.java 2011-04-28 13:50:23 UTC (rev 1325) +++ trunk/src/main/java/cc/kune/wave/server/WaveMain.java 2011-04-28 18:00:03 UTC (rev 1326) @@ -124,7 +124,7 @@ initializeServer(injector, domain); initializeServlets(injector, server); initializeRobots(injector, waveBus); - initializeFrontend(injector, server, waveBus, domain); + initializeFrontend(injector, server, waveBus); initializeFederation(injector); LOG.info("Starting server"); @@ -201,12 +201,12 @@ } private static void initializeFrontend(Injector injector, ServerRpcProvider server, - WaveBus waveBus, String waveDomain) throws WaveServerException { + WaveBus waveBus) throws WaveServerException { HashedVersionFactory hashFactory = injector.getInstance(HashedVersionFactory.class); WaveletProvider provider = injector.getInstance(WaveletProvider.class); ClientFrontend frontend = - ClientFrontendImpl.create(hashFactory, provider, waveBus, waveDomain); + ClientFrontendImpl.create(hashFactory, provider, waveBus); ProtocolWaveClientRpc.Interface rpcImpl = WaveClientRpcImpl.create(frontend, false); server.registerService(ProtocolWaveClientRpc.newReflectiveService(rpcImpl));

1 0

r1325 - in trunk: dev-utils script src/main/java/cc/kune/common/client/ui src/main/java/cc/kune/common/client/ui/dialogs src/main/java/cc/kune/common/public src/main/java/cc/kune/core/client/sitebar/spaces src/main/java/cc/kune/core/public src/main/java/cc/kune/gspace/client src/main/java/cc/kune/gspace/client/actions src/main/java/cc/kune/gspace/client/resources src/main/java/cc/kune/gspace/client/tool/selector src/main/java/cc/kune/gspace/client/viewers
by Vicente J. Ruiz Jurado 28 Apr '11

28 Apr '11

Author: vjrj_ Date: 2011-04-28 15:50:23 +0200 (Thu, 28 Apr 2011) New Revision: 1325 Modified: trunk/dev-utils/kune.formatter.eclipse.preferences.xml trunk/script/repopubli.sh trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java Log: Minor style issues Modified: trunk/dev-utils/kune.formatter.eclipse.preferences.xml =================================================================== --- trunk/dev-utils/kune.formatter.eclipse.preferences.xml 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/dev-utils/kune.formatter.eclipse.preferences.xml 2011-04-28 13:50:23 UTC (rev 1325) @@ -2,6 +2,7 @@ <profiles version="11"> <profile kind="CodeFormatterProfile" name="kune-formatter" version="11"> <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/> @@ -9,11 +10,13 @@ <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/> @@ -48,9 +51,10 @@ <setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/> @@ -70,15 +74,16 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/> +<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="70"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/> +<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/> @@ -88,6 +93,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/> <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/> @@ -95,6 +101,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/> @@ -120,6 +127,7 @@ <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/> @@ -129,7 +137,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/> +<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/> @@ -180,6 +188,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/> <setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/> <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/> @@ -201,6 +210,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/> @@ -210,8 +220,8 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/> @@ -229,6 +239,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/> <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/> <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/> @@ -255,6 +266,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/> Modified: trunk/script/repopubli.sh =================================================================== --- trunk/script/repopubli.sh 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/script/repopubli.sh 2011-04-28 13:50:23 UTC (rev 1325) @@ -5,6 +5,8 @@ echo "$0 -j target/emite-0.4.6-emiteuimodule.jar -g com.calclab.emite -a emite -v 0.4.6" } +PACKAGING=jar + while getopts “hg:a:v:j:s” OPTION do case $OPTION in @@ -25,7 +27,7 @@ JAR=$OPTARG ;; s) - SOURCE='-Dclassifier=sources' + PACKAGING=java-source ;; ?) usage @@ -40,4 +42,10 @@ exit 1 fi -mvn deploy:deploy-file -DgroupId=$GROUP -DartifactId=$ARTIFACT -Dversion=$VER $SOURCE -Dpackaging=jar -Dfile=$JAR -Durl=scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/ -DrepositoryId=kune.ourproject.org +mvn deploy:deploy-file -DgroupId=$GROUP \ + -DartifactId=$ARTIFACT \ + -Dversion=$VER \ + -Dpackaging=$PACKAGING \ + -Dfile=$JAR \ + -DrepositoryId=kune.ourproject.org \ + -Durl=scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/ Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-04-28 13:50:23 UTC (rev 1325) @@ -40,127 +40,129 @@ public class IconLabel extends Composite implements HasWidgets, HasDirectionalText { - interface IconTitleUiBinder extends UiBinder<Widget, IconLabel> { - } + interface IconTitleUiBinder extends UiBinder<Widget, IconLabel> { + } - private static IconTitleUiBinder uiBinder = GWT.create(IconTitleUiBinder.class); + private static IconTitleUiBinder uiBinder = GWT.create(IconTitleUiBinder.class); - @UiField - FlowPanel flow; - @UiField - Image iconLeft; - @UiField - Image iconRight; - @UiField - InlineLabel label; - @UiField - FocusPanel self; + @UiField + FlowPanel flow; + @UiField + Image iconLeft; + @UiField + Image iconRight; + @UiField + InlineLabel label; + @UiField + FocusPanel self; - public IconLabel() { - this(""); - } + public IconLabel() { + this(""); + } - public IconLabel(final ImageResource imgRes, final String text) { - this(text); - iconLeft.setResource(imgRes); + public IconLabel(final ImageResource imgRes, final String text) { + this(text); + if (imgRes != null) { + iconLeft.setResource(imgRes); } + } - public IconLabel(final String text) { - initWidget(uiBinder.createAndBindUi(this)); - label.setText(text); - label.addStyleName("k-space-nowrap"); - label.addStyleName("k-iconlabel-text"); - } + public IconLabel(final String text) { + initWidget(uiBinder.createAndBindUi(this)); + label.setText(text); + label.addStyleName("k-space-nowrap"); + label.addStyleName("k-iconlabel-text"); + } - @Override - public void add(final Widget w) { - flow.add(w); - } + @Override + public void add(final Widget w) { + flow.add(w); + } - @Override - public void addStyleName(final String style) { - flow.addStyleName(style); - } + @Override + public void addStyleName(final String style) { + flow.addStyleName(style); + } - public void addTextStyleName(final String style) { - label.addStyleName(style); - } + public void addTextStyleName(final String style) { + label.addStyleName(style); + } - @Override - public void clear() { - flow.clear(); - } + @Override + public void clear() { + flow.clear(); + } - public HasClickHandlers getFocus() { - return self; - } + public HasClickHandlers getFocus() { + return self; + } - @Override - public String getText() { - return label.getText(); - } + @Override + public String getText() { + return label.getText(); + } - @Override - public Direction getTextDirection() { - return label.getTextDirection(); - } + @Override + public Direction getTextDirection() { + return label.getTextDirection(); + } - @Override - public Iterator<Widget> iterator() { - return flow.iterator(); - } + @Override + public Iterator<Widget> iterator() { + return flow.iterator(); + } - @Override - public boolean remove(final Widget w) { - return flow.remove(w); - } + @Override + public boolean remove(final Widget w) { + return flow.remove(w); + } - public void setLabelText(final String text) { - label.setText(text); - } + public void setLabelText(final String text) { + label.setText(text); + } - public void setLeftIcon(final String imgCss) { - iconLeft.setUrl("images/clear.gif"); - iconLeft.setStyleName(imgCss); - iconLeft.addStyleName("k-iconlabel-left"); - iconLeft.addStyleName("oc-ico-pad"); - } + public void setLeftIcon(final String imgCss) { + iconLeft.setUrl("images/clear.gif"); + iconLeft.setStyleName(imgCss); + iconLeft.addStyleName("k-iconlabel-left"); + iconLeft.addStyleName("oc-ico-pad"); + } - public void setLeftIconResource(final ImageResource res) { - iconLeft.setResource(res); - iconLeft.addStyleName("k-iconlabel-left"); - } + public void setLeftIconResource(final ImageResource res) { + iconLeft.setResource(res); + iconLeft.addStyleName("k-iconlabel-left"); + } - public void setRightIcon(final String imgCss) { - iconRight.setUrl("images/clear.gif"); - iconRight.setStyleName(imgCss); - iconRight.addStyleName("oc-ico-pad"); - iconRight.addStyleName("k-iconlabel-right"); - } + public void setRightIcon(final String imgCss) { + iconRight.setUrl("images/clear.gif"); + iconRight.setStyleName(imgCss); + iconRight.addStyleName("oc-ico-pad"); + iconRight.addStyleName("k-iconlabel-right"); + } - public void setRightIconResource(final ImageResource res) { - iconRight.setResource(res); - iconRight.addStyleName("k-iconlabel-right"); - } + public void setRightIconResource(final ImageResource res) { + iconRight.setResource(res); + iconRight.addStyleName("k-iconlabel-right"); + } - @Override - public void setStyleName(final String style) { - flow.setStyleName(style); - } + @Override + public void setStyleName(final String style) { + flow.setStyleName(style); + } - @Override - public void setText(final String text) { - label.setText(text); - } + @Override + public void setText(final String text) { + label.setText(text); + } - @Override - public void setText(final String text, final Direction dir) { - label.setText(text, dir); - } + @Override + public void setText(final String text, final Direction dir) { + label.setText(text, dir); + } - public void setTooltip(final String text) { - Tooltip.to(label, text); - // Tooltip.to(iconRight, text); - // Tooltip.to(iconLeft, text); - } + public void setTooltip(final String text) { + Tooltip.to(label, text); + // Tooltip.to(iconRight, text); + // Tooltip.to(iconLeft, text); + } } Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-04-28 13:50:23 UTC (rev 1325) @@ -12,7 +12,7 @@ } .pad { - white-space: nowrap; + /* white-space: nowrap; */ } </ui:style> <g:FocusPanel ui:field="self"> Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java 2011-04-28 13:50:23 UTC (rev 1325) @@ -38,121 +38,121 @@ public class BasicDialog extends Composite implements BasicDialogView { - interface BasicDialogUiBinder extends UiBinder<Widget, BasicDialog> { - } - private static BasicDialogUiBinder uiBinder = GWT.create(BasicDialogUiBinder.class); - @UiField - VerticalPanel bottomPanel; - @UiField - FlowPanel btnPanel; - @UiField - Button firstBtn; - @UiField - Button secondBtn; - @UiField - IconLabel title; - @UiField - VerticalPanel vp; + interface BasicDialogUiBinder extends UiBinder<Widget, BasicDialog> { + } + private static BasicDialogUiBinder uiBinder = GWT.create(BasicDialogUiBinder.class); + @UiField + VerticalPanel bottomPanel; + @UiField + FlowPanel btnPanel; + @UiField + Button firstBtn; + @UiField + Button secondBtn; + @UiField + IconLabel title; + @UiField + VerticalPanel vp; - public BasicDialog() { - initWidget(uiBinder.createAndBindUi(this)); - } + public BasicDialog() { + initWidget(uiBinder.createAndBindUi(this)); + } - public void ensureDebugIdFirstBtn(final String id) { - if (id != null && id.length() > 0) { - firstBtn.ensureDebugId(id); - } + public void ensureDebugIdFirstBtn(final String id) { + if (id != null && id.length() > 0) { + firstBtn.ensureDebugId(id); } + } - public void ensureDebugIdSecondBtn(final String id) { - if (id != null && id.length() > 0) { - secondBtn.ensureDebugId(id); - } + public void ensureDebugIdSecondBtn(final String id) { + if (id != null && id.length() > 0) { + secondBtn.ensureDebugId(id); } + } - @Override - public ForIsWidget getBottomPanel() { - return bottomPanel; - } + @Override + public ForIsWidget getBottomPanel() { + return bottomPanel; + } - @Override - public HasClickHandlers getFirstBtn() { - return firstBtn; - } + @Override + public HasClickHandlers getFirstBtn() { + return firstBtn; + } - @Override - public HasText getFirstBtnText() { - return firstBtn; - } + @Override + public HasText getFirstBtnText() { + return firstBtn; + } - @Override - public ForIsWidget getInnerPanel() { - return vp; - } + @Override + public ForIsWidget getInnerPanel() { + return vp; + } - @Override - public HasClickHandlers getSecondBtn() { - return secondBtn; - } + @Override + public HasClickHandlers getSecondBtn() { + return secondBtn; + } - @Override - public HasText getSecondBtnText() { - return secondBtn; - } + @Override + public HasText getSecondBtnText() { + return secondBtn; + } - @Override - public HasDirectionalText getTitleText() { - return title; - } + @Override + public HasDirectionalText getTitleText() { + return title; + } - public void setFirstBtnId(final String id) { - firstBtn.ensureDebugId(id); - } + public void setFirstBtnId(final String id) { + firstBtn.ensureDebugId(id); + } - public void setFirstBtnTabIndex(final int index) { - firstBtn.setTabIndex(index); - } + public void setFirstBtnTabIndex(final int index) { + firstBtn.setTabIndex(index); + } - @Override - public void setFirstBtnTitle(final String title) { - firstBtn.setTitle(title); - } + @Override + public void setFirstBtnTitle(final String title) { + firstBtn.setTitle(title); + } - @Override - public void setFirstBtnVisible(final boolean visible) { - firstBtn.setVisible(visible); - } + @Override + public void setFirstBtnVisible(final boolean visible) { + firstBtn.setVisible(visible); + } - public void setSecondBtnId(final String id) { - secondBtn.ensureDebugId(id); - } + public void setSecondBtnId(final String id) { + secondBtn.ensureDebugId(id); + } - public void setSecondBtnTabIndex(final int index) { - secondBtn.setTabIndex(index); - } + public void setSecondBtnTabIndex(final int index) { + secondBtn.setTabIndex(index); + } - @Override - public void setSecondBtnTitle(final String title) { - secondBtn.setTitle(title); - } + @Override + public void setSecondBtnTitle(final String title) { + secondBtn.setTitle(title); + } - @Override - public void setSecondBtnVisible(final boolean visible) { - secondBtn.setVisible(visible); - } + @Override + public void setSecondBtnVisible(final boolean visible) { + secondBtn.setVisible(visible); + } - public void setTitleIcon(final ImageResource img) { - title.setLeftIconResource(img); - } + public void setTitleIcon(final ImageResource img) { + title.setLeftIconResource(img); + } - public void setTitleIcon(final String icon) { - if (TextUtils.notEmpty(icon)) { - title.setLeftIcon(icon); - } + public void setTitleIcon(final String icon) { + if (TextUtils.notEmpty(icon)) { + title.setLeftIcon(icon); } + } - public void setTitleId(final String id) { - title.ensureDebugId(id); - } + public void setTitleId(final String id) { + title.ensureDebugId(id); + } } Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml 2011-04-28 13:50:23 UTC (rev 1325) @@ -13,9 +13,9 @@ </g:SimplePanel> <g:FlowPanel ui:field="btnPanel" addStyleNames="k-dialog-btn-area"> <g:Button ui:field="firstBtn" - addStyleNames="k-dialog-btn, k-dialog-firstBtn, k-5corners " /> + addStyleNames="k-dialog-btn, k-dialog-firstBtn, k-5corners, k-button " /> <g:Button ui:field="secondBtn" - addStyleNames="k-dialog-btn,k-dialog-secondBtn, k-5corners" /> + addStyleNames="k-dialog-btn,k-dialog-secondBtn, k-5corners, k-button" /> </g:FlowPanel> </g:VerticalPanel> </ui:UiBinder> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-04-28 13:50:23 UTC (rev 1325) @@ -8,522 +8,527 @@ } .k-floatleft,.k-fl { - float: left; + float: left; } .k-floatright,.k-fr { - float: right; + float: right; } .k-pointer { - cursor: pointer; - cursor: hand; + cursor: pointer; + cursor: hand; } .k-opacity80 { - kfilter: alpha(opacity = 80); - -moz-opacity: 0.80; - -khtml-opacity: 0.80; - opacity: 0.80; + kfilter: alpha(opacity = 80); + -moz-opacity: 0.80; + -khtml-opacity: 0.80; + opacity: 0.80; } .k-opacity90 { - kfilter: alpha(opacity = 90); - -moz-opacity: 0.90; - -khtml-opacity: 0.90; - opacity: 0.90; + kfilter: alpha(opacity = 90); + -moz-opacity: 0.90; + -khtml-opacity: 0.90; + opacity: 0.90; } .k-opacity95 { - kfilter: alpha(opacity = 95); - -moz-opacity: 0.95; - -khtml-opacity: 0.95; - opacity: 0.95; + kfilter: alpha(opacity = 95); + -moz-opacity: 0.95; + -khtml-opacity: 0.95; + opacity: 0.95; } .gwt-PopupPanelGlass { - background-color: #f7ebe3 !important; - kfilter: alpha(opacity = 68) - !important; - -moz-opacity: 0.68 !important; - -khtml-opacity: 0.68 !important; - opacity: 0.68 !important; + background-color: #f7ebe3 !important; + kfilter: alpha(opacity = 68) + !important; + -moz-opacity: 0.68 !important; + -khtml-opacity: 0.68 !important; + opacity: 0.68 !important; } .k-box-3shadow { - -webkit-box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5); - box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5); + box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5); } .k-box-5shadow { - -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); - box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); } .k-box-10shadow { - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); } .k-bottom-5corners { - -webkit-border-bottom-right-radius: 5px; - -moz-border-radius-bottomright: 5px; - border-bottom-right-radius: 5px; - -webkit-border-bottom-left-radius: 5px; - -moz-border-radius-bottomleft: 5px; - border-bottom-left-radius: 5px; + -webkit-border-bottom-right-radius: 5px; + -moz-border-radius-bottomright: 5px; + border-bottom-right-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-bottomleft: 5px; + border-bottom-left-radius: 5px; } .k-bottom-10corners { - -webkit-border-bottom-right-radius: 10px; - -moz-border-radius-bottomright: 10px; - border-bottom-right-radius: 10px; - -webkit-border-bottom-left-radius: 10px; - -moz-border-radius-bottomleft: 10px; - border-bottom-left-radius: 10px; + -webkit-border-bottom-right-radius: 10px; + -moz-border-radius-bottomright: 10px; + border-bottom-right-radius: 10px; + -webkit-border-bottom-left-radius: 10px; + -moz-border-radius-bottomleft: 10px; + border-bottom-left-radius: 10px; } .k-top-5corners { - -webkit-border-top-right-radius: 5px; - -moz-border-radius-topright: 5px; - border-top-right-radius: 5px; - -webkit-border-top-left-radius: 5px; - -moz-border-radius-topleft: 5px; - border-top-left-radius: 5px; + -webkit-border-top-right-radius: 5px; + -moz-border-radius-topright: 5px; + border-top-right-radius: 5px; + -webkit-border-top-left-radius: 5px; + -moz-border-radius-topleft: 5px; + border-top-left-radius: 5px; } .k-top-10corners { - -webkit-border-top-right-radius: 10px; - -moz-border-radius-topright: 10px; - border-top-right-radius: 10px; - -webkit-border-top-left-radius: 10px; - -moz-border-radius-topleft: 10px; - border-top-left-radius: 10px; + -webkit-border-top-right-radius: 10px; + -moz-border-radius-topright: 10px; + border-top-right-radius: 10px; + -webkit-border-top-left-radius: 10px; + -moz-border-radius-topleft: 10px; + border-top-left-radius: 10px; } .k-2corners { - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; } .k-3corners { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } .k-5corners { - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; } .k-10corners { - -moz-border-radius: 10px; - -webkit-border-radius: 10px; - border-radius: 10px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; } .k-dialog-outerp { - background-color: #552200; - border-top: 4px solid #000; - padding: 22px 4px 3px 4px; + background-color: #552200; + border-top: 4px solid #000; + padding: 22px 4px 3px 4px; } .k-dialog-title span { - color: #552200; - font-size: 20px; - font-weight: bold; - margin: 0 0 0 6px; + color: #552200; + font-size: 20px; + font-weight: bold; + margin: 0 0 0 6px; } .k-dialog-innerp { - background-color: #FFFFFF; - border: solid 1px #F2F2F2; - margin: 34px 16px 20px 16px; + background-color: #FFFFFF; + border: solid 1px #F2F2F2; + margin: 34px 16px 20px 16px; } .k-dialog-btn-area { - padding: 0 15px 15px 15px; - margin-bottom: 30px; + padding: 0 15px 15px 15px; + margin-bottom: 30px; } .k-dialog-btn-area div { - margin: 10px + margin: 10px } .k-dialog-innerp table { - margin: 5px; + margin: 5px; } .k-dialog-btn { - text-shadow: 1px 1px 1px #FFFFFF; - font-weight: bold; - -moz-user-select: none; - -khtml-user-select: none; + text-shadow: 1px 1px 1px #FFFFFF; + font-weight: bold; + -moz-user-select: none; + -khtml-user-select: none; } .k-dialog-firstBtn { - float: left; + float: left; } .k-dialog-secondBtn { - float: right; + float: right; } .k-z100000 { - z-index: 100000; + z-index: 100000; } .k-z10000 { - z-index: 10000; + z-index: 10000; } .k-z1000 { - z-index: 1000; + z-index: 1000; } .oc-user-msg { - background-color: #FFCC00; - padding: 3px; + background-color: #FFCC00; + padding: 3px; } .oc-user-msg-popup { - padding: 0px; - border: 0px; + padding: 0px; + border: 0px; } .oc-floatleft { - float: left; + float: left; } .oc-floatright { - float: right; + float: right; } .x-toolbar { - background: none !important; - border-color: transparent !important; + background: none !important; + border-color: transparent !important; } .oc-testico { - background-image: url(images/ico.png) !important; - -moz-background-clip: border; - -moz-background-inline-policy: continuous; - -moz-background-origin: padding; - background-attachment: scroll; - background-color: transparent; - background-position: 0 0; - background-repeat: no-repeat; - height: 16px; - widows: 16px; + background-image: url(images/ico.png) !important; + -moz-background-clip: border; + -moz-background-inline-policy: continuous; + -moz-background-origin: padding; + background-attachment: scroll; + background-color: transparent; + background-position: 0 0; + background-repeat: no-repeat; + height: 16px; + widows: 16px; } .oc-tb-spacer { - margin: 2px; - width: 2px; + margin: 2px; + width: 2px; } .oc-tb-bottom-line { - border-bottom-color: rgb(208, 208, 208); - border-bottom-style: solid; - border-bottom-width: 1px; + border-bottom-color: rgb(208, 208, 208); + border-bottom-style: solid; + border-bottom-width: 1px; } .oc-blank-toolbar { - background: #FFF none repeat scroll 0% 50%; + background: #FFF none repeat scroll 0% 50%; } .oc-tb-sep { - padding-top: 4px; - padding-left: 5px; + padding-top: 4px; + padding-left: 5px; } .oc-transp .x-panel-body { - background: transparent; + background: transparent; } .oc-menu { - cursor: default; - -moz-user-select: none; - -khtml-user-select: none; - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); - border: 1 px solid #BBBBBB; - font: 16px 'Ubuntu', arial; - /* font-weight: bold; */ - -webkit-border-bottom-right-radius: 5px; - -moz-border-radius-bottomright: 5px; - border-bottom-right-radius: 5px; - -webkit-border-bottom-left-radius: 5px; - -moz-border-radius-bottomleft: 5px; - border-bottom-left-radius: 5px; - background-color: #280b0b; + cursor: default; + -moz-user-select: none; + -khtml-user-select: none; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + border: 1 px solid #BBBBBB; + font: 16px 'Ubuntu', arial; + /* font-weight: bold; */ + -webkit-border-bottom-right-radius: 5px; + -moz-border-radius-bottomright: 5px; + border-bottom-right-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-bottomleft: 5px; + border-bottom-left-radius: 5px; + background-color: #280b0b; } .gwt-PopupPanel .oc-menu { - border: 2px solid #552200; - background-color: #280b0b; + border: 2px solid #552200; + background-color: #280b0b; } .oc-menu .gwt-MenuBar-vertical,.gwt-MenuBar-vertical { - background-color: #280b0b; - border: 2px solid #552200; - padding: 3px; - font: 16px 'Ubuntu', arial; - color: white; - -webkit-border-top-right-radius: 5px; - -moz-border-radius-topright: 5px; - border-top-right-radius: 5px; - -webkit-border-bottom-right-radius: 5px; - -moz-border-radius-bottomright: 5px; - border-bottom-right-radius: 5px; - -webkit-border-bottom-left-radius: 5px; - -moz-border-radius-bottomleft: 5px; - border-bottom-left-radius: 5px; - kfilter: alpha(opacity = 90); - -moz-opacity: 0.90; - -khtml-opacity: 0.90; - opacity: 0.90; + background-color: #280b0b; + border: 2px solid #552200; + padding: 3px; + font: 16px 'Ubuntu', arial; + color: white; + -webkit-border-top-right-radius: 5px; + -moz-border-radius-topright: 5px; + border-top-right-radius: 5px; + -webkit-border-bottom-right-radius: 5px; + -moz-border-radius-bottomright: 5px; + border-bottom-right-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-bottomleft: 5px; + border-bottom-left-radius: 5px; + kfilter: alpha(opacity = 90); + -moz-opacity: 0.90; + -khtml-opacity: 0.90; + opacity: 0.90; } .gwt-MenuBar .gwt-MenuItem-selected { - background-color: #c87137 !important; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + background-color: #c87137 !important; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } .gwt-MenuBar .gwt-MenuItem { - padding: 4px 4px 3px !important; + padding: 4px 4px 3px !important; } +.oc-noselect { + -moz-user-select: none; + -khtml-user-select: none; +} + .oc-menu .gwt-MenuItem { - cursor: pointer; - -moz-user-select: none; - -khtml-user-select: none; - /* background-color: #c87137; */ - color: white; + cursor: pointer; + -moz-user-select: none; + -khtml-user-select: none; + /* background-color: #c87137; */ + color: white; } .oc-button { - padding: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - text-decoration: none; - vertical-align: middle; - background-color: #F2F2F2; - white-space: nowrap; - margin-right: 3px; + padding: 2px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + text-decoration: none; + vertical-align: middle; + background-color: #F2F2F2; + white-space: nowrap; + margin-right: 3px; } .oc-button:hover { - border: 2px orange solid; - background: #f0f0f0; - color: #855585; + border: 2px orange solid; + background: #f0f0f0; + color: #855585; } .oc-button:active { - border-top-color: #ffffff; - background: #ffffff; + border-top-color: #ffffff; + background: #ffffff; } #oc-mshortcut { - position: absolute; - right: 10px; + position: absolute; + right: 10px; } #oc-mshortcut-hidden { - visibility: hidden; + visibility: hidden; } #oc-mshortcut a { - text-decoration: none; - color: black; + text-decoration: none; + color: black; } .oc-user-msg { - background-color: #FFCC00; - padding: 3px; + background-color: #FFCC00; + padding: 3px; } .oc-user-msg-popup { - padding: 0px; - border: 0px; + padding: 0px; + border: 0px; } .oc-floatleft { - float: left; + float: left; } .oc-floatright { - float: right; + float: right; } .x-toolbar { - background: none !important; - border-color: transparent !important; + background: none !important; + border-color: transparent !important; } .oc-testico { - background-image: url(images/ico.png) !important; - -moz-background-clip: border; - -moz-background-inline-policy: continuous; - -moz-background-origin: padding; - background-attachment: scroll; - background-color: transparent; - background-position: 0 0; - background-repeat: no-repeat; - height: 16px; - widows: 16px; + background-image: url(images/ico.png) !important; + -moz-background-clip: border; + -moz-background-inline-policy: continuous; + -moz-background-origin: padding; + background-attachment: scroll; + background-color: transparent; + background-position: 0 0; + background-repeat: no-repeat; + height: 16px; + widows: 16px; } .oc-ico-pad { /* padding-right: 20px; */ - white-space: normal; + white-space: normal; } .oc-tb-spacer { - margin: 2px; - width: 2px; + margin: 2px; + width: 2px; } .oc-tb-bottom-line { - border-bottom-color: rgb(208, 208, 208); - border-bottom-style: solid; - border-bottom-width: 1px; + border-bottom-color: rgb(208, 208, 208); + border-bottom-style: solid; + border-bottom-width: 1px; } .oc-blank-toolbar { - background: #FFF none repeat scroll 0% 50%; + background: #FFF none repeat scroll 0% 50%; } .oc-tb-sep { - padding-top: 4px; - padding-left: 5px; + padding-top: 4px; + padding-left: 5px; } .oc-transp .x-panel-body { - background: transparent; + background: transparent; } #oc-mshortcut { - position: absolute; - right: 10px; + position: absolute; + right: 10px; } #oc-mshortcut-hidden { - visibility: hidden; + visibility: hidden; } #oc-mshortcut a { - text-decoration: none; - color: black; + text-decoration: none; + color: black; } .k-no-backimage,.k-no-backimage td { - background-image: none; + background-image: none; } .k-nobackcolor { - background-color: transparent !important; + background-color: transparent !important; } .k-noborder { - border: 0px !important; + border: 0px !important; } .k-space-nowrap { - white-space: nowrap; + white-space: nowrap; } .k-iconlabel-text { - vertical-align: top; - padding-left: 3px; - float: left; + vertical-align: top; + padding-left: 3px; + float: left; } .k-menuimtem-title { - color: white; - font-size: 15px; - font-weight: bold; - padding: 2px 3px 2px 0; + color: white; + font-size: 15px; + font-weight: bold; + padding: 2px 3px 2px 0; } .k-tb-sep { - border-left: 1px solid #B3B3B3; - height: 10px; - margin-top: 4px; + border-left: 1px solid #B3B3B3; + height: 10px; + margin-top: 4px; } .k-iconlabel-left { - float: left; + float: left; } .k-iconlabel-right { - float: left; - /* margin-left: 5px; */ + float: left; + /* margin-left: 5px; */ } .gwt-MenuBar-vertical .subMenuIcon-selected { - background: none repeat scroll 0 0 #808080; + background: none repeat scroll 0 0 #808080; } .gwt-Button { - background: url("images/hborder.png") repeat-x scroll 0 -27px - transparent; + background: url("images/hborder.png") repeat-x scroll 0 -27px + transparent; } /* tooltips, adaptation of http://jonrohan.me/guide/css/creating-triangles-in-css/ */ .k-tooltip { - background-color: #FEFFF1; - border: 2px solid #666666; - line-height: 1.3em; - padding: 5px; + background-color: #FEFFF1; + border: 2px solid #666666; + line-height: 1.3em; + padding: 5px; } .k-tooltip-arrow-border { - border-style: solid; - border-width: 7px; - height: 0; - width: 0; - position: absolute; + border-style: solid; + border-width: 7px; + height: 0; + width: 0; + position: absolute; } .k-tooltip-arrow-border-n { - border-color: transparent transparent #666666 transparent; + border-color: transparent transparent #666666 transparent; } .k-tooltip-arrow-border-s { - border-color: #666666 transparent transparent transparent; + border-color: #666666 transparent transparent transparent; } .k-tooltip-arrow { - border-style: solid; - border-width: 7px; - height: 0; - width: 0; - position: absolute; + border-style: solid; + border-width: 7px; + height: 0; + width: 0; + position: absolute; } .k-tooltip-arrow-n { - border-color: transparent transparent #FEFFF1 transparent; + border-color: transparent transparent #FEFFF1 transparent; } .k-tooltip-arrow-s { - border-color: #FEFFF1 transparent transparent transparent; + border-color: #FEFFF1 transparent transparent transparent; } /* IE6 */ .k-tooltip-arrow { - _border-left-color: pink; - _border-bottom-color: pink; - _border-right-color: pink; - _filter: chroma(color = pink); + _border-left-color: pink; + _border-bottom-color: pink; + _border-right-color: pink; + _filter: chroma(color = pink); } /* end tooltip */ \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-04-28 13:50:23 UTC (rev 1325) @@ -19,7 +19,8 @@ */ package cc.kune.core.client.sitebar.spaces; -import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SiteTokens; @@ -33,6 +34,7 @@ import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; +import com.google.inject.Provider; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; @@ -72,16 +74,19 @@ private String homeToken; private String publicToken; private final Session session; + private final Provider<SignIn> signIn; private final StateManager stateManager; private String userToken; @Inject public SpaceSelectorPresenter(final EventBus eventBus, final StateManager stateManager, - final SpaceSelectorView view, final SpaceSelectorProxy proxy, final GSpaceArmor armor, final Session session) { + final SpaceSelectorView view, final SpaceSelectorProxy proxy, final GSpaceArmor armor, + final Session session, final Provider<SignIn> signIn) { super(eventBus, view, proxy); this.stateManager = stateManager; this.armor = armor; this.session = session; + this.signIn = signIn; currentSpace = null; homeToken = SiteTokens.HOME; userToken = SiteTokens.WAVEINBOX; @@ -205,11 +210,10 @@ getView().setPublicBtnDown(false); currentSpace = Space.userSpace; } else { + signIn.get().setErrorMessage("Sign in to access to your workspace", NotifyLevel.info); stateManager.gotoHistoryToken(TokenUtils.addRedirect(SiteTokens.SIGNIN, userToken)); getView().setUserBtnDown(false); - NotifyUser.info("Sign in to access to your workspace"); - // signIn.get().setErrorMessage("Sign in to access to your workspace", - // NotifyLevel.info); + // NotifyUser.info("Sign in to access to your workspace"); } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java 2011-04-28 13:50:23 UTC (rev 1325) @@ -36,74 +36,77 @@ import com.gwtplatform.mvp.client.ViewImpl; public class SpaceSelectorViewImpl extends ViewImpl implements SpaceSelectorView { - interface SpaceSelectorViewImplUiBinder extends UiBinder<Widget, SpaceSelectorViewImpl> { - } - private static SpaceSelectorViewImplUiBinder uiBinder = GWT.create(SpaceSelectorViewImplUiBinder.class); - @UiField - ToggleButton groupButton; - @UiField - ToggleButton homeButton; - @UiField - HorizontalPanel panel; - @UiField - ToggleButton publicButton; - @UiField - ToggleButton userButton; + interface SpaceSelectorViewImplUiBinder extends UiBinder<Widget, SpaceSelectorViewImpl> { + } + private static SpaceSelectorViewImplUiBinder uiBinder = GWT.create(SpaceSelectorViewImplUiBinder.class); + @UiField + ToggleButton groupButton; + @UiField + ToggleButton homeButton; + @UiField + HorizontalPanel panel; + @UiField + ToggleButton publicButton; + @UiField + ToggleButton userButton; - @Inject - public SpaceSelectorViewImpl(final GSpaceArmor armor, final I18nTranslationService i18n, final WsArmorResources res) { - armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0); - Tooltip.to(homeButton, i18n.t("Your home page in this site")); - Tooltip.to(userButton, i18n.t("User space: it shows a list of all your documents and contents " - + "in which you participate")); - Tooltip.to(groupButton, i18n.t("Group and personal space: Where you can create " - + "and publish contents for your personal or group web spaces")); - Tooltip.to(publicButton, i18n.t("Public space: In this space you can see a preview of how the Personal o" - + "r Group Space looks like on the web, outside this site")); - } + @Inject + public SpaceSelectorViewImpl(final GSpaceArmor armor, final I18nTranslationService i18n, + final WsArmorResources res) { + armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0); + homeButton.setVisible(false); + Tooltip.to(homeButton, i18n.t("Your home page in this site")); + Tooltip.to(userButton, i18n.t("User space: it shows a list of all your documents and contents " + + "in which you participate")); + Tooltip.to(groupButton, i18n.t("Group and personal space: Where you can create " + + "and publish contents for your personal or group web spaces")); + Tooltip.to(publicButton, + i18n.t("Public space: In this space you can see a preview of how the Personal o" + + "r Group Space looks like on the web, outside this site")); + } - @Override - public Widget asWidget() { - return panel; - } + @Override + public Widget asWidget() { + return panel; + } - @Override - public HasClickHandlers getGroupBtn() { - return groupButton; - } + @Override + public HasClickHandlers getGroupBtn() { + return groupButton; + } - @Override - public HasClickHandlers getHomeBtn() { - return homeButton; - } + @Override + public HasClickHandlers getHomeBtn() { + return homeButton; + } - @Override - public HasClickHandlers getPublicBtn() { - return publicButton; - } + @Override + public HasClickHandlers getPublicBtn() { + return publicButton; + } - @Override - public HasClickHandlers getUserBtn() { - return userButton; - } + @Override + public HasClickHandlers getUserBtn() { + return userButton; + } - @Override - public void setGroupBtnDown(final boolean down) { - groupButton.setDown(down); - } + @Override + public void setGroupBtnDown(final boolean down) { + groupButton.setDown(down); + } - @Override - public void setHomeBtnDown(final boolean down) { - homeButton.setDown(down); - } + @Override + public void setHomeBtnDown(final boolean down) { + homeButton.setDown(down); + } - @Override - public void setPublicBtnDown(final boolean down) { - publicButton.setDown(down); - } + @Override + public void setPublicBtnDown(final boolean down) { + publicButton.setDown(down); + } - @Override - public void setUserBtnDown(final boolean down) { - userButton.setDown(down); - } + @Override + public void setUserBtnDown(final boolean down) { + userButton.setDown(down); + } } Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-28 13:50:23 UTC (rev 1325) @@ -1,20 +1,20 @@ @CHARSET "UTF-8"; body { - background-color: white; - color: black; - font-family: 'Ubuntu', Arial; - font-size: small; - margin: 5px; - overflow: hidden; + background-color: white; + color: black; + font-family: 'Ubuntu', Arial; + font-size: small; + margin: 5px; + overflow: hidden; } * { - font-family: 'Ubuntu', Arial; + font-family: 'Ubuntu', Arial; } body.fontface { - font: 'Ubuntu', Arial; + font: 'Ubuntu', Arial; } /* @@ -27,32 +27,32 @@ } */ .gwt-DialogBox { - border: 2px solid #AAAAAA; - background-color: white; + border: 2px solid #AAAAAA; + background-color: white; } .gwt-DialogBox .Caption { - background-image: url(gray_gradient.gif); - background-repeat: repeat-x; - padding: 4px; - padding-bottom: 8px; - font-weight: bold; - cursor: default; + background-image: url(gray_gradient.gif); + background-repeat: repeat-x; + padding: 4px; + padding-bottom: 8px; + font-weight: bold; + cursor: default; } .gwt-MenuBar { - background-color: #C3D9FF; - cursor: default; + background-color: #C3D9FF; + cursor: default; } .gwt-MenuItem { - font-size: 14px; - margin: 1px; - cursor: default; + font-size: 14px; + margin: 1px; + cursor: default; } .gwt-MenuItem-selected { - background-color: #E8EEF7; + background-color: #E8EEF7; } .gwt-Tree { @@ -60,26 +60,26 @@ } .gwt-Tree .gwt-TreeItem { - font-size: 14px; - cursor: default; + font-size: 14px; + cursor: default; } .gwt-Tree .gwt-TreeItem-selected { - background-color: #C3D9FF; + background-color: #C3D9FF; } .gwt-StackPanel { - background-color: white; - border: 1px solid #AAAAAA; - width: 15em; + background-color: white; + border: 1px solid #AAAAAA; + width: 15em; } .gwt-StackPanel .gwt-StackPanelItem { - background-image: url(blue_gradient.gif); - background-repeat: repeat-x; - background-color: #EEEEEE; - cursor: pointer; - cursor: hand; + background-image: url(blue_gradient.gif); + background-repeat: repeat-x; + background-color: #EEEEEE; + cursor: pointer; + cursor: hand; } .gwt-StackPanel .gwt-StackPanelItem-selected { @@ -91,236 +91,236 @@ } .gwt-TabPanelBottom { - border-left: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; + border-left: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; } .gwt-TabBar { - font-size: smaller; + font-size: smaller; } .gwt-TabBar .gwt-TabBarFirst { - height: 100%; - border-bottom: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - padding-left: 3px; + height: 100%; + border-bottom: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + padding-left: 3px; } .gwt-TabBar .gwt-TabBarRest { - border-bottom: 1px solid #87b3ff; - padding-right: 3px; + border-bottom: 1px solid #87b3ff; + padding-right: 3px; } .gwt-TabBar .gwt-TabBarItem { - border-top: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; - padding: 2px; - cursor: hand; - white-space: nowrap; - border-right: 1px solid #87b3ff; + border-top: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; + padding: 2px; + cursor: hand; + white-space: nowrap; + border-right: 1px solid #87b3ff; } .gwt-TabBar .gwt-TabBarItem-selected { - font-weight: bold; - background-color: #e8eef7; - border-top: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #e8eef7; - padding: 2px; - cursor: default; - white-space: nowrap; + font-weight: bold; + background-color: #e8eef7; + border-top: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #e8eef7; + padding: 2px; + cursor: default; + white-space: nowrap; } .gwt-PushButton-up { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-PushButton-up-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-PushButton-down { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-PushButton-down-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-up { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-up-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-down { - background-color: #C3D9FF; - padding: 2px; - background-color: #E8F1FF; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-down-hovering { - background-color: #C3D9FF; - padding: 2px; - background-color: #E8F1FF; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-RichTextArea { - border: 1px solid black; - background-color: white; + border: 1px solid black; + background-color: white; } .gwt-RichTextToolbar { - background-color: #C3D9FF; - padding: 2px; + background-color: #C3D9FF; + padding: 2px; } .gwt-RichTextToolbar .gwt-PushButton-up { - margin-right: 2px; - border: 1px solid #C3D9FF; + margin-right: 2px; + border: 1px solid #C3D9FF; } .gwt-RichTextToolbar .gwt-PushButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); } .gwt-RichTextToolbar .gwt-PushButton-down { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-PushButton-down-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-ToggleButton-up { - margin-right: 2px; - border: 1px solid #C3D9FF; + margin-right: 2px; + border: 1px solid #C3D9FF; } .gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); } .gwt-RichTextToolbar .gwt-ToggleButton-down { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-HorizontalSplitPanel { - border: 8px solid #C3D9FF; + border: 8px solid #C3D9FF; } .gwt-HorizontalSplitPanel .splitter { - background-color: #C3D9FF; - cursor: move; + background-color: #C3D9FF; + cursor: move; } .gwt-HorizontalSplitPanel .left { - background-color: #E8EEF7; + background-color: #E8EEF7; } .gwt-VerticalSplitPanel { - border: 8px solid #C3D9FF; + border: 8px solid #C3D9FF; } .gwt-VerticalSplitPanel .splitter { - background-color: #C3D9FF; - height: 8px; - cursor: move; + background-color: #C3D9FF; + height: 8px; + cursor: move; } .gwt-SuggestBoxPopup { - border: 2px solid #C3D9FF; + border: 2px solid #C3D9FF; } .gwt-SuggestBoxPopup .item { - padding: 2px; + padding: 2px; } .gwt-SuggestBoxPopup .item-selected { - background-color: #C3D9FF; - padding: 2px; + background-color: #C3D9FF; + padding: 2px; } .gwt-DisclosurePanel { - border: 2px solid #C3D9FF; + border: 2px solid #C3D9FF; } .gwt-DisclosurePanel .header { - background-color: #e8eef7; - cursor: hand; + background-color: #e8eef7; + cursor: hand; } .gwt-SplitLayoutPanel { @@ -328,85 +328,89 @@ } .gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { - background-color: transparent; - background: url("images/spliter-top.png") no-repeat scroll center bottom - transparent; - cursor: col-resize; + background-color: transparent; + background: url("images/spliter-top.png") no-repeat scroll center bottom + transparent; + cursor: col-resize; } .gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-VDragger { - background-color: white; - background: none; - cursor: row-resize; + background-color: white; + background: none; + cursor: row-resize; } .kLoadingPanel { - background-color: #FF9999; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; - padding: 0 1px 0 3px; - border-collapse: separate; - border-spacing: 2px; + background-color: #FF9999; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + padding: 0 1px 0 3px; + border-collapse: separate; + border-spacing: 2px; } .kLoadingLabel { - font-size: 14px; - color: white; - font-weight: bold; - padding: 0 5px 0 5px; + font-size: 14px; + color: white; + font-weight: bold; + padding: 0 5px 0 5px; } .k-space-tooltip { - border-collapse: separate; - border-spacing: 5px; - vertical-align: middle; - line-height: 1.1em; + border-collapse: separate; + border-spacing: 5px; + vertical-align: middle; + line-height: 1.1em; } .k-space-sel { - margin-right: 10px; - background-color: #F2F2F2; + margin-right: 10px; + background-color: #F2F2F2; } .k-space-sel-btn { - padding: 0 1px 0 1px; - margin: 0 0 -2px; + padding: 0 1px 0 1px; + margin: 0 0 -2px; } .k-sitebar-logo { - margin-top: 2px; + margin-top: 2px; } .x-btn button,button { /* font: 18px/27px 'Ubuntu', arial; */ } +.x-panel-mc { + font: inherit; +} + .k-btn-sitebar span,.k-btn-sitebar button span,.k-sitebar button span { - text-decoration: underline; + text-decoration: underline; } .k-btn-sitebar,.k-btn-sitebar button,.k-sitebar button { - font: 13px 'Ubuntu', arial; - color: #B3B3B3; - cursor: pointer; - white-space: nowrap; - background: none; - border: 0px; - padding: 0 3px 0 0 !important; + font: 13px 'Ubuntu', arial; + color: #B3B3B3; + cursor: pointer; + white-space: nowrap; + background: none; + border: 0px; + padding: 0 3px 0 0 !important; } .k-sitebar-wave-status { - font: 13px 'Ubuntu', arial; - /* font-weight: bold; */ - color: #B3B3B3; - white-space: nowrap; - background: none; - border: 0px; - padding: 1px 7px 0 0 !important; + font: 13px 'Ubuntu', arial; + /* font-weight: bold; */ + color: #B3B3B3; + white-space: nowrap; + background: none; + border: 0px; + padding: 1px 7px 0 0 !important; } .k-sitebar-wave-status { @@ -414,20 +418,20 @@ } .k-sitebar-wave-status-online { - color: green; + color: green; } .k-sitebar-wave-status-offline { - color: red; + color: red; } .k-sitebar button:hover { - border: 0px; - background: none; + border: 0px; + background: none; } .k-btn-sitebar button { - margin-top: -5px; + margin-top: -5px; } .k-sitebar { /* margin-top: -30px; */ @@ -435,247 +439,247 @@ } .k-link { - text-decoration: underline; - color: green; - cursor: pointer; + text-decoration: underline; + color: green; + cursor: pointer; } /* Margins */ .kune-Margin-40-trbl { - margin: 40px; + margin: 40px; } .kune-Margin-40-lr { - margin-left: 40px; - margin-right: 40px; + margin-left: 40px; + margin-right: 40px; } .kune-Margin-40-tl { - margin-top: 40px; - margin-left: 40px; + margin-top: 40px; + margin-left: 40px; } .kune-Margin-40-tb { - margin-top: 40px; - margin-bottom: 40px; + margin-top: 40px; + margin-bottom: 40px; } .kune-Margin-40-t { - margin-top: 40px; + margin-top: 40px; } .kune-Margin-40-r { - margin-right: 40px; + margin-right: 40px; } .kune-Margin-40-l { - margin-left: 40px; + margin-left: 40px; } .kune-Margin-20-trbl { - margin: 20px; + margin: 20px; } .kune-Margin-20-lr { - margin-left: 20px; - margin-right: 20px; + margin-left: 20px; + margin-right: 20px; } .kune-Margin-20-tl { - margin-top: 20px; - margin-left: 20px; + margin-top: 20px; + margin-left: 20px; } .kune-Margin-20-tb { - margin-top: 20px; - margin-bottom: 20px; + margin-top: 20px; + margin-bottom: 20px; } .kune-Margin-20-t { - margin-top: 20px; + margin-top: 20px; } .kune-Margin-20-r { - margin-right: 20px; + margin-right: 20px; } .kune-Margin-20-l { - margin-left: 20px; + margin-left: 20px; } .kune-Margin-Large-trbl { - margin: 10px; + margin: 10px; } .kune-Margin-Large-lr { - margin-left: 10px; - margin-right: 10px; + margin-left: 10px; + margin-right: 10px; } .kune-Margin-Large-tl { - margin-top: 10px; - margin-left: 10px; + margin-top: 10px; + margin-left: 10px; } .kune-Margin-Large-tb { - margin-top: 10px; - margin-bottom: 10px; + margin-top: 10px; + margin-bottom: 10px; } .kune-Margin-Large-t { - margin-top: 10px; + margin-top: 10px; } .kune-Margin-Large-r { - margin-right: 10px; + margin-right: 10px; } .kune-Margin-Large-l { - margin-left: 10px; + margin-left: 10px; } .kune-Margin-7-trbl { - margin: 7px; + margin: 7px; } .kune-Margin-7-lr { - margin-left: 7px; - margin-right: 7px; + margin-left: 7px; + margin-right: 7px; } .kune-Margin-7-tl { - margin-top: 7px; - margin-left: 7px; + margin-top: 7px; + margin-left: 7px; } .kune-Margin-7-tb { - margin-top: 7px; - margin-bottom: 7px; + margin-top: 7px; + margin-bottom: 7px; } .kune-Margin-7-t { - margin-top: 7px; + margin-top: 7px; } .kune-Margin-7-r { - margin-right: 7px; + margin-right: 7px; } .kune-Margin-7-b { - margin-bottom: 7px; + margin-bottom: 7px; } .kune-Margin-7-l { - margin-left: 7px; + margin-left: 7px; } .kune-Margin-Medium-trbl { - margin: 5px; + margin: 5px; } .kune-Margin-Medium-lr { - margin-left: 5px; - margin-right: 5px; + margin-left: 5px; + margin-right: 5px; } .kune-Margin-Medium-tl { - margin-top: 5px; - margin-left: 5px; + margin-top: 5px; + margin-left: 5px; } .kune-Margin-Medium-tb { - margin-top: 5px; - margin-bottom: 5px; + margin-top: 5px; + margin-bottom: 5px; } .kune-Margin-Medium-t { - margin-top: 5px; + margin-top: 5px; } .kune-Margin-Medium-r { - margin-right: 5px; + margin-right: 5px; } .kune-Margin-Medium-b { - margin-bottom: 5px; + margin-bottom: 5px; } .kune-Margin-Medium-l { - margin-left: 5px; + margin-left: 5px; } .kune-Margin-Small-trbl { - margin: 3px; + margin: 3px; } .kune-Margin-Small-lr { - margin-left: 3px; - margin-right: 3px; + margin-left: 3px; + margin-right: 3px; } .kune-Margin-Small-tl { - margin-top: 3px; - margin-left: 3px; + margin-top: 3px; + margin-left: 3px; } .kune-Margin-Small-tb { - margin-top: 3px; - margin-bottom: 3px; + margin-top: 3px; + margin-bottom: 3px; } .kune-Margin-Small-t { - margin-top: 3px; + margin-top: 3px; } .kune-Margin-Small-l { - margin-left: 3px; + margin-left: 3px; } .kune-Margin-Small-r { - margin-right: 3px; + margin-right: 3px; } .kune-Margin-Small-b { - margin-bottom: 3px; + margin-bottom: 3px; } .kune-Margin-Mini-trbl { - margin: 1px; + margin: 1px; } .kune-Margin-Mini-lr { - margin-left: 1px; - margin-right: 1px; + margin-left: 1px; + margin-right: 1px; } .kune-Margin-Mini-tl { - margin-top: 1px; - margin-left: 1px; + margin-top: 1px; + margin-left: 1px; } .kune-Margin-Mini-tb { - margin-top: 1px; - margin-bottom: 1px; + margin-top: 1px; + margin-bottom: 1px; } .kune-Margin-Mini-t { - margin-top: 1px; + margin-top: 1px; } .kune-Margin-Mini-r { - margin-right: 1px; + margin-right: 1px; } .kune-Margin-Mini-b { - margin-bottom: 1px; + margin-bottom: 1px; } .kune-Margin-Mini-l { - margin-left: 1px; + margin-left: 1px; } .k-publicspace-msg { - background-color: #E0E0E0; + background-color: #E0E0E0; } .k-publicspace-mask { /* background-color: #fff !important; @@ -687,147 +691,147 @@ } .k-publicspace-panel { - margin: 5px; - display: table-row; + margin: 5px; + display: table-row; } .k-publicspace-icon { - margin: 3px 3px 3px 0; - float: left; + margin: 3px 3px 3px 0; + float: left; } .k-publicspace-title { - font-weight: bold; - display: block; - margin-bottom: 5px; - font-size: 16px; - display: table-caption; + font-weight: bold; + display: block; + margin-bottom: 5px; + font-size: 16px; + display: table-caption; } .k-publicspace-description { - font-size: 14px; - display: table-cell; + font-size: 14px; + display: table-cell; } .k-publicspace-actions { - display: inline; + display: inline; } .k-message-panel { - margin: 5px; - display: table-row; + margin: 5px; + display: table-row; } .k-message-icon { - margin: 3px 3px 3px 0; - float: left; + margin: 3px 3px 3px 0; + float: left; } .k-message-title { - font-weight: bold; - display: block; - margin-bottom: 5px; - font-size: 16px; - display: table-caption; + font-weight: bold; + display: block; + margin-bottom: 5px; + font-size: 16px; + display: table-caption; } .k-message-description { - font-size: 14px; - display: table-cell; + font-size: 14px; + display: table-cell; } .k-error-tb { - background: #FFB380 none repeat scroll 0% 50%; - /* color: #250; */ - padding: 10px; + background: #FFB380 none repeat scroll 0% 50%; + /* color: #250; */ + padding: 10px; } .k-error-tb img { - margin: 0 10px; - float: left; + margin: 0 10px; + float: left; } .k-error-tb div { - font-size: 14px; - display: table-cell; + font-size: 14px; + display: table-cell; } .k-mask { - background-color: #F2F2F2 !important; - /* kfilter: alpha(opacity = 78) !important; */ - -moz-opacity: 0.78 !important; - -khtml-opacity: 0.78 !important; - opacity: 0.78 !important; + background-color: #F2F2F2 !important; + /* kfilter: alpha(opacity = 78) !important; */ + -moz-opacity: 0.78 !important; + -khtml-opacity: 0.78 !important; + opacity: 0.78 !important; } .x-form-item-label { - font-size: 14px; - font-weight: bold; - color: brown; + font-size: 14px; + font-weight: bold; + color: brown; } .x-form-text { - font-size: 14px; + font-size: 14px; } .x-fieldset-header-text,.x-form-group-label,.x-form-cb-label { - font-size: 14px; - font-family: 'Ubuntu', Arial; + font-size: 14px; + font-family: 'Ubuntu', Arial; } .k-form-intro { - font-size: 14px; - margin-bottom: 10px; + font-size: 14px; + margin-bottom: 10px; } .k-form-fieldset { - font-size: 16px; - margin-left: 105px; + font-size: 16px; + margin-left: 105px; } .k-basic-thumb { - background-color: #F2F2F2; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; + background-color: #F2F2F2; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; } .k-basic-thumb img { - margin: 2px 2px 0px 2px; + margin: 2px 2px 0px 2px; } .k-basic-thumb div { - margin: -3px 0px 0px 0px; - font-weight: normal; - font-size: 12px; + margin: -3px 0px 0px 0px; + font-weight: normal; + font-size: 12px; } .k-sn-mainpanel { - font-size: 16px; - font-weight: bold; + font-size: 16px; + font-weight: bold; } .k-sn-maintitle { - margin: 5px; + margin: 5px; } .k-sn-maintitle { - color: #a05a2c; - font-size: 20px; + color: #a05a2c; + font-size: 20px; } .k-sn-adminslabel,.k-sn-collabslabel,.k-sn-pendingslabel { - color: #FFF; - text-transform: lowercase; - padding-left: 10px; - float: left; + color: #FFF; + text-transform: lowercase; + padding-left: 10px; + float: left; } .k-sn-adminsCountlabel,.k-sn-collabsCountlabel,.k-sn-pendingsCountlabel - { - float: left; - padding-left: 5px; - color: #e0e0e0; + { + float: left; + padding-left: 5px; + color: #e0e0e0; } .k-sn-adminslabel { @@ -835,7 +839,7 @@ } .k-sn-mainpanel .k-basic-thumb { - float: left; + float: left; } /* @@ -845,41 +849,42 @@ } */ .k-sn-mainpanel .x-btn button,.k-sn-mainpanel button,button.k-button { - font: 13px 'Ubuntu', arial; - border: 2px solid #CCCCCC; - cursor: pointer; - margin: 0; - padding: 3px 0; - text-decoration: none; - background-color: #F2F2F2; - color: #855585; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - vertical-align: middle; - line-height: 2em !important; - /* height: 26px !important; */ - font-weight: bold; - /* + font: 13px 'Ubuntu', arial; + border: 2px solid #CCCCCC; + cursor: pointer; + margin: 0; + padding: 3px 0; + text-decoration: none; + background-color: #F2F2F2; + color: #A05A2C; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + vertical-align: middle; + line-height: 2em !important; + /* height: 26px !important; */ + font-weight: bold; + /* font-size:small; cursor: pointer; border: 2px gray solid; padding-left: 25px !important; */ } -.k-sn-mainpanel .x-btn button:hover,.k-sn-mainpanel button:hover,.k-button button:hover - { - border: 2px orange solid; - background: #f0f0f0; - color: #855585; +.k-sn-mainpanel .x-btn button:hover,.k-sn-mainpanel button:hover,button.k-button:hover { + border: 2px orange solid; + /* background: #f0f0f0; */ } -.k-sn-mainpanel .x-btn button:active,.k-sn-mainpanel button:active,.k-button - button:active { - border-top-color: #ffffff; - background: #ffffff; +.k-sn-mainpanel .x-btn button:hover span,.k-sn-mainpanel button:hover span,button.k-button:hover span { + color: brown !important; } +.k-sn-mainpanel .x-btn button:active,.k-sn-mainpanel button:active,button.k-button:active { + border-top-color: #ffffff; + background: #ffffff; +} + .k-sn-collabslabel { } @@ -889,20 +894,20 @@ } .k-sn-orphan-label { - padding: 10px; + padding: 10px; } .k-sn-novisible-label { - padding: 10px; + padding: 10px; } .k-sn-adminspanel { /* background-color: #a05a2c; */ - border-bottom: 2px solid #F7EBE3; - border-top: 2px solid #F7EBE3; + border-bottom: 2px solid #F7EBE3; + border-top: 2px solid #F7EBE3; } .k-sn-collabspanel { - background-color: #d38d5f; + background-color: #d38d5f; } .k-sn-pendingspanel { /* background-color: #a05a2c; */ @@ -914,7 +919,7 @@ } .k-sn-adminsflow,.k-sn-collabsflow,.k-sn-pendingsflow { - margin-left: 10px; + margin-left: 10px; } .k-sn-adminsscroll { @@ -930,8 +935,8 @@ } .k-userconfirm-label { - width: 300px; - margin: 10px; + width: 300px; + margin: 10px; } .k-sn-deck { @@ -939,159 +944,159 @@ } .k-sn-bottomPanel { - padding: 8px 10px 0; - float: left; + padding: 8px 10px 0; + float: left; } .k-sn-bottomPanel-actions { - width: 100%; + width: 100%; } .k-sn-novisible-label,.k-sn-orphan-label { - color: #FFF; - font-size: 16px; - font-weight: bold; + color: #FFF; + font-size: 16px; + font-weight: bold; } .k-frame-def { - margin: 0px; - border: 0px; + margin: 0px; + border: 0px; } .k-maxsize { - width: 100%; - height: 100%; + width: 100%; + height: 100%; } .k-footer-license-label { - float: right; - margin-top: 8px; - cursor: pointer; - font-weight: bold; - font-size: 16px; - color: #784421; + float: right; + margin-top: 8px; + cursor: pointer; + font-weight: bold; + font-size: 16px; + color: #784421; } .k-footer-license-label-title { - margin-right: 5px; - color: #280b0b; + margin-right: 5px; + color: #280b0b; } .k-footer-license-img { - float: right; - margin: 10px 15px 0px 5px; - cursor: pointer; + float: right; + margin: 10px 15px 0px 5px; + cursor: pointer; } .k-sn-options-menu { - float: left; + float: left; } .k-sn-options-menu button { - background-color: none; + background-color: none; } .k-sn-join { - float: left; + float: left; } .k-entitytextlogo-border { - border: 2px solid #F2F2F2; + border: 2px solid #F2F2F2; } .k-entitytextlogo-no-border { - border: none; + border: none; } .k-entitytextlogo { - height: 60px; - margin: 5px; - overflow: hidden; - width: 468px; + height: 60px; + margin: 5px; + overflow: hidden; + width: 468px; } .k-entitytextlogo table { - vertical-align: middle; + vertical-align: middle; } .k-elogo-l-l { - font-size: 46px; + font-size: 46px; } .k-elogo-l-m { - font-size: 167%; + font-size: 167%; } .k-elogo-l-s { - font-size: 108%; + font-size: 108%; } .k-entitytextlogo .gwt-Label { - font-weight: 700; - margin: 5px; - height: 27px; + font-weight: 700; + margin: 5px; + height: 27px; } .k-entitytextlogo-default .gwt-Label { - color: #69312F; + color: #69312F; } .k-entitytextlogo-green .gwt-Label { - color: #250; + color: #250; } .k-entitytextlogo-blue .gwt-Label { - color: #000080; + color: #000080; } .k-entitytextlogo-grey .gwt-Label { - color: #1A1A1A; + color: #1A1A1A; } .k-entitytextlogo-purple .gwt-Label { - color: #440055; + color: #440055; } .k-entitytextlogo-red .gwt-Label { - color: #800000; + color: #800000; } .k-elogo-plink { - color: #CCC; - font-size: 85%; - margin: 5px; - text-decoration: underline; - white-space: nowrap; - background-color: #FFF; + color: #CCC; + font-size: 85%; + margin: 5px; + text-decoration: underline; + white-space: nowrap; + background-color: #FFF; } .k-elogop-expand { - background-color: transparent; + background-color: transparent; } .k-tsp-tag { - float: left; - padding: 3px; - cursor: pointer; - color: #5B4683; + float: left; + padding: 3px; + cursor: pointer; + color: #5B4683; } .k-tsp-cloud { - line-height: 1em; - text-align: center; + line-height: 1em; + text-align: center; } .k-tool-panel { - background-color: #DEAA87; + background-color: #DEAA87; } .k-tool-item { - display: block; - cursor: pointer; + display: block; + cursor: pointer; } .k-tool-item-focus { - background-color: #d38d5f; + background-color: #d38d5f; } .k-tool-item-nofocus { @@ -1099,26 +1104,26 @@ } .k-tool-item-selected { - background-color: #C87137; + background-color: #C87137; } .k-tool-item-notselected { - background-color: inherits; + background-color: inherits; } .k-def-docbtn span { - font-size: 13px !important; + font-size: 13px !important; } .k-empty-msg { - font-size: 16px; - font-style: italic; + font-size: 16px; + font-style: italic; } button.k-ent-header-btn { - margin: 10px !important; + margin-left: 5px !important; } .k-ent-header-btn * { font-size: 13px !important; -} +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-04-28 13:50:23 UTC (rev 1325) @@ -60,7 +60,7 @@ <g:west size="10"> <g:SimplePanel /> </g:west> - <g:east size="15"> + <g:east size="10"> <g:SimplePanel /> </g:east> <g:center> Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2011-04-28 13:50:23 UTC (rev 1325) @@ -20,53 +20,55 @@ public class NewContainerBtn extends ButtonDescriptor { - public static class NewContainerAction extends RolAction { + public static class NewContainerAction extends RolAction { - private final ContentCache cache; - private final Provider<ContentServiceAsync> contentService; - private final I18nTranslationService i18n; - private final Session session; - private final StateManager stateManager; + private final ContentCache cache; + private final Provider<ContentServiceAsync> contentService; + private final I18nTranslationService i18n; + private final Session session; + private final StateManager stateManager; - @Inject - public NewContainerAction(final Session session, final StateManager stateManager, - final I18nTranslationService i18n, final Provider<ContentServiceAsync> contentService, - final ContentCache cache) { - super(AccessRolDTO.Editor, true); - this.session = session; - this.stateManager = stateManager; - this.i18n = i18n; - this.contentService = contentService; - this.cache = cache; - } + @Inject + public NewContainerAction(final Session session, final StateManager stateManager, + final I18nTranslationService i18n, final Provider<ContentServiceAsync> contentService, + final ContentCache cache) { + super(AccessRolDTO.Editor, true); + this.session = session; + this.stateManager = stateManager; + this.i18n = i18n; + this.contentService = contentService; + this.cache = cache; + } - @Override - public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); - stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken()); - contentService.get().addFolder(session.getUserHash(), session.getCurrentStateToken(), - (String) getValue(NEW_NAME), (String) getValue(ID), new AsyncCallbackSimple<StateContainerDTO>() { - @Override - public void onSuccess(final StateContainerDTO state) { - // contextNavigator.setEditOnNextStateChange(true); - stateManager.setRetrievedStateAndGo(state); - NotifyUser.hideProgress(); - } - }); - cache.removeContent(session.getCurrentStateToken()); - } - + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgressProcessing(); + stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken()); + contentService.get().addFolder(session.getUserHash(), session.getCurrentStateToken(), + (String) getValue(NEW_NAME), (String) getValue(ID), + new AsyncCallbackSimple<StateContainerDTO>() { + @Override + public void onSuccess(final StateContainerDTO state) { + // contextNavigator.setEditOnNextStateChange(true); + stateManager.setRetrievedStateAndGo(state); + NotifyUser.hideProgress(); + } + }); + cache.removeContent(session.getCurrentStateToken()); } - private static final String ID = "ctnernewid"; - private static final String NEW_NAME = "ctnernewname"; + } - public NewContainerBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res, - final String title, final String tooltip, final String newName, final String id) { - super(action); - // The name given to this new content - action.putValue(NEW_NAME, newName); - action.putValue(ID, id); - this.withText(title).withToolTip(tooltip).withIcon(res.folderAdd()).withStyles("k-def-docbtn"); - } + private static final String ID = "ctnernewid"; + private static final String NEW_NAME = "ctnernewname"; + + public NewContainerBtn(final I18nTranslationService i18n, final NewContainerAction action, + final NavResources res, final String title, final String tooltip, final String newName, + final String id) { + super(action); + // The name given to this new content + action.putValue(NEW_NAME, newName); + action.putValue(ID, id); + this.withText(title).withToolTip(tooltip).withIcon(res.folderAdd()).withStyles("k-def-docbtn, k-fr"); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java 2011-04-28 13:50:23 UTC (rev 1325) @@ -23,56 +23,57 @@ public class NewContentBtn extends ButtonDescriptor { - public static class NewContentAction extends RolAction { + public static class NewContentAction extends RolAction { - private final ContentCache cache; - private final Provider<ContentServiceAsync> contentService; - private final Session session; - private final StateManager stateManager; + private final ContentCache cache; + private final Provider<ContentServiceAsync> contentService; + private final Session session; + private final StateManager stateManager; - @Inject - public NewContentAction(final Session session, final StateManager stateManager, - final I18nTranslationService i18n, final Provider<ContentServiceAsync> contentService, - final ContentCache cache) { - super(AccessRolDTO.Editor, true); - this.session = session; - this.stateManager = stateManager; - this.contentService = contentService; - this.cache = cache; - } + @Inject + public NewContentAction(final Session session, final StateManager stateManager, + final I18nTranslationService i18n, final Provider<ContentServiceAsync> contentService, + final ContentCache cache) { + super(AccessRolDTO.Editor, true); + this.session = session; + this.stateManager = stateManager; + this.contentService = contentService; + this.cache = cache; + } - @Override - public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); - stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken()); - contentService.get().addContent(session.getUserHash(), session.getCurrentStateToken(), - (String) getValue(NEW_NAME), (String) getValue(ID), new AsyncCallbackSimple<StateContentDTO>() { - @Override - public void onSuccess(final StateContentDTO state) { - stateManager.setRetrievedStateAndGo(state); - NotifyUser.hideProgress(); - // stateManager.refreshCurrentGroupState(); - // contextNavigator.setEditOnNextStateChange(true); - } - }); - cache.removeContent(session.getCurrentStateToken()); - } + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgressProcessing(); + stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken()); + contentService.get().addContent(session.getUserHash(), session.getCurrentStateToken(), + (String) getValue(NEW_NAME), (String) getValue(ID), + new AsyncCallbackSimple<StateContentDTO>() { + @Override + public void onSuccess(final StateContentDTO state) { + stateManager.setRetrievedStateAndGo(state); + NotifyUser.hideProgress(); + // stateManager.refreshCurrentGroupState(); + // contextNavigator.setEditOnNextStateChange(true); + } + }); + cache.removeContent(session.getCurrentStateToken()); } + } - private static final String ID = "ctnnewid"; - private static final String NEW_NAME = "ctnnewname"; + private static final String ID = "ctnnewid"; + private static final String NEW_NAME = "ctnnewname"; - public NewContentBtn(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, - final GlobalShortcutRegister shorcutReg, final String title, final String tooltip, final String newName, - final String id) { - super(action); - // The name given to this new content - action.putValue(NEW_NAME, newName); - action.putValue(ID, id); - final KeyStroke shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('N')); - shorcutReg.put(shortcut, action); - this.withText(title).withToolTip(tooltip).withIcon(res.pageAdd()).withShortcut(shortcut).withStyles( - "k-def-docbtn"); - } + public NewContentBtn(final I18nTranslationService i18n, final NewContentAction action, + final NavResources res, final GlobalShortcutRegister shorcutReg, final String title, + final String tooltip, final String newName, final String id) { + super(action); + // The name given to this new content + action.putValue(NEW_NAME, newName); + action.putValue(ID, id); + final KeyStroke shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('N')); + shorcutReg.put(shortcut, action); + this.withText(title).withToolTip(tooltip).withIcon(res.pageAdd()).withShortcut(shortcut).withStyles( + "k-def-docbtn, k-fr"); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-04-28 13:50:23 UTC (rev 1325) @@ -2,141 +2,160 @@ @external .*; .floatLeft { - float: left; + float: left; } .mainPanel { - border-top: 2px solid white; - border-bottom: 7px solid white; - border-right: 7px solid white; - border-left: 7px solid white; + border-top: 2px solid white; + border-bottom: 7px solid white; + border-right: 7px solid white; + border-left: 7px solid white; } .floatRight { - float: right; + float: right; } .siteBar { - overflow: hidden; + overflow: hidden; } .entityHeader { - -webkit-border-top-right-radius: 10px; - -moz-border-radius-topright: 10px; - border-top-right-radius: 10px; - background-color: #f4e3d7; - overflow: hidden; + -webkit-border-top-right-radius: 10px; + -moz-border-radius-topright: 10px; + border-top-right-radius: 10px; + background-color: #f4e3d7; + overflow: hidden; } .entityFooter { - -webkit-border-bottom-right-radius: 10px; - -moz-border-radius-bottomright: 10px; - border-bottom-right-radius: 10px; - background-color: #f7ebe3; - /* padding: 7px 10px 0px 17px; */ - overflow: hidden; + -webkit-border-bottom-right-radius: 10px; + -moz-border-radius-bottomright: 10px; + border-bottom-right-radius: 10px; + background-color: #f7ebe3; + /* padding: 7px 10px 0px 17px; */ + overflow: hidden; } .entityFooter span { - color: #784421; - font-size: 16px; - font-weight: bold; + color: #784421; + font-size: 16px; + font-weight: bold; } .entityHeader span { - font-size: 56px; + font-size: 56px; /* margin-left: 15px; */ - color: #550000; - font-weight: bold; - font: 'UbuntuBold', Arial; + color: #550000; + font-weight: bold; + font: 'UbuntuBold', Arial; } .docHeader { - background-color: #c87137; - overflow: hidden; + background-color: #D38D5F; + overflow: hidden; } .docHeaderArrow { - position: relative; - z-index: 10; - top: -25px; - left: 10px; + position: relative; + z-index: 10; + top: -25px; + left: 10px; } .docHeader span { - color: #FFF; - font-size: 28px; - font-weight: bold; - margin-left: 15px; - font: 'UbuntuBold', Arial; + color: #FFF; + font-size: 26px; + font-weight: bold; + margin-left: 15px; + font: 'UbuntuBold', Arial; } +.docHeader img { + float: left; + margin: 10px -10px 0 10px; + background-color: white; +} + .docSubheader { - background-color: #f7ebe3; - padding: 15px 0 0 15px; - overflow: hidden; + background-color: #f7ebe3; + padding: 15px 0 0 0; + overflow: hidden; + border-collapse: separate; } +.docSubheader button.k-fr { + margin: 0 10px 0 0; +} + +.docSubheader button.k-fl { + margin: 0 0 0 10px; +} + +.docSubheader button { + margin: 0 0 0 10px; +} + .docSubheaderLeft { - position: relative; - top: 0; - left: -30px; + position: relative; + top: 0; + left: -30px; } .docSubheader span { - color: #784421; - font-size: 20px; - font-weight: bold; + color: #784421; + font-size: 20px; + font-weight: bold; } .docEditorMargin { - background-color: #f7ebe3; + background-color: #f7ebe3; } .docEditor { - background-color: #FFF; - border-left: 1px solid #959595; - border-right: 1px solid #959595; - border-top: 1px solid #959595; - -webkit-border-top-left-radius: 7px; - -moz-border-radius-topleft: 7px; - border-top-left-radius: 7px; - -webkit-border-top-right-radius: 7px; - -moz-border-radius-topright: 7px; - border-top-right-radius: 7px; - padding: 5px; + background-color: #FFF; + border-left: 1px solid #959595; + border-right: 1px solid #959595; + border-top: 1px solid #959595; + -webkit-border-top-left-radius: 7px; + -moz-border-radius-topleft: 7px; + border-top-left-radius: 7px; + -webkit-border-top-right-radius: 7px; + -moz-border-radius-topright: 7px; + border-top-right-radius: 7px; + padding: 5px; } .docFooter { - border-left: 1px solid #959595; - border-right: 1px solid #959595; - border-bottom: 1px solid #959595; - background-color: #e3dbdb; - -webkit-border-bottom-left-radius: 7px; - -moz-border-radius-bottomleft: 7px; - border-bottom-left-radius: 7px; - -webkit-border-bottom-right-radius: 7px; - -moz-border-radius-bottomright: 7px; - border-bottom-right-radius: 7px; - padding: 7px 7px 0 7px; - overflow: hidden; - border-collapse: separate; + border-left: 1px solid #959595; + border-right: 1px solid #959595; + border-bottom: 1px solid #959595; + background-color: #e3dbdb; + -webkit-border-bottom-left-radius: 7px; + -moz-border-radius-bottomleft: 7px; + border-bottom-left-radius: 7px; + -webkit-border-bottom-right-radius: 7px; + -moz-border-radius-bottomright: 7px; + border-bottom-right-radius: 7px; + padding: 7px 7px 0 7px; + overflow: hidden; + border-collapse: separate; } .docFooter span { - color: #784421; - font-size: 16px; - font-weight: bold; + color: #784421; + font-size: 16px; + font-weight: bold; } .entityTools { - -webkit-border-top-left-radius: 10px; - -moz-border-radius-topleft: 10px; - border-top-left-radius: 10px; - -webkit-border-bottom-left-radius: 10px; - -moz-border-radius-bottomleft: 10px; - border-bottom-left-radius: 10px; - background-color: #DEAA87; + -webkit-border-top-left-radius: 10px; + -moz-border-radius-topleft: 10px; + border-top-left-radius: 10px; + -webkit-border-bottom-left-radius: 10px; + -moz-border-radius-bottomleft: 10px; + border-bottom-left-radius: 10px; + background-color: #DEAA87; } .entityToolsNorth { /* margin: 10px; */ @@ -144,49 +163,49 @@ } .entityToolsNorth span { - color: #a05a2c; - /* font-size: 20px; + color: #a05a2c; + /* font-size: 20px; font-weight: bold; */ } .entityToolsCenter { /* margin: 10px; */ - overflow: visible !important; + overflow: visible !important; } .entityToolsCenter span { - color: #FFF; - font-size: 22px; - font-weight: bold; + color: #FFF; + font-size: 26px; + font-weight: bold; } .entityToolsSouth { - border-top: 2px solid #FFF; - padding: 10px; - border-collapse: separate; + border-top: 2px solid #FFF; + padding: 10px; + border-collapse: separate; } .entityToolsSouth span { - color: #a05a2c; - font-size: 20px; - font-weight: bold; + color: #a05a2c; + font-size: 20px; + font-weight: bold; } /* Derived from: from http://jonrohan.me/guide/css/creating-triangles-in-css/ */ .docSubheaderArrow { - border-color: #C87137 transparent transparent transparent; - border-style: solid; - border-width: 7px; - height: 0; - width: 0; - position: absolute; - bottom: 47px; - left: 36px; + border-color: #D38D5F transparent transparent transparent; + border-style: solid; + border-width: 7px; + height: 0; + width: 0; + position: absolute; + bottom: 47px; + left: 36px; } /* IE6 */ .docSubheaderArrow { - _border-left-color: pink; - _border-bottom-color: pink; - _border-right-color: pink; - _filter: literal("chroma(color=pink)"); + _border-left-color: pink; + _border-bottom-color: pink; + _border-right-color: pink; + _filter: literal("chroma(color=pink)"); } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2011-04-28 13:50:23 UTC (rev 1325) @@ -3,15 +3,15 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui"> <ui:style> .label { - text-decoration: none; - font-size: 22px; - color: white; /* - text-shadow: 1px 1px 6px grey; - */ + text-decoration: none; + font-size: 22px; + color: white; /* + text-shadow: 1px 1px 6px grey; + */ } .link a:link { - text-decoration: none; + text-decoration: none; } .self { @@ -19,8 +19,10 @@ } .flow { - min-height: 30px; - padding: 5px 10px; + min-height: 30px; + padding: 5px 10px; + -moz-user-select: none; + -khtml-user-select: none; } .iconLeft { @@ -28,13 +30,14 @@ } .iconRight { - float: right; - position: relative; - right: -17px; - top: -6px; + float: right; + position: relative; + right: -17px; + top: -6px; } </ui:style> - <ui:with field='res' type='cc.kune.gspace.client.tool.selector.ToolResources' /> + <ui:with field='res' + type='cc.kune.gspace.client.tool.selector.ToolResources' /> <g:FocusPanel ui:field="self" stylePrimaryName="k-tool-item"> <g:FlowPanel styleName="{style.flow}" ui:field="flow"> <g:Image ui:field="iconLeft" styleName="{style.iconLeft}" /> Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-04-28 13:50:23 UTC (rev 1325) @@ -1,66 +1,77 @@ package cc.kune.gspace.client.viewers; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.UiUtils; +import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.registry.IconsRegistry; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.viewers.FolderViewerPresenter.FolderViewerView; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; import com.google.gwt.user.client.ui.Widget; import com.gwtplatform.mvp.client.ViewImpl; public abstract class AbstractFolderViewerPanel extends ViewImpl implements FolderViewerView { - private final InlineLabel emptyLabel; - protected final GSpaceArmor gsArmor; - protected final I18nTranslationService i18n; - protected Widget widget; + private final InlineLabel emptyLabel; + protected final GSpaceArmor gsArmor; + protected final I18nTranslationService i18n; + private final IconsRegistry iconRegistry; + protected Widget widget; - public AbstractFolderViewerPanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n) { - this.gsArmor = gsArmor; - this.i18n = i18n; - emptyLabel = new InlineLabel(i18n.t("This folder is empty.")); - emptyLabel.setStyleName("k-empty-msg"); - } + public AbstractFolderViewerPanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n, + final ContentCapabilitiesRegistry capabilitiesRegistry) { + this.gsArmor = gsArmor; + this.i18n = i18n; + this.iconRegistry = capabilitiesRegistry.getIconsRegistry(); + emptyLabel = new InlineLabel(i18n.t("This folder is empty.")); + emptyLabel.setStyleName("k-empty-msg"); + } - @Override - public Widget asWidget() { - return widget; - } + @Override + public Widget asWidget() { + return widget; + } - @Override - public void attach() { - final ForIsWidget docContainer = gsArmor.getDocContainer(); - docContainer.add(widget); - } + @Override + public void attach() { + final ForIsWidget docContainer = gsArmor.getDocContainer(); + docContainer.add(widget); + } - @Override - public void clear() { - gsArmor.getSubheaderToolbar().clear(); - UiUtils.clear(gsArmor.getDocContainer()); - UiUtils.clear(gsArmor.getDocHeader()); - } + @Override + public void clear() { + gsArmor.getSubheaderToolbar().clear(); + UiUtils.clear(gsArmor.getDocContainer()); + UiUtils.clear(gsArmor.getDocHeader()); + } - @Override - public void detach() { - clear(); - } + @Override + public void detach() { + clear(); + } - @Override - public void setActions(final GuiActionDescCollection actions) { - gsArmor.getSubheaderToolbar().clear(); - gsArmor.getSubheaderToolbar().addAll(actions); - } + @Override + public void setActions(final GuiActionDescCollection actions) { + gsArmor.getSubheaderToolbar().clear(); + gsArmor.getSubheaderToolbar().addAll(actions); + } - @Override - public void setContainer(final StateContainerDTO state) { - gsArmor.getDocHeader().add(new InlineLabel(state.getTitle())); - } + @Override + public void setContainer(final StateContainerDTO state) { + // gsArmor.getDocHeader().add(new InlineLabel(state.getTitle())); + final IconLabel label = new IconLabel( + (ImageResource) iconRegistry.getContentTypeIcon(state.getTypeId()), state.getTitle()); + label.setStyleName("k-fl"); + gsArmor.getDocHeader().add(label); + } - @Override - public void showEmptyMsg() { - gsArmor.getDocContainer().add(emptyLabel); - } + @Override + public void showEmptyMsg() { + gsArmor.getDocContainer().add(emptyLabel); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-04-28 13:50:23 UTC (rev 1325) @@ -1,150 +1,158 @@ package cc.kune.gspace.client.viewers; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.UiUtils; +import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.registry.IconsRegistry; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.gspace.client.GSpaceArmor; import cc.kune.gspace.client.viewers.DocViewerPresenter.DocViewerView; import cc.kune.wave.client.WaveClientManager; import com.google.gwt.core.client.GWT; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.DeckPanel; import com.google.gwt.user.client.ui.InlineHTML; -import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.gwtplatform.mvp.client.ViewImpl; public class DocViewerPanel extends ViewImpl implements DocViewerView { - interface DocsViewerPanelUiBinder extends UiBinder<Widget, DocViewerPanel> { - } + interface DocsViewerPanelUiBinder extends UiBinder<Widget, DocViewerPanel> { + } - private static DocsViewerPanelUiBinder uiBinder = GWT.create(DocsViewerPanelUiBinder.class); + private static DocsViewerPanelUiBinder uiBinder = GWT.create(DocsViewerPanelUiBinder.class); - // private RemoteViewServiceMultiplexer channel; - @UiField - DeckPanel deck; - private final GSpaceArmor gsArmor; - // private IdGenerator idGenerator; - // private final Element loading = new LoadingIndicator().getElement(); - @UiField - InlineHTML onlyViewPanel; - // private ProfileManager profiles; - /** The wave panel, if a wave is open. */ - // private StagesProvider wave; - // private final WaveClientManager waveClientManager; - // @UiField - // FramedPanel waveFrame; - // @UiField - // ImplPanel waveHolder; - // private final WaveStore waveStore = new SimpleWaveStore(); - private final Widget widget; + // private RemoteViewServiceMultiplexer channel; + @UiField + DeckPanel deck; + private final GSpaceArmor gsArmor; + private final IconsRegistry iconRegistry; + // private IdGenerator idGenerator; + // private final Element loading = new LoadingIndicator().getElement(); + @UiField + InlineHTML onlyViewPanel; + // private ProfileManager profiles; + /** The wave panel, if a wave is open. */ + // private StagesProvider wave; + // private final WaveClientManager waveClientManager; + // @UiField + // FramedPanel waveFrame; + // @UiField + // ImplPanel waveHolder; + // private final WaveStore waveStore = new SimpleWaveStore(); + private final Widget widget; - @Inject - public DocViewerPanel(final GSpaceArmor wsArmor, final WaveClientManager waveClientManager) { - this.gsArmor = wsArmor; - // this.waveClientManager = waveClientManager; - widget = uiBinder.createAndBindUi(this); - } + @Inject + public DocViewerPanel(final GSpaceArmor wsArmor, final WaveClientManager waveClientManager, + final ContentCapabilitiesRegistry capabilitiesRegistry) { + this.gsArmor = wsArmor; + this.iconRegistry = capabilitiesRegistry.getIconsRegistry(); + // this.waveClientManager = waveClientManager; + widget = uiBinder.createAndBindUi(this); + } - @Override - public Widget asWidget() { - return widget; - } + @Override + public Widget asWidget() { + return widget; + } - @Override - public void attach() { - final ForIsWidget docContainer = gsArmor.getDocContainer(); - docContainer.add(widget); - } + @Override + public void attach() { + final ForIsWidget docContainer = gsArmor.getDocContainer(); + docContainer.add(widget); + } - @Override - public void clear() { - onlyViewPanel.setHTML(""); - gsArmor.getSubheaderToolbar().clear(); - UiUtils.clear(gsArmor.getDocContainer()); - UiUtils.clear(gsArmor.getDocHeader()); - } + @Override + public void clear() { + onlyViewPanel.setHTML(""); + gsArmor.getSubheaderToolbar().clear(); + UiUtils.clear(gsArmor.getDocContainer()); + UiUtils.clear(gsArmor.getDocHeader()); + } - @Override - public void detach() { - clear(); - } + @Override + public void detach() { + clear(); + } - // private WaveRef getWaveRef(final String waveRefS) { - // try { - // return GwtWaverefEncoder.decodeWaveRefFromPath(waveRefS); - // } catch (final InvalidWaveRefException e) { - // throw new UIException("Invalid waveref: " + waveRefS); - // } - // } - // - // private void initWaveClientIfNeeded() { - // if (channel == null) { - // final WaveWebSocketClient webSocket = new - // WaveWebSocketClient(WebClient.useSocketIO(), - // WebClient.getWebSocketBaseUrl(GWT.getModuleBaseURL())); - // webSocket.connect(); - // channel = new RemoteViewServiceMultiplexer(webSocket, - // new ParticipantId(Session.get().getAddress()).getAddress()); - // profiles = new ProfileManagerImpl(); - // idGenerator = ClientIdGenerator.create(); - // } - // } + // private WaveRef getWaveRef(final String waveRefS) { + // try { + // return GwtWaverefEncoder.decodeWaveRefFromPath(waveRefS); + // } catch (final InvalidWaveRefException e) { + // throw new UIException("Invalid waveref: " + waveRefS); + // } + // } + // + // private void initWaveClientIfNeeded() { + // if (channel == null) { + // final WaveWebSocketClient webSocket = new + // WaveWebSocketClient(WebClient.useSocketIO(), + // WebClient.getWebSocketBaseUrl(GWT.getModuleBaseURL())); + // webSocket.connect(); + // channel = new RemoteViewServiceMultiplexer(webSocket, + // new ParticipantId(Session.get().getAddress()).getAddress()); + // profiles = new ProfileManagerImpl(); + // idGenerator = ClientIdGenerator.create(); + // } + // } - @Override - public void setActions(final GuiActionDescCollection actions) { - gsArmor.getSubheaderToolbar().clear(); - gsArmor.getSubheaderToolbar().addAll(actions); - } + @Override + public void setActions(final GuiActionDescCollection actions) { + gsArmor.getSubheaderToolbar().clear(); + gsArmor.getSubheaderToolbar().addAll(actions); + } - @Override - public void setContent(final StateContentDTO state) { - final ForIsWidget docHeader = gsArmor.getDocHeader(); - UiUtils.clear(docHeader); - docHeader.add(new InlineLabel(state.getTitle())); - final boolean editable = state.getContentRights().isEditable(); - if (editable) { - // initWaveClientIfNeeded(); - // setEditableWaveContent(state.getWaveRef(), false); - // waveHolder.clear(); - // waveHolder.add(new Label(state.getContent() + - // " (but here goes the Wave editor -we are testing it-)")); - onlyViewPanel.setHTML(SafeHtmlUtils.fromTrustedString(state.getContent())); - } else { - onlyViewPanel.setHTML(SafeHtmlUtils.fromTrustedString(state.getContent())); - } - // deck.showWidget(editable ? 0 : 1); - deck.showWidget(1); + @Override + public void setContent(final StateContentDTO state) { + final ForIsWidget docHeader = gsArmor.getDocHeader(); + UiUtils.clear(docHeader); + // docHeader.add(new InlineLabel(state.getTitle())); + docHeader.add(new IconLabel((ImageResource) iconRegistry.getContentTypeIcon(state.getTypeId(), + state.getMimeType()), state.getTitle())); + final boolean editable = state.getContentRights().isEditable(); + if (editable) { + // initWaveClientIfNeeded(); + // setEditableWaveContent(state.getWaveRef(), false); + // waveHolder.clear(); + // waveHolder.add(new Label(state.getContent() + + // " (but here goes the Wave editor -we are testing it-)")); + onlyViewPanel.setHTML(SafeHtmlUtils.fromTrustedString(state.getContent())); + } else { + onlyViewPanel.setHTML(SafeHtmlUtils.fromTrustedString(state.getContent())); } - // - // private void setEditableWaveContent(final String waveRefS, final boolean - // isNewWave) { - // final WaveRef waveRef = getWaveRef(waveRefS); - // - // if (wave != null) { - // wave.destroy(); - // wave = null; - // } - // - // // Release the display:none. - // // UIObject.setVisible(waveFrame.getElement(), true); - // waveHolder.getElement().appendChild(loading); - // final Element holder = - // waveHolder.getElement().appendChild(Document.get().createDivElement()); - // final StagesProvider wave = new StagesProvider(holder, waveHolder, - // waveRef, channel, idGenerator, profiles, - // waveStore, isNewWave); - // this.wave = wave; - // wave.load(new Command() { - // @Override - // public void execute() { - // loading.removeFromParent(); - // } - // }); - // } + // deck.showWidget(editable ? 0 : 1); + deck.showWidget(1); + } + // + // private void setEditableWaveContent(final String waveRefS, final boolean + // isNewWave) { + // final WaveRef waveRef = getWaveRef(waveRefS); + // + // if (wave != null) { + // wave.destroy(); + // wave = null; + // } + // + // // Release the display:none. + // // UIObject.setVisible(waveFrame.getElement(), true); + // waveHolder.getElement().appendChild(loading); + // final Element holder = + // waveHolder.getElement().appendChild(Document.get().createDivElement()); + // final StagesProvider wave = new StagesProvider(holder, waveHolder, + // waveRef, channel, idGenerator, profiles, + // waveStore, isNewWave); + // this.wave = wave; + // wave.load(new Command() { + // @Override + // public void execute() { + // loading.removeFromParent(); + // } + // }); + // } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.java 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.java 2011-04-28 13:50:23 UTC (rev 1325) @@ -26,91 +26,91 @@ public class FolderItemWidget extends Composite implements HasText { - interface FolderItemWidgetUiBinder extends UiBinder<Widget, FolderItemWidget> { - } + interface FolderItemWidgetUiBinder extends UiBinder<Widget, FolderItemWidget> { + } - private static FolderItemWidgetUiBinder uiBinder = GWT.create(FolderItemWidgetUiBinder.class); + private static FolderItemWidgetUiBinder uiBinder = GWT.create(FolderItemWidgetUiBinder.class); - @UiField - FlowPanel flow; - @UiField - FocusPanel focusPanel; - @UiField - Image icon; - @UiField - SimplePanel menu; - @UiField - InlineLabel title; + @UiField + FlowPanel flow; + @UiField + FocusPanel focusPanel; + @UiField + Image icon; + @UiField + SimplePanel menu; + @UiField + InlineLabel title; - public FolderItemWidget(final ImageResource iconResource, final String title) { - initWidget(uiBinder.createAndBindUi(this)); - this.title.setText(title); - icon.setResource(iconResource); - } + public FolderItemWidget(final ImageResource iconResource, final String title) { + initWidget(uiBinder.createAndBindUi(this)); + this.title.setText(title); + icon.setResource(iconResource); + } - private void clearFocusStyles() { - focusPanel.removeStyleDependentName("nofocused"); - focusPanel.removeStyleDependentName("focused"); - } + private void clearFocusStyles() { + focusPanel.removeStyleDependentName("nofocused"); + focusPanel.removeStyleDependentName("focused"); + } - HasClickHandlers getRowClick() { - return focusPanel; - } + HasClickHandlers getRowClick() { + return focusPanel; + } - HasDoubleClickHandlers getRowDoubleClick() { - return focusPanel; - } + HasDoubleClickHandlers getRowDoubleClick() { + return focusPanel; + } - HasAllFocusHandlers getRowFocus() { - return focusPanel; - } + HasAllFocusHandlers getRowFocus() { + return focusPanel; + } - HasAllMouseHandlers getRowMouse() { - return focusPanel; - } + HasAllMouseHandlers getRowMouse() { + return focusPanel; + } - @Override - public String getText() { - return title.getText(); - } + @Override + public String getText() { + return title.getText(); + } - @UiHandler("focusPanel") - public void onBlur(final BlurEvent event) { - clearFocusStyles(); - focusPanel.addStyleDependentName("nofocused"); - } + @UiHandler("focusPanel") + public void onBlur(final BlurEvent event) { + clearFocusStyles(); + focusPanel.addStyleDependentName("nofocused"); + } - @UiHandler("focusPanel") - public void onFocus(final FocusEvent event) { - clearFocusStyles(); - focusPanel.addStyleDependentName("focused"); - } + @UiHandler("focusPanel") + public void onFocus(final FocusEvent event) { + clearFocusStyles(); + focusPanel.addStyleDependentName("focused"); + } - @UiHandler("focusPanel") - public void onOut(final MouseOutEvent event) { - clearFocusStyles(); - focusPanel.addStyleDependentName("nofocused"); - } + @UiHandler("focusPanel") + public void onOut(final MouseOutEvent event) { + clearFocusStyles(); + focusPanel.addStyleDependentName("nofocused"); + } - @UiHandler("focusPanel") - public void onOver(final MouseOverEvent event) { - clearFocusStyles(); - focusPanel.addStyleDependentName("focused"); - } + @UiHandler("focusPanel") + public void onOver(final MouseOverEvent event) { + clearFocusStyles(); + focusPanel.addStyleDependentName("focused"); + } - public void setMenu(final ActionSimplePanel toolbar) { - menu.add(toolbar); - } + public void setMenu(final ActionSimplePanel toolbar) { + menu.add(toolbar); + } - public void setSelect(final boolean selected) { - clearFocusStyles(); - focusPanel.removeStyleDependentName(selected ? "noselected" : "selected"); - focusPanel.addStyleDependentName(selected ? "selected" : "noselected"); - } + public void setSelect(final boolean selected) { + clearFocusStyles(); + focusPanel.removeStyleDependentName(selected ? "noselected" : "selected"); + focusPanel.addStyleDependentName(selected ? "selected" : "noselected"); + } - @Override - public void setText(final String text) { - title.setText(text); - } + @Override + public void setText(final String text) { + title.setText(text); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml 2011-04-28 13:50:23 UTC (rev 1325) @@ -8,18 +8,19 @@ @external .k-folderitem-focus-noselected; @external .k-folderitem-focus-nofocused; .k-folderitem-focus { - background-color: none; + background-color: none; } .k-folderitem-focus-focused { - background-color: #F2F5FD; + background-color: #F2F5FD; } .k-folderitem-focus-selected { - background-color: #E3E9FF; + background-color: #E3E9FF; } .k-folderitem-focus-noselected { + } .k-folderitem-focus-nofocused { @@ -27,23 +28,27 @@ } .flow { - cursor: pointer; - border-bottom: 1px solid #F3F3F3; - line-height: 1.3em; - height: 28px; + cursor: pointer; + border-bottom: 1px solid #F3F3F3; + line-height: 1.3em; + height: 28px; } .title { - font-size: 16px; - margin-left: 5px; + margin-left: 5px; + color: #A05A2C; + font-size: 19px; + line-height: 1.3em; + -moz-user-select: none; + -khtml-user-select: none; } .icon { - margin: 5px; + margin: 5px; } .menu { - float: right; + float: right; } </ui:style> <g:FocusPanel ui:field="focusPanel" styleName="{style.k-folderitem-focus}"> Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java 2011-04-28 13:50:23 UTC (rev 1325) @@ -5,6 +5,7 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.ui.BasicThumb; +import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; @@ -21,63 +22,64 @@ import com.google.inject.Inject; public class FolderViewerAsFlowPanel extends AbstractFolderViewerPanel { - interface FolderViewerAsFlowPanelUiBinder extends UiBinder<Widget, FolderViewerAsFlowPanel> { - } - private static final int ICONLABELMAXSIZE = 20; - private static final int ICONSIZE = 100; - private static FolderViewerAsFlowPanelUiBinder uiBinder = GWT.create(FolderViewerAsFlowPanelUiBinder.class); - @UiField - FlowPanel flow; + interface FolderViewerAsFlowPanelUiBinder extends UiBinder<Widget, FolderViewerAsFlowPanel> { + } + private static final int ICONLABELMAXSIZE = 20; + private static final int ICONSIZE = 100; + private static FolderViewerAsFlowPanelUiBinder uiBinder = GWT.create(FolderViewerAsFlowPanelUiBinder.class); + @UiField + FlowPanel flow; - @Inject - public FolderViewerAsFlowPanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n) { - super(gsArmor, i18n); - widget = uiBinder.createAndBindUi(this); - } + @Inject + public FolderViewerAsFlowPanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n, + final ContentCapabilitiesRegistry capabilitiesRegistry) { + super(gsArmor, i18n, capabilitiesRegistry); + widget = uiBinder.createAndBindUi(this); + } - @Override - public void addItem(final FolderItemDescriptor item, final ClickHandler clickHandler, - final DoubleClickHandler doubleClickHandler) { - // In this viewer we don't use the clickHandler from the presenter - flow.add(createThumb(item.getText(), item.getIcon(), item.getTooltip(), "", item.getActionCollection(), - doubleClickHandler)); - } + @Override + public void addItem(final FolderItemDescriptor item, final ClickHandler clickHandler, + final DoubleClickHandler doubleClickHandler) { + // In this viewer we don't use the clickHandler from the presenter + flow.add(createThumb(item.getText(), item.getIcon(), item.getTooltip(), "", + item.getActionCollection(), doubleClickHandler)); + } - @Override - public void clear() { - flow.clear(); - super.clear(); - } + @Override + public void clear() { + flow.clear(); + super.clear(); + } - public BasicThumb createThumb(final String text, final Object icon, final String tooltip, - final String tooltipTitle, final GuiActionDescCollection menuitems, - final DoubleClickHandler doubleClickHandler) { - final BasicThumb thumb = new BasicThumb(icon, ICONSIZE, text, ICONLABELMAXSIZE, false); - final MenuDescriptor menu = new MenuDescriptor(); - menu.setStandalone(true); - menu.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl); - for (final GuiActionDescrip item : menuitems) { - item.setParent(menu); - } - final ClickHandler clickHand = new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - menu.show(thumb); - } - }; - thumb.addClickHandler(clickHand); - thumb.addDoubleClickHandler(doubleClickHandler); - gsArmor.getSubheaderToolbar().add(menu); - gsArmor.getSubheaderToolbar().addAll(menuitems); - thumb.setTooltip(tooltipTitle, tooltip); - thumb.setLabelVisible(true); - return thumb; + public BasicThumb createThumb(final String text, final Object icon, final String tooltip, + final String tooltipTitle, final GuiActionDescCollection menuitems, + final DoubleClickHandler doubleClickHandler) { + final BasicThumb thumb = new BasicThumb(icon, ICONSIZE, text, ICONLABELMAXSIZE, false); + final MenuDescriptor menu = new MenuDescriptor(); + menu.setStandalone(true); + menu.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl); + for (final GuiActionDescrip item : menuitems) { + item.setParent(menu); } + final ClickHandler clickHand = new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + menu.show(thumb); + } + }; + thumb.addClickHandler(clickHand); + thumb.addDoubleClickHandler(doubleClickHandler); + gsArmor.getSubheaderToolbar().add(menu); + gsArmor.getSubheaderToolbar().addAll(menuitems); + thumb.setTooltip(tooltipTitle, tooltip); + thumb.setLabelVisible(true); + return thumb; + } - @Override - public void setContainer(final StateContainerDTO state) { - super.setContainer(state); - gsArmor.getDocContainer().add(new HTML("<b>Note:</b> This GUI is provisional<br/>")); - } + @Override + public void setContainer(final StateContainerDTO state) { + super.setContainer(state); + gsArmor.getDocContainer().add(new HTML("<b>Note:</b> This GUI is provisional<br/>")); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-04-28 00:56:31 UTC (rev 1324) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-04-28 13:50:23 UTC (rev 1325) @@ -4,6 +4,7 @@ import cc.kune.common.client.actions.ui.bind.GuiProvider; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -26,81 +27,83 @@ public class FolderViewerAsTablePanel extends AbstractFolderViewerPanel { - interface FolderViewerAsTablePanelUiBinder extends UiBinder<Widget, FolderViewerAsTablePanel> { - } + interface FolderViewerAsTablePanelUiBinder extends UiBinder<Widget, FolderViewerAsTablePanel> { + } - private static FolderViewerAsTablePanelUiBinder uiBinder = GWT.create(FolderViewerAsTablePanelUiBinder.class); + private static FolderViewerAsTablePanelUiBinder uiBinder = GWT.create(FolderViewerAsTablePanelUiBinder.class); - @UiField - FlexTable flex; + @UiField + FlexTable flex; - private final GuiProvider guiProvider; - private final CoreResources res; - protected FolderItemWidget selected; + private final GuiProvider guiProvider; + private final CoreResources res; + protected FolderItemWidget selected; - @Inject - public FolderViewerAsTablePanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n, - final GuiProvider guiProvider, final CoreResources res) { - super(gsArmor, i18n); - this.guiProvider = guiProvider; - this.res = res; - widget = uiBinder.createAndBindUi(this); + @Inject + public FolderViewerAsTablePanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n, + final GuiProvider guiProvider, final CoreResources res, + final ContentCapabilitiesRegistry capabilitiesRegistry) { + super(gsArmor, i18n, capabilitiesRegistry); + this.guiProvider = guiProvider; + this.res = res; + widget = uiBinder.createAndBindUi(this); + } + + @Override + public void addItem(final FolderItemDescriptor item, final ClickHandler clickHandler, + final DoubleClickHandler doubleClickHandler) { + final int rowCount = flex.getRowCount(); + final FolderItemWidget itemWidget = new FolderItemWidget((ImageResource) item.getIcon(), + item.getText()); + final ActionSimplePanel toolbar = new ActionSimplePanel(guiProvider); + itemWidget.setMenu(toolbar); + // Tooltip.to(itemWidget, item.getTooltip()); + final MenuDescriptor menu = new MenuDescriptor(i18n.t("Actions")); + menu.withIcon(res.arrowdown()).withStyles("k-def-docbtn, k-btn, k-button"); + menu.setStandalone(false); + menu.setVisible(false); + toolbar.add(menu); + for (final GuiActionDescrip menuItem : item.getActionCollection()) { + menuItem.setParent(menu); + toolbar.add(menuItem); } - - @Override - public void addItem(final FolderItemDescriptor item, final ClickHandler clickHandler, - final DoubleClickHandler doubleClickHandler) { - final int rowCount = flex.getRowCount(); - final FolderItemWidget itemWidget = new FolderItemWidget((ImageResource) item.getIcon(), item.getText()); - final ActionSimplePanel toolbar = new ActionSimplePanel(guiProvider); - itemWidget.setMenu(toolbar); - // Tooltip.to(itemWidget, item.getTooltip()); - final MenuDescriptor menu = new MenuDescriptor(i18n.t("Actions")); - menu.withIcon(res.arrowdown()).withStyles("k-def-docbtn, k-btn, k-button"); - menu.setStandalone(false); + itemWidget.getRowClick().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + if (selected != null) { + selected.setSelect(false); + } + itemWidget.setSelect(true); + selected = itemWidget; + } + }); + itemWidget.getRowDoubleClick().addDoubleClickHandler(doubleClickHandler); + itemWidget.getRowMouse().addMouseOutHandler(new MouseOutHandler() { + @Override + public void onMouseOut(final MouseOutEvent event) { menu.setVisible(false); - toolbar.add(menu); - for (final GuiActionDescrip menuItem : item.getActionCollection()) { - menuItem.setParent(menu); - toolbar.add(menuItem); - } - itemWidget.getRowClick().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - if (selected != null) { - selected.setSelect(false); - } - itemWidget.setSelect(true); - selected = itemWidget; - } - }); - itemWidget.getRowDoubleClick().addDoubleClickHandler(doubleClickHandler); - itemWidget.getRowMouse().addMouseOutHandler(new MouseOutHandler() { - @Override - public void onMouseOut(final MouseOutEvent event) { - menu.setVisible(false); - // itemWidget.setSelect(false); - // menu.hide(); - } - }); - itemWidget.getRowMouse().addMouseOverHandler(new MouseOverHandler() { - @Override - public void onMouseOver(final MouseOverEvent event) { - menu.setVisible(true); - } - }); - flex.setWidget(rowCount + 1, 0, itemWidget); - } + // itemWidget.setSelect(false); + // menu.hide(); + } + }); + itemWidget.getRowMouse().addMouseOverHandler(new MouseOverHandler() { + @Override + public void onMouseOver(final MouseOverEvent event) { + menu.setVisible(true); + } + }); + flex.setWidget(rowCount + 1, 0, itemWidget); + } - @Override - public void clear() { - flex.clear(); - super.clear(); - } + @Override + public void clear() { + flex.clear(); + super.clear(); + } - @Override - public void setContainer(final StateContainerDTO state) { - super.setContainer(state); - } + @Override + public void setContainer(final StateContainerDTO state) { + super.setContainer(state); + } }

1 0

28 Apr '11

Author: vjrj_ Date: 2011-04-28 02:56:31 +0200 (Thu, 28 Apr 2011) New Revision: 1324 Added: trunk/src/main/java/cc/kune/client/ExtendedGinModule.java trunk/src/main/java/cc/kune/common/client/ProvidersCollection.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialog.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java trunk/src/main/java/cc/kune/gspace/client/options/ trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsTabView.java trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptions.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsCollection.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsView.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptions.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsCollection.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsView.java trunk/src/main/java/cc/kune/gspace/client/options/license/ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicenseView.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicenseView.java trunk/src/main/java/cc/kune/gspace/client/options/logo/ trunk/src/main/java/cc/kune/gspace/client/options/logo/CurrentLogoChangedEvent.java trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoView.java trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoView.java trunk/src/main/java/cc/kune/gspace/client/options/pscape/ trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConfPanel.java trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConfView.java trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConfPanel.java trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConfView.java trunk/src/main/java/cc/kune/gspace/client/options/tools/ 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/GroupOptionsToolsConfView.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfView.java trunk/src/main/java/cc/kune/gspace/client/style/ trunk/src/main/java/cc/kune/gspace/client/style/ClearBackImageEvent.java trunk/src/main/java/cc/kune/gspace/client/style/GSpaceBackManager.java trunk/src/main/java/cc/kune/gspace/client/style/GSpaceBackManagerImpl.java trunk/src/main/java/cc/kune/gspace/client/style/SetBackImageEvent.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialogView.java Removed: trunk/infinitest.filters trunk/src/main/java/cc/kune/core/client/ui/dialogs/ trunk/src/main/java/cc/kune/core/ws/ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolConf.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptions.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptions.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsView.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptions.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsView.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java trunk/src/test/java/org/ourproject/kune/blogs/ trunk/src/test/java/org/ourproject/kune/docs/ Modified: trunk/.classpath trunk/.project trunk/script/mvn-eclipse.sh trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialogView.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/MessagePanel.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/MessagePanelView.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/MessageToolbar.java trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/client/ui/DefaultFormUtils.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.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/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/GroupOptionsDefLicensePresenter.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicense.java trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePresenter.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/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/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/pscape/EntityOptionsPublicSpaceConf.java trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConf.java trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConfPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConf.java trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConfPresenter.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/GroupOptionsToolsConfPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConf.java trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPresenter.java trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogView.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/OldAbstractFoldableContentActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java Log: User and groups options Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/.classpath 2011-04-28 00:56:31 UTC (rev 1324) @@ -118,5 +118,5 @@ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1.jar" sourcepath="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1-sources.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> + <classpathentry kind="src" path=".apt_generated" including="**/*.java"/> <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> </classpath> \ No newline at end of file Modified: trunk/.project =================================================================== --- trunk/.project 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/.project 2011-04-28 00:56:31 UTC (rev 1324) @@ -1,60 +1,42 @@ -<?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>kune</name> - <comment>kune free/open/libre collaboration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.common.project.facet.core.builder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - <nature>org.eclipse.ajdt.ui.ajnature</nature> - <nature>com.google.gwt.eclipse.core.gwtNature</nature> - <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature> - <nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature> - <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> - </natures> -</projectDescription> + <name>kune</name> + <comment>kune free/open/libre collaboration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects/> + <buildSpec> + <buildCommand> + <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> + </buildCommand> + <buildCommand> + <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + </buildCommand> + <buildCommand> + <name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name> + </buildCommand> + <buildCommand> + <name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name> + </buildCommand> + <buildCommand> + <name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.ajdt.ui.ajnature</nature> + <nature>com.google.gwt.eclipse.core.gwtNature</nature> + <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature> + <nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + </natures> +</projectDescription> \ No newline at end of file Deleted: trunk/infinitest.filters =================================================================== --- trunk/infinitest.filters 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/infinitest.filters 2011-04-28 00:56:31 UTC (rev 1324) @@ -1 +0,0 @@ -.*Selenium.* Modified: trunk/script/mvn-eclipse.sh =================================================================== --- trunk/script/mvn-eclipse.sh 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/script/mvn-eclipse.sh 2011-04-28 00:56:31 UTC (rev 1324) @@ -2,7 +2,7 @@ RESULT=$? perl -p -i -e 's/<\/classpath>//g' .classpath #perl -p -i -e 's/\/home\/vjrj\/nfsdev\///g' .classpath -#echo -en " <classpathentry kind=\"src\" path=\"target/generated-sources/apt\" including=\"**/*.java\"/>" >> .classpath +echo -en " <classpathentry kind=\"src\" path=\".apt_generated\" including=\"**/*.java\"/>" >> .classpath echo -en " <classpathentry kind=\"con\" path=\"com.google.gwt.eclipse.core.GWT_CONTAINER\"/>\n</classpath>" >> .classpath which kdialog > /dev/null 2>&1 if [[ $? == 0 ]] Added: trunk/src/main/java/cc/kune/client/ExtendedGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/client/ExtendedGinModule.java (rev 0) +++ trunk/src/main/java/cc/kune/client/ExtendedGinModule.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,20 @@ +package cc.kune.client; + +import com.google.inject.Singleton; +import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; + +public abstract class ExtendedGinModule extends AbstractPresenterModule { + + protected void eagle(final Class<?> type) { + bind(type).asEagerSingleton(); + } + + protected void s(final Class<?> type) { + bind(type).in(Singleton.class); + } + + protected <V, W> void s(final Class<V> type, final Class<? extends V> typeImpl) { + bind(type).to(typeImpl).in(Singleton.class); + } + +} Property changes on: trunk/src/main/java/cc/kune/client/ExtendedGinModule.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/ProvidersCollection.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ProvidersCollection.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ProvidersCollection.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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.common.client; + +import java.util.ArrayList; + +import com.google.inject.Provider; + +@SuppressWarnings("serial") +public class ProvidersCollection extends ArrayList<Provider<?>> { + + public ProvidersCollection() { + } + + public void createAll() { + for (final Provider<?> p : this) { + p.get(); + } + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/ProvidersCollection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -60,6 +60,11 @@ this(""); } + public IconLabel(final ImageResource imgRes, final String text) { + this(text); + iconLeft.setResource(imgRes); + } + public IconLabel(final String text) { initWidget(uiBinder.createAndBindUi(this)); label.setText(text); Copied: trunk/src/main/java/cc/kune/common/client/ui/dialogs (from rev 1320, trunk/src/main/java/cc/kune/core/client/ui/dialogs) Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialog.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,13 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.ui.dialogs; +package cc.kune.common.client.ui.dialogs; import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.utils.TextUtils; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Button; @@ -140,9 +141,13 @@ secondBtn.setVisible(visible); } + public void setTitleIcon(final ImageResource img) { + title.setLeftIconResource(img); + } + public void setTitleIcon(final String icon) { if (TextUtils.notEmpty(icon)) { - title.setRightIcon(icon); + title.setLeftIcon(icon); } } Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialogView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialogView.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialogView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.ui.dialogs; +package cc.kune.common.client.ui.dialogs; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.user.client.ui.HasDirectionalText; Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.ui.dialogs; +package cc.kune.common.client.ui.dialogs; import cc.kune.common.client.ui.PopupTopPanel; import cc.kune.common.client.utils.TextUtils; @@ -28,39 +28,123 @@ public class BasicTopDialog extends BasicDialog { - private final PopupTopPanel popup; + public static class Builder { + private final boolean autohide; + private boolean autoscroll = false; + private final String dialogId; + private String firstButtonId; + private String firstButtonTitle; + private String height = "70%"; + private String icon; + private final boolean modal; + private String sndButtonId; + private String sndButtonTitle; + private int tabIndexStart = 0; + private String title; + private String width = "400px"; - public BasicTopDialog(final String dialogId, final String title, final boolean autohide, final boolean modal, - final boolean autoscroll, final int width, final int height, final String icon, - final String firstButtonTitle, final String firstButtonId, final int tabIndexStart) { - this(dialogId, title, autohide, modal, autoscroll, width, height, icon, firstButtonTitle, firstButtonId, "", - "", tabIndexStart); - super.setSecondBtnVisible(false); + public Builder(final String dialogId, final boolean autohide, final boolean modal) { + // Required params + this.autohide = autohide; + this.modal = modal; + this.dialogId = dialogId; + } + + public Builder autoscroll(final boolean autoscroll) { + // Not used for now + this.autoscroll = autoscroll; + return this; + } + + public BasicTopDialog build() { + return new BasicTopDialog(this); + } + + public Builder firstButtonId(final String firstButtonId) { + this.firstButtonId = firstButtonId; + return this; + } + + public Builder firstButtonTitle(final String firstButtonTitle) { + this.firstButtonTitle = firstButtonTitle; + return this; + } + + public Builder height(final int height) { + this.height = String.valueOf(height); + return this; + } + + public Builder height(final String height) { + this.height = height; + return this; + } + + public Builder icon(final String icon) { + this.icon = icon; + return this; + } + + public Builder sndButtonId(final String sndButtonId) { + this.sndButtonId = sndButtonId; + return this; + } + + public Builder sndButtonTitle(final String sndButtonTitle) { + this.sndButtonTitle = sndButtonTitle; + return this; + } + + public Builder tabIndexStart(final int tabIndexStart) { + this.tabIndexStart = tabIndexStart; + return this; + } + + public Builder title(final String title) { + this.title = title; + return this; + } + + public Builder width(final int width) { + this.width = String.valueOf(width); + return this; + } + + public Builder width(final String width) { + this.width = width; + return this; + } } - public BasicTopDialog(final String dialogId, final String title, final boolean autohide, final boolean modal, - final boolean autoscroll, final int width, final int height, final String icon, - final String firstButtonTitle, final String firstButtonId, final String cancelButtonTitle, - final String cancelButtonId, final int tabIndexStart) { - popup = new PopupTopPanel(autohide, modal); + private final PopupTopPanel popup; + + private BasicTopDialog(final Builder builder) { + popup = new PopupTopPanel(builder.autohide, builder.modal); popup.add(this); - popup.ensureDebugId(dialogId); - super.getTitleText().setText(title); - // super.setAutoscroll(autoscroll); - // super.setSize(String.valueOf(width), String.valueOf(height)); - // GWT.log("Not setting size of dialog to: " + String.valueOf(width) + - // "/" + String.valueOf(height)); - super.setTitleIcon(icon); - super.getFirstBtnText().setText(firstButtonTitle); - if (TextUtils.notEmpty(cancelButtonTitle)) { - super.getSecondBtnText().setText(cancelButtonTitle); + popup.ensureDebugId(builder.dialogId); + super.getTitleText().setText(builder.title); + if (TextUtils.notEmpty(builder.icon)) { + super.setTitleIcon(builder.icon); } - super.setFirstBtnId(firstButtonId); - if (TextUtils.notEmpty(cancelButtonId)) { - super.setSecondBtnId(cancelButtonId); + if (TextUtils.empty(builder.firstButtonTitle)) { + super.setFirstBtnVisible(false); + } else { + super.getFirstBtnText().setText(builder.firstButtonTitle); + if (TextUtils.notEmpty(builder.firstButtonId)) { + super.setFirstBtnId(builder.firstButtonId); + } + super.setFirstBtnTabIndex(builder.tabIndexStart); } - super.setFirstBtnTabIndex(tabIndexStart); - super.setSecondBtnTabIndex(tabIndexStart + 1); + if (TextUtils.empty(builder.sndButtonTitle)) { + super.setSecondBtnVisible(false); + } else { + super.getSecondBtnText().setText(builder.sndButtonTitle); + if (TextUtils.notEmpty(builder.sndButtonId)) { + super.setSecondBtnId(builder.sndButtonId); + } + super.setSecondBtnTabIndex(builder.tabIndexStart + 1); + } + super.setSize(builder.width, builder.height); } public HasCloseHandlers<PopupPanel> getClose() { Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/MessagePanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessagePanel.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/MessagePanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.ui.dialogs; +package cc.kune.common.client.ui.dialogs; import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.notify.NotifyLevelImages; Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/MessagePanelView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessagePanelView.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/MessagePanelView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.ui.dialogs; +package cc.kune.common.client.ui.dialogs; import cc.kune.common.client.notify.NotifyLevel; Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/MessageToolbar.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/MessageToolbar.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.ui.dialogs; +package cc.kune.common.client.ui.dialogs; import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.notify.NotifyLevelImages; Added: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialog.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialog.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,40 @@ +/* + * + * 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.common.client.ui.dialogs.tabbed; + +import cc.kune.common.client.notify.NotifyLevel; + +import com.google.gwt.user.client.ui.IsWidget; + +public interface AbstractTabbedDialog { + + void activateTab(int index); + + void addTab(IsWidget tab, IsWidget tabTitle); + + public void hideMessages(); + + void insertTab(IsWidget tab, IsWidget tabTitle, int position); + + public void setErrorMessage(String message, NotifyLevel level); + + void show(); + +} Property changes on: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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.common.client.ui.dialogs.tabbed; + +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevelImages; +import cc.kune.common.client.ui.dialogs.BasicTopDialog; +import cc.kune.common.client.ui.dialogs.MessageToolbar; + +import com.google.gwt.event.logical.shared.HasCloseHandlers; +import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.user.client.ui.DecoratedTabPanel; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.Widget; + +public abstract class AbstractTabbedDialogPanel implements AbstractTabbedDialogView { + private BasicTopDialog dialog; + private final String dialogId; + private final String errorLabelId; + private final String firstBtnId; + private final String firstBtnTitle; + private final int height; + private String iconCls; + private final NotifyLevelImages images; + private MessageToolbar messageErrorBar; + private final int minHeight; + private final int minWidth; + private final boolean modal; + private final String sndBtnId; + private final String sndBtnTitle; + private DecoratedTabPanel tabPanel; + private String title; + private final int width; + + public AbstractTabbedDialogPanel(final String dialogId, final String title, final int width, final int height, + final int minWidth, final int minHeight, final boolean modal, final NotifyLevelImages images, + final String errorLabelId, final String firstBtnTitle, final String firstBtnId, final String sndBtnTitle, + final String sndBtnId) { + this.dialogId = dialogId; + this.title = title; + this.width = width; + this.height = height; + this.modal = modal; + this.images = images; + this.errorLabelId = errorLabelId; + // Not used: + this.minWidth = minWidth; + this.minHeight = minHeight; + this.firstBtnTitle = firstBtnTitle; + this.firstBtnId = firstBtnId; + this.sndBtnTitle = sndBtnTitle; + this.sndBtnId = sndBtnId; + } + + @Override + public void activateTab(final int index) { + createDialogIfNecessary(); + tabPanel.selectTab(index); + } + + @Override + public void addTab(final IsWidget view, final IsWidget tabWidget) { + createDialogIfNecessary(); + tabPanel.add(view, tabWidget); + } + + @Override + public void createAndShow() { + show(); + setFirstTabActive(); + } + + private void createDialog() { + dialog = new BasicTopDialog.Builder(dialogId, true, modal).autoscroll(true).width(width).height(height).icon( + iconCls).firstButtonId(firstBtnId).firstButtonTitle(firstBtnTitle).sndButtonId(dialogId).sndButtonTitle( + sndBtnTitle).build(); + messageErrorBar = new MessageToolbar(images, errorLabelId); + tabPanel = new DecoratedTabPanel(); + dialog.getInnerPanel().add(tabPanel); + } + + private void createDialogIfNecessary() { + if (dialog == null) { + createDialog(); + } + } + + @Override + public void destroy() { + if (dialog != null) { + dialog.removeFromParent(); + dialog = null; + } + } + + public HasCloseHandlers<?> getClose() { + return dialog.getClose(); + } + + public Widget getWidget() { + return dialog; + } + + @Override + public void hide() { + if (dialog != null) { + if (dialog.isVisible()) { + dialog.hide(); + } + } + } + + @Override + public void hideMessages() { + if (dialog != null) { + messageErrorBar.hideErrorMessage(); + } + } + + @Override + public void insertTab(final IsWidget tab, final IsWidget tabTitle, final int index) { + createDialogIfNecessary(); + tabPanel.insert(tab, tabTitle, index); + } + + public boolean isVisible() { + createDialogIfNecessary(); + return dialog.isVisible(); + } + + @Override + public void setErrorMessage(final String message, final NotifyLevel level) { + messageErrorBar.setErrorMessage(message, level); + } + + public void setFirstTabActive() { + tabPanel.selectTab(0); + } + + public void setIcon(final ImageResource icon) { + dialog.setTitleIcon(icon); + } + + public void setIconCls(final String iconCls) { + this.iconCls = iconCls; + if (dialog != null) { + dialog.setTitleIcon(iconCls); + } + } + + public void setTitle(final String title) { + this.title = title; + if (dialog != null) { + dialog.setTitle(title); + } + } + + public void show() { + createDialogIfNecessary(); + dialog.showCentered(); + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,73 @@ +/* + * + * 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.common.client.ui.dialogs.tabbed; + +import cc.kune.common.client.notify.NotifyLevel; + +import com.google.gwt.user.client.ui.IsWidget; + +public abstract class AbstractTabbedDialogPresenter implements AbstractTabbedDialog { + + private AbstractTabbedDialogView view; + + @Override + public void activateTab(final int index) { + view.activateTab(index); + } + + @Override + public void addTab(final IsWidget tab, final IsWidget tabTitle) { + view.addTab(tab, tabTitle); + } + + public IsWidget getView() { + return view; + } + + public void hide() { + view.hide(); + } + + @Override + public void hideMessages() { + view.hideMessages(); + } + + public void init(final AbstractTabbedDialogView view) { + this.view = view; + } + + @Override + public void insertTab(final IsWidget tab, final IsWidget tabTitle, final int index) { + view.insertTab(tab, tabTitle, index); + } + + @Override + public void setErrorMessage(final String message, final NotifyLevel level) { + view.setErrorMessage(message, level); + } + + @Override + public void show() { + hideMessages(); + view.createAndShow(); + } + +} Property changes on: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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.common.client.ui.dialogs.tabbed; + +import cc.kune.common.client.notify.NotifyLevel; + +import com.google.gwt.user.client.ui.IsWidget; + +public interface AbstractTabbedDialogView extends IsWidget { + + void activateTab(int index); + + void addTab(IsWidget tab, IsWidget tabTitle); + + void createAndShow(); + + void destroy(); + + void hide(); + + void hideMessages(); + + void insertTab(IsWidget tab, IsWidget tabTitle, int position); + + void setErrorMessage(final String message, final NotifyLevel level); + +} Property changes on: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -38,11 +38,23 @@ // Original regexp from http://snippets.dzone.com/posts/show/452 public static final String URL_REGEXP = "((ftp|http|https|mailto):\\/\\/(\\w+:{0,1}\\w*@)?(\\S+)(:[0-9]+)?(\\/|\\/([\\w#!:.?+=&%@!\\-\\/]))?)"; + public static String br() { + return "<br/>"; + } + + public static String brbr() { + return "<br/><br/>"; + } + public static String ellipsis(final String text, final int length) { return text == null ? "" : length <= 0 ? text : text.length() > length ? text.substring(0, length - 3) + "..." : text; } + public static boolean empty(final String string) { + return !notEmpty(string); + } + /** * This method escape only some dangerous html chars * Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,6 +19,7 @@ */ package cc.kune.core.client; +import cc.kune.client.ExtendedGinModule; import cc.kune.common.client.actions.gwtui.GwtGuiProvider; import cc.kune.common.client.actions.gxtui.GxtGuiProvider; import cc.kune.common.client.actions.ui.bind.DefaultGuiProvider; @@ -107,12 +108,11 @@ import com.google.inject.Singleton; import com.gwtplatform.mvp.client.DefaultProxyFailureHandler; import com.gwtplatform.mvp.client.RootPresenter; -import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; import com.gwtplatform.mvp.client.proxy.ParameterTokenFormatter; import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler; import com.gwtplatform.mvp.client.proxy.TokenFormatter; -public class CoreGinModule extends AbstractPresenterModule { +public class CoreGinModule extends ExtendedGinModule { /* * (non-Javadoc) @@ -209,15 +209,4 @@ s(SitebarSignOutLink.class); } - private void eagle(final Class<?> type) { - bind(type).asEagerSingleton(); - } - - private void s(final Class<?> type) { - bind(type).in(Singleton.class); - } - - private <V, W> void s(final Class<V> type, final Class<? extends V> typeImpl) { - bind(type).to(typeImpl).in(Singleton.class); - } } Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -21,10 +21,10 @@ import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.MaskWidgetView; +import cc.kune.common.client.ui.dialogs.MessageToolbar; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.state.Session; import cc.kune.core.client.ui.KuneUiUtils; -import cc.kune.core.client.ui.dialogs.MessageToolbar; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.core.client.Scheduler; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -22,8 +22,9 @@ import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.MaskWidgetView; -import cc.kune.core.client.ui.dialogs.BasicTopDialog; -import cc.kune.core.client.ui.dialogs.MessageToolbar; +import cc.kune.common.client.ui.dialogs.BasicTopDialog; +import cc.kune.common.client.ui.dialogs.BasicTopDialog.Builder; +import cc.kune.common.client.ui.dialogs.MessageToolbar; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.dom.client.HasClickHandlers; @@ -47,8 +48,14 @@ final int heigth, final String icon, final String firstButtonTitle, final String firstButtonId, final String cancelButtonTitle, final String cancelButtonId, final NotifyLevelImages images, final String errorLabelId, final int tabIndexStart) { - dialog = new BasicTopDialog(dialogId, title, autohide, modal, autoscroll, width, heigth, icon, - firstButtonTitle, firstButtonId, cancelButtonTitle, cancelButtonId, tabIndexStart); + + final Builder builder = new BasicTopDialog.Builder(dialogId, autohide, modal).autoscroll(autoscroll); + builder.width(width).height(heigth); + builder.icon(icon); + builder.firstButtonTitle(firstButtonTitle).firstButtonId(firstButtonId); + builder.sndButtonTitle(cancelButtonTitle).sndButtonId(cancelButtonId); + builder.tabIndexStart(tabIndexStart); + dialog = builder.build(); this.i18n = i18n; this.images = images; this.errorLabelId = errorLabelId; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -21,10 +21,10 @@ import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.MaskWidgetView; +import cc.kune.common.client.ui.dialogs.MessageToolbar; import cc.kune.common.client.utils.OnAcceptCallback; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ui.KuneUiUtils; -import cc.kune.core.client.ui.dialogs.MessageToolbar; import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.widget.VerticalPanel; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -139,9 +139,9 @@ } }); getView().getSecondBtn().addClickHandler(new ClickHandler() { - @Override public void onClick(final ClickEvent event) { + Log.debug("On cancel signin presenter"); onCancel(); } }); @@ -149,7 +149,7 @@ @Override public void onClose(final CloseEvent<PopupPanel> event) { - Log.debug("Closing register presenter"); + Log.debug("Closing signin presenter"); SignInPresenter.this.onClose(); } }); Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -22,10 +22,11 @@ import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.MaskWidgetView; +import cc.kune.common.client.ui.dialogs.BasicTopDialog; +import cc.kune.common.client.ui.dialogs.BasicTopDialog.Builder; +import cc.kune.common.client.ui.dialogs.MessageToolbar; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ui.DefaultFormUtils; -import cc.kune.core.client.ui.dialogs.BasicTopDialog; -import cc.kune.core.client.ui.dialogs.MessageToolbar; import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.Style.HorizontalAlignment; @@ -79,8 +80,13 @@ @Inject public NewGroupPanel(final I18nTranslationService i18n, final NotifyLevelImages img, final MaskWidgetView mask) { - dialog = new BasicTopDialog(NEWGROUP_WIZARD, CoreMessages.REGISTER_A_NEW_GROUP_TITLE, false, true, true, 450, - 360, "k-newgroup-icon", i18n.t("Register"), REGISTER_BUTTON, i18n.t("Cancel"), CANCEL_BUTTON, 9); + final Builder builder = new BasicTopDialog.Builder(NEWGROUP_WIZARD, false, true).autoscroll(true).height( + "360px"); + builder.icon("k-newgroup-icon"); + builder.firstButtonTitle(i18n.t("Register")).firstButtonId(REGISTER_BUTTON); + builder.sndButtonTitle(i18n.t("Cancel")).sndButtonId(CANCEL_BUTTON); + builder.tabIndexStart(9); + dialog = builder.build(); this.i18n = i18n; this.mask = mask; // Field.setMsgTarget("side"); Modified: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -20,9 +20,9 @@ package cc.kune.core.client.notify.confirm; import cc.kune.common.client.notify.ConfirmAskEvent; +import cc.kune.common.client.ui.dialogs.BasicTopDialog; import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmView; -import cc.kune.core.client.ui.dialogs.BasicTopDialog; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.dom.client.ClickEvent; @@ -44,7 +44,8 @@ @Inject public UserConfirmPanel(final I18nTranslationService i18n) { - dialog = new BasicTopDialog(DIALOG_ID, "", false, true, false, 100, 100, "", "", OK_ID, "", CANCEL_ID, 1); + dialog = new BasicTopDialog.Builder(DIALOG_ID, false, true).autoscroll(false).width(100).height(100).firstButtonId( + OK_ID).sndButtonId(CANCEL_ID).tabIndexStart(1).build(); askLabel = new Label(); askLabel.addStyleName("k-userconfirm-label"); dialog.getInnerPanel().add(askLabel); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -1,6 +1,6 @@ package cc.kune.core.client.sitebar; -import cc.kune.core.client.ui.dialogs.BasicTopDialog; +import cc.kune.common.client.ui.dialogs.BasicTopDialog; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.core.client.GWT; @@ -30,8 +30,8 @@ @Inject public AboutKuneDialog(final I18nTranslationService i18n) { - dialog = new BasicTopDialog(ABOUT_KUNE_ID, i18n.t("About Kune"), true, true, false, 400, 400, "", i18n.t("Ok"), - ABOUT_KUNE_BTN_ID, 1); + dialog = new BasicTopDialog.Builder(ABOUT_KUNE_ID, true, true).title(i18n.t("About Kune")).autoscroll(false).firstButtonTitle( + i18n.t("Ok")).firstButtonId(ABOUT_KUNE_BTN_ID).tabIndexStart(1).build(); dialog.getInnerPanel().add(BINDER.createAndBindUi(this)); dialog.getFirstBtn().addClickHandler(new ClickHandler() { @Override Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -365,7 +365,9 @@ @Override public void restorePreviousToken() { - gotoStateToken(previousToken); + if (previousToken != null) { + gotoStateToken(previousToken); + } } @Override Modified: trunk/src/main/java/cc/kune/core/client/ui/DefaultFormUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/DefaultFormUtils.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/core/client/ui/DefaultFormUtils.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -25,26 +25,17 @@ import com.extjs.gxt.ui.client.widget.form.Radio; public class DefaultFormUtils { - public static Radio createRadio(final FieldSet fieldSet, final String radioLabel, final String radioFieldName, final String radioTip, final String id) { final Radio radio = new Radio(); radio.setName(radioFieldName); - // radio.setAutoCreate(true); radio.setHideLabel(true); radio.setId(id); fieldSet.add(radio); if (radioTip != null) { Tooltip.to(radio, radioTip); - // radio.setTitle(radioTip); radio.setBoxLabel(radioLabel); - // radio.setBoxLabel(KuneUiUtils.genQuickTipLabel(radioLabel, null, - // radioTip)); - // ToolTip tooltip = new ToolTip(); - // tooltip.setHtml(radioTip); - // tooltip.setWidth(250); - // tooltip.applyTo(radio); } else { radio.setBoxLabel(radioLabel); } Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-28 00:56:31 UTC (rev 1324) @@ -1113,4 +1113,12 @@ .k-empty-msg { font-size: 16px; font-style: italic; -} \ No newline at end of file +} + +button.k-ent-header-btn { + margin: 10px !important; +} + +.k-ent-header-btn * { + font-size: 13px !important; +} Modified: trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -122,8 +122,11 @@ config.setRoot(rootFolder); group.setToolConfig(NAME, config); configurationManager.persist(config); - final String title = (String) otherVars[0]; - final String body = (String) otherVars[1]; + + final boolean hasVars = otherVars.length >= 2; + final String title = hasVars ? (String) otherVars[0] : i18n.t("Document sample"); + final String body = hasVars ? (String) otherVars[1] : i18n.t("This is only a sample of document"); + final Content content = contentManager.createContent(title, body, user, rootFolder, DocsConstants.TYPE_DOCUMENT); content.addAuthor(user); content.setLanguage(user.getLanguage()); Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,6 +19,51 @@ */ package cc.kune.gspace.client; +import cc.kune.client.ExtendedGinModule; +import cc.kune.gspace.client.options.GroupOptions; +import cc.kune.gspace.client.options.GroupOptionsCollection; +import cc.kune.gspace.client.options.GroupOptionsPanel; +import cc.kune.gspace.client.options.GroupOptionsPresenter; +import cc.kune.gspace.client.options.GroupOptionsView; +import cc.kune.gspace.client.options.UserOptions; +import cc.kune.gspace.client.options.UserOptionsCollection; +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.pscape.GroupOptionsPublicSpaceConf; +import cc.kune.gspace.client.options.pscape.GroupOptionsPublicSpaceConfPanel; +import cc.kune.gspace.client.options.pscape.GroupOptionsPublicSpaceConfPresenter; +import cc.kune.gspace.client.options.pscape.GroupOptionsPublicSpaceConfView; +import cc.kune.gspace.client.options.pscape.UserOptionsPublicSpaceConf; +import cc.kune.gspace.client.options.pscape.UserOptionsPublicSpaceConfPanel; +import cc.kune.gspace.client.options.pscape.UserOptionsPublicSpaceConfPresenter; +import cc.kune.gspace.client.options.pscape.UserOptionsPublicSpaceConfView; +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.style.GSpaceBackManager; +import cc.kune.gspace.client.style.GSpaceBackManagerImpl; import cc.kune.gspace.client.tags.TagsSummaryPanel; import cc.kune.gspace.client.tags.TagsSummaryPresenter; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -32,9 +77,8 @@ import cc.kune.gspace.client.viewers.FolderViewerPresenter; import com.google.inject.Singleton; -import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; -public class GSpaceGinModule extends AbstractPresenterModule { +public class GSpaceGinModule extends ExtendedGinModule { /* * (non-Javadoc) @@ -57,6 +101,33 @@ DocViewerPresenter.DocViewerProxy.class); bindPresenter(FolderViewerPresenter.class, FolderViewerPresenter.FolderViewerView.class, FolderViewerAsTablePanel.class, FolderViewerPresenter.FolderViewerProxy.class); + + s(GroupOptions.class, GroupOptionsPresenter.class); + s(GroupOptionsView.class, GroupOptionsPanel.class); + s(UserOptions.class, UserOptionsPresenter.class); + s(UserOptionsView.class, UserOptionsPanel.class); + + s(UserOptionsCollection.class); + s(GroupOptionsCollection.class); + + s(GroupOptionsDefLicense.class, GroupOptionsDefLicensePresenter.class); + s(GroupOptionsDefLicenseView.class, GroupOptionsDefLicensePanel.class); + s(GroupOptionsPublicSpaceConf.class, GroupOptionsPublicSpaceConfPresenter.class); + s(GroupOptionsPublicSpaceConfView.class, GroupOptionsPublicSpaceConfPanel.class); + s(GroupOptionsLogo.class, GroupOptionsLogoPresenter.class); + s(GroupOptionsLogoView.class, GroupOptionsLogoPanel.class); + s(GroupOptionsToolsConf.class, GroupOptionsToolsConfPresenter.class); + s(GroupOptionsToolsConfView.class, GroupOptionsToolsConfPanel.class); + + s(UserOptionsDefLicense.class, UserOptionsDefLicensePresenter.class); + s(UserOptionsDefLicenseView.class, UserOptionsDefLicensePanel.class); + s(UserOptionsPublicSpaceConf.class, UserOptionsPublicSpaceConfPresenter.class); + s(UserOptionsPublicSpaceConfView.class, UserOptionsPublicSpaceConfPanel.class); + s(UserOptionsLogo.class, UserOptionsLogoPresenter.class); + s(UserOptionsLogoView.class, UserOptionsLogoPanel.class); + s(UserOptionsToolsConf.class, UserOptionsToolsConfPresenter.class); + s(UserOptionsToolsConfView.class, UserOptionsToolsConfPanel.class); + + s(GSpaceBackManager.class, GSpaceBackManagerImpl.class); } - } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -3,6 +3,18 @@ import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.state.Session; +import cc.kune.gspace.client.options.GroupOptions; +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.pscape.GroupOptionsPublicSpaceConf; +import cc.kune.gspace.client.options.pscape.UserOptionsPublicSpaceConf; +import cc.kune.gspace.client.options.tools.GroupOptionsToolsConf; +import cc.kune.gspace.client.options.tools.UserOptionsToolsConf; import cc.kune.gspace.client.tags.TagsSummaryPresenter; import cc.kune.gspace.client.tool.selector.ToolSelector; import cc.kune.gspace.client.ui.footer.license.EntityLicensePresenter; @@ -17,7 +29,24 @@ @Inject public GSpaceParts(final Session session, final Provider<EntityLicensePresenter> licenseFooter, final Provider<TagsSummaryPresenter> tagsPresenter, final Provider<ToolSelector> toolSelector, - final Provider<DocViewerPresenter> docsViewer, final Provider<FolderViewerPresenter> folderViewer) { + final Provider<DocViewerPresenter> 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<GroupOptionsPublicSpaceConf> gps, + final Provider<GroupOptionsLogo> gl, final Provider<GroupOptionsToolsConf> gtc, + final Provider<UserOptionsDefLicense> udl, final Provider<UserOptionsPublicSpaceConf> ups, + final Provider<UserOptionsLogo> ul, final Provider<UserOptionsToolsConf> utc) { + // , final Provider<GroupOptionsPanel> gop, + // , final Provider<UserOptionsPanel> uop, + // final Provider<GroupOptionsPublicSpaceConfPanel> gpsp, + // final Provider<GroupOptionsDefLicensePanel> gdlp, + // final Provider<GroupOptionsLogoPanel> glp, + // final Provider<GroupOptionsToolsConfPanel> gtcp, + // final Provider<UserOptionsLogoPanel> ulp, + // final Provider<UserOptionsDefLicensePanel> udlp, + // final Provider<UserOptionsPublicSpaceConfPanel> upsp, + // final Provider<UserOptionsToolsConfPanel> utcp + session.onAppStart(true, new AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { @@ -26,6 +55,20 @@ toolSelector.get(); docsViewer.get(); folderViewer.get(); + + // Add User & Groups Options + goc.get().add(gtc); + goc.get().add(gl); + goc.get().add(gps); + goc.get().add(gdl); + uoc.get().add(utc); + uoc.get().add(ul); + uoc.get().add(ups); + uoc.get().add(udl); + + // Init + go.get(); + uo.get(); } }); } Copied: trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptions.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,40 @@ +/* + * + * 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; + +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialog; + +import com.google.gwt.user.client.ui.IsWidget; + +public interface EntityOptions extends AbstractTabbedDialog { + + public IsWidget getView(); + + @Override + public void hideMessages(); + + @Override + public void setErrorMessage(String message, NotifyLevel level); + + @Override + public void show(); + +} Added: trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsTabView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsTabView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsTabView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,8 @@ +package cc.kune.gspace.client.options; + +import com.google.gwt.user.client.ui.IsWidget; + +public interface EntityOptionsTabView extends IsWidget { + + IsWidget getTabTitle(); +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsTabView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,28 @@ +/* + * + * 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; + +import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogView; + +public interface EntityOptionsView extends AbstractTabbedDialogView { + + int HEIGHT = 270; + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptions.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptions.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptions.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptions.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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; + +public interface GroupOptions extends EntityOptions { +} Added: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsCollection.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsCollection.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsCollection.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,7 @@ +package cc.kune.gspace.client.options; + +import cc.kune.common.client.ProvidersCollection; + +@SuppressWarnings("serial") +public class GroupOptionsCollection extends ProvidersCollection { +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsCollection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,69 @@ +/* + * + * 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; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.notify.NotifyLevelImages; +import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; +import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; + +public class GroupOptionsPanel extends AbstractTabbedDialogPanel implements GroupOptionsView { + + public static final String GROUP_OP_PANEL_ID = "k-gop-diagpan"; + public static final String GROUP_OPTIONS_ERROR_ID = "k-gop-err-mess"; + private final EntityHeader entityHeader; + private final GroupOptionsCollection entityPreferencesGroup; + + @Inject + public GroupOptionsPanel(final EntityHeader entityHeader, final I18nTranslationService i18n, + final NotifyLevelImages images, final GroupOptionsCollection entityOptionsGroup) { + super(GROUP_OP_PANEL_ID, "", 400, HEIGHT + 80, 400, HEIGHT + 80, false, images, GROUP_OPTIONS_ERROR_ID, + i18n.t("Close"), null, null, null); + this.entityHeader = entityHeader; + this.entityPreferencesGroup = entityOptionsGroup; + super.setIconCls("k-options-icon"); + super.setTitle(i18n.t(CoreMessages.GROUP_OPTIONS_DIALOG_TITLE)); + } + + @Override + public void addAction(final GuiActionDescrip descriptor) { + entityHeader.addAction(descriptor); + } + + @Override + public Widget asWidget() { + return super.getWidget(); + } + + @Override + public void createAndShow() { + createAndShowItImpl(); + } + + private void createAndShowItImpl() { + entityPreferencesGroup.createAll(); + super.createAndShow(); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,84 @@ +/* + * + * 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; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; +import cc.kune.core.client.resources.icons.IconResources; +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.dto.StateAbstractDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class GroupOptionsPresenter extends AbstractTabbedDialogPresenter implements GroupOptions { + public static final String GROUP_OPTIONS_ICON = "k-eop-icon"; + private final I18nTranslationService i18n; + private final IconResources img; + private ButtonDescriptor prefsItem; + private GroupOptionsView view; + + @Inject + public GroupOptionsPresenter(final StateManager stateManager, final I18nTranslationService i18n, + final IconResources img, final GroupOptionsView view) { + this.i18n = i18n; + this.img = img; + stateManager.onStateChanged(true, new StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + final StateAbstractDTO state = event.getState(); + if (!state.getGroup().isPersonal() && state.getGroupRights().isAdministrable()) { + prefsItem.setVisible(true); + } else { + view.hide(); + prefsItem.setVisible(false); + } + } + }); + init(view); + } + + private void createActions() { + final AbstractExtendedAction groupPrefsAction = new AbstractExtendedAction() { + @Override + public void actionPerformed(final ActionEvent event) { + show(); + } + }; + groupPrefsAction.putValue(Action.NAME, i18n.t("Group options")); + groupPrefsAction.putValue(Action.SMALL_ICON, img.prefs()); + prefsItem = new ButtonDescriptor(groupPrefsAction); + prefsItem.withStyles("k-ent-header-btn"); + prefsItem.setId(GROUP_OPTIONS_ICON); + prefsItem.setVisible(false); + view.addAction(prefsItem); + } + + private void init(final GroupOptionsView view) { + super.init(view); + this.view = view; + createActions(); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsView.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,28 @@ +/* + * + * 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; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; + +public interface GroupOptionsView extends EntityOptionsView { + + void addAction(GuiActionDescrip descriptor); + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/UserOptions.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptions.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptions.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptions.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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; + +public interface UserOptions extends EntityOptions { +} Added: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsCollection.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsCollection.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsCollection.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,7 @@ +package cc.kune.gspace.client.options; + +import cc.kune.common.client.ProvidersCollection; + +@SuppressWarnings("serial") +public class UserOptionsCollection extends ProvidersCollection { +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsCollection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,62 @@ +/* + * + * 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; + +import cc.kune.common.client.notify.NotifyLevelImages; +import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; +import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; + +public class UserOptionsPanel extends AbstractTabbedDialogPanel implements UserOptionsView { + + public static final String USER_OP_PANEL_ID = "k-uop-diagpan"; + public static final String USER_OPTIONS_ERROR_ID = "k-uop-err-mess"; + + private final UserOptionsCollection userPreferencesGroup; + + @Inject + public UserOptionsPanel(final EntityHeader entityHeader, final I18nTranslationService i18n, + final NotifyLevelImages images, final UserOptionsCollection userOptionsGroup) { + super(USER_OP_PANEL_ID, "", 400, HEIGHT + 80, 400, HEIGHT + 80, false, images, USER_OPTIONS_ERROR_ID, + i18n.t("Close"), null, null, null); + this.userPreferencesGroup = userOptionsGroup; + super.setIconCls("k-options-icon"); + super.setTitle(i18n.t(CoreMessages.USER_OPTIONS_DIALOG_TITLE)); + } + + @Override + public Widget asWidget() { + return super.getWidget(); + } + + @Override + public void createAndShow() { + createAndShowItImpl(); + } + + private void createAndShowItImpl() { + userPreferencesGroup.createAll(); + super.createAndShow(); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,87 @@ +/* + * + * 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; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.sitebar.SiteUserOptions; +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.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class UserOptionsPresenter extends AbstractTabbedDialogPresenter implements UserOptions { + + private final I18nTranslationService i18n; + private final IconResources img; + private final Session session; + private final StateManager stateManager; + private final SiteUserOptions userOptions; + private UserOptionsView view; + + @Inject + public UserOptionsPresenter(final Session session, final StateManager stateManager, + final I18nTranslationService i18n, final IconResources img, final SiteUserOptions userOptions, + final UserOptionsView view) { + this.session = session; + this.stateManager = stateManager; + this.i18n = i18n; + this.img = img; + this.userOptions = userOptions; + session.onUserSignIn(false, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + view.hide(); + } + }); + init(view); + } + + private void createActions() { + final AbstractExtendedAction userPrefsAction = new AbstractExtendedAction() { + + @Override + public void actionPerformed(final ActionEvent event) { + if (!session.isInCurrentUserSpace()) { + stateManager.gotoStateToken(session.getCurrentUser().getStateToken()); + } + show(); + } + }; + userPrefsAction.putValue(Action.NAME, i18n.t("Your preferences")); + userPrefsAction.putValue(Action.SMALL_ICON, img.prefs()); + final MenuItemDescriptor prefsItem = new MenuItemDescriptor(userPrefsAction); + prefsItem.setPosition(1); + userOptions.addAction(prefsItem); + } + + private void init(final UserOptionsView view) { + super.init(view); + this.view = view; + createActions(); + } +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsView.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsView.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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; + +public interface UserOptionsView extends EntityOptionsView { + +} Copied: trunk/src/main/java/cc/kune/gspace/client/options/license (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/license) Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicense.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicense.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicense.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.license; +package cc.kune.gspace.client.options.license; public interface EntityOptionsDefLicense { Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,73 +17,71 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.license; +package cc.kune.gspace.client.options.license; -import org.ourproject.kune.platf.client.ui.KuneUiUtils; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; -import org.ourproject.kune.workspace.client.options.EntityOptionsView; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.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.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; +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.Image; -import com.gwtext.client.core.EventObject; -import com.gwtext.client.core.Position; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.PaddedPanel; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; -import com.gwtext.client.widgets.form.Label; +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 EntityOptionsDefLicensePanel extends DefaultForm implements EntityOptionsDefLicenseView { +public class EntityOptionsDefLicensePanel extends Composite implements EntityOptionsDefLicenseView { + private final Button change; private final Image licenseImage; + private final IconLabel tabTitle; - public EntityOptionsDefLicensePanel(final EntityOptionsDefLicensePresenter presenter, final WorkspaceSkeleton ws, - final I18nTranslationService i18n) { - super(i18n.t("License")); - super.setIconCls("k-copyleft-icon"); - super.setHeight(EntityOptionsView.HEIGHT); - super.setFrame(true); - super.getFormPanel().setButtonAlign(Position.LEFT); + public EntityOptionsDefLicensePanel(final I18nTranslationService i18n, final CoreResources res) { + tabTitle = new IconLabel(res.copyleft(), i18n.t("License")); + // super.setIconCls("k-copyleft-icon"); + // super.setFrame(true); + // super.getFormPanel().setButtonAlign(Position.LEFT); + final VerticalPanel vp = new VerticalPanel(); final Label intro = new Label(); - intro.setHtml(i18n.t("This is the default license for all the contents of this group (you can also select another different license per content):") - + DefaultFormUtils.brbr()); + 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):")); + vp.add(intro); licenseImage = new Image(); - final Panel imagePanel = new Panel(); - imagePanel.setBorder(false); - imagePanel.add(licenseImage); - licenseImage.addClickHandler(new ClickHandler() { - public void onClick(final ClickEvent event) { - presenter.onLicenseClick(); - } - }); + vp.add(licenseImage); licenseImage.addStyleName("kune-pointer"); + change = new Button(i18n.t("Change")); + initWidget(vp); + super.setHeight(String.valueOf(EntityOptionsView.HEIGHT)); + } - final Button change = new Button(i18n.t("Change")); - change.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(final Button button, final EventObject event) { - presenter.onChange(); - } - }); + @Override + public HasClickHandlers getChange() { + return change; + } - add(intro); - add(new PaddedPanel(imagePanel, 0, 0, 0, 5)); - addButton(change); + @Override + public HasClickHandlers getLicenseImage() { + return licenseImage; } - public void openWindow(final String url) { + @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()); - KuneUiUtils.setQuickTip(licenseImage, defaultLicense.getLongName()); + Tooltip.to(licenseImage, defaultLicense.getLongName()); } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,77 +17,88 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.license; +package cc.kune.gspace.client.options.license; -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction; -import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard; -import org.ourproject.kune.workspace.client.options.EntityOptions; - import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.gspace.client.options.EntityOptions; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.ioc.Provider; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.IsWidget; public abstract class EntityOptionsDefLicensePresenter { - private EntityOptionsDefLicenseView view; private final EntityOptions entityOptions; + // private final Provider<LicenseChangeAction> licChangeAction; + // private final Provider<LicenseWizard> licenseWizard; protected final Session session; - private final Provider<LicenseWizard> licenseWizard; - private final Provider<LicenseChangeAction> licChangeAction; + private EntityOptionsDefLicenseView view; - public EntityOptionsDefLicensePresenter(final EntityOptions entityOptions, final Session session, - final Provider<LicenseWizard> licenseWizard, final Provider<LicenseChangeAction> licChangeAction) { + 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; - + // this.licenseWizard = licenseWizard; + // this.licChangeAction = licChangeAction; } - public View getView() { + protected abstract boolean applicable(); + + protected abstract LicenseDTO getCurrentDefLicense(); + + protected abstract StateToken getOperationToken(); + + public IsWidget getView() { return view; } - public void init(final EntityOptionsDefLicenseView view) { + protected void init(final EntityOptionsDefLicenseView view) { this.view = view; - entityOptions.addTab(view); + entityOptions.addTab(view, view.getTabTitle()); setState(); - } - - public void onChange() { - licenseWizard.get().start(new Listener<LicenseDTO>() { - public void onEvent(final LicenseDTO license) { - licChangeAction.get().changeLicense(getOperationToken(), license, new Listener0() { - public void onEvent() { - setLicense(license); - } - }); + view.getChange().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + onLicenseClick(); } }); + view.getLicenseImage().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + // onChange(); + } + }); } + // public void onChange() { + // licenseWizard.get().start(new Listener<LicenseDTO>() { + // @Override + // public void onEvent(final LicenseDTO license) { + // licChangeAction.get().changeLicense(getOperationToken(), license, new + // Listener0() { + // @Override + // public void onEvent() { + // setLicense(license); + // } + // }); + // } + // }); + // } + public void onLicenseClick() { view.openWindow(getCurrentDefLicense().getUrl()); } - protected abstract boolean applicable(); + private void setLicense(final LicenseDTO license) { + view.setLicense(license); + } - protected abstract LicenseDTO getCurrentDefLicense(); - - protected abstract StateToken getOperationToken(); - protected void setState() { if (applicable()) { setLicense(getCurrentDefLicense()); } } - - private void setLicense(final LicenseDTO license) { - view.setLicense(license); - } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicenseView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicenseView.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicenseView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,14 +17,19 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.license; +package cc.kune.gspace.client.options.license; -import org.ourproject.kune.platf.client.View; - import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.gspace.client.options.EntityOptionsTabView; -public interface EntityOptionsDefLicenseView extends View { +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); Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicense.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicense.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicense.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.license; +package cc.kune.gspace.client.options.license; public interface GroupOptionsDefLicense extends EntityOptionsDefLicense { Added: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,15 @@ +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); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicensePresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,28 +17,30 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.license; +package cc.kune.gspace.client.options.license; -import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction; -import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard; -import org.ourproject.kune.workspace.client.options.EntityOptions; - import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.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.options.GroupOptions; -import com.calclab.suco.client.events.Listener2; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Inject; public class GroupOptionsDefLicensePresenter extends EntityOptionsDefLicensePresenter implements GroupOptionsDefLicense { - public GroupOptionsDefLicensePresenter(final EntityOptions entityOptions, final StateManager stateManager, - final Session session, final Provider<LicenseWizard> licenseWizard, - final Provider<LicenseChangeAction> licChangeAction) { - super(entityOptions, session, licenseWizard, licChangeAction); - stateManager.onGroupChanged(new Listener2<String, String>() { - public void onEvent(final String group1, final String group2) { + @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(); } }); Added: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicenseView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicenseView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicenseView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,5 @@ +package cc.kune.gspace.client.options.license; + +public interface GroupOptionsDefLicenseView extends EntityOptionsDefLicenseView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/license/GroupOptionsDefLicenseView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicense.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicense.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicense.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.license; +package cc.kune.gspace.client.options.license; public interface UserOptionsDefLicense extends EntityOptionsDefLicense { Added: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,15 @@ +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); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicensePresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,27 +17,30 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.license; +package cc.kune.gspace.client.options.license; -import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction; -import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard; -import org.ourproject.kune.workspace.client.options.EntityOptions; - import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.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.core.shared.dto.UserInfoDTO; +import cc.kune.gspace.client.options.UserOptions; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Inject; public class UserOptionsDefLicensePresenter extends EntityOptionsDefLicensePresenter implements UserOptionsDefLicense { - public UserOptionsDefLicensePresenter(final EntityOptions entityOptions, final Session session, - final Provider<LicenseWizard> licenseWizard, final Provider<LicenseChangeAction> licChangeAction) { - super(entityOptions, session, licenseWizard, licChangeAction); - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO parameter) { + @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(); } }); Added: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicenseView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicenseView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicenseView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,5 @@ +package cc.kune.gspace.client.options.license; + +public interface UserOptionsDefLicenseView extends EntityOptionsDefLicenseView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/license/UserOptionsDefLicenseView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/options/logo (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo) Added: trunk/src/main/java/cc/kune/gspace/client/options/logo/CurrentLogoChangedEvent.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/CurrentLogoChangedEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/CurrentLogoChangedEvent.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,55 @@ +package cc.kune.gspace.client.options.logo; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.event.shared.HasHandlers; + +public class CurrentLogoChangedEvent extends GwtEvent<CurrentLogoChangedEvent.CurrentLogoChangedHandler> { + + public interface CurrentLogoChangedHandler extends EventHandler { + public void onCurrentLogoChanged(CurrentLogoChangedEvent event); + } + + public interface HasCurrentLogoChangedHandlers extends HasHandlers { + HandlerRegistration addCurrentLogoChangedHandler(CurrentLogoChangedHandler handler); + } + + private static final Type<CurrentLogoChangedHandler> TYPE = new Type<CurrentLogoChangedHandler>(); + + public static void fire(final HasHandlers source) { + source.fireEvent(new CurrentLogoChangedEvent()); + } + + public static Type<CurrentLogoChangedHandler> getType() { + return TYPE; + } + + public CurrentLogoChangedEvent() { + } + + @Override + protected void dispatch(final CurrentLogoChangedHandler handler) { + handler.onCurrentLogoChanged(this); + } + + @Override + public boolean equals(final Object obj) { + return super.equals(obj); + } + + @Override + public Type<CurrentLogoChangedHandler> getAssociatedType() { + return TYPE; + } + + @Override + public int hashCode() { + return super.hashCode(); + } + + @Override + public String toString() { + return "CurrentLogoChangedEvent[" + "]"; + } +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/logo/CurrentLogoChangedEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogo.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogo.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.workspace.client.options.logo; +package cc.kune.gspace.client.options.logo; public interface EntityOptionsLogo { } Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,151 +17,200 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.workspace.client.options.logo; +package cc.kune.gspace.client.options.logo; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; -import org.ourproject.kune.platf.client.ui.noti.OldNotifyUser; -import org.ourproject.kune.workspace.client.options.EntityOptionsView; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.common.client.log.Log; +import cc.kune.common.client.ui.IconLabel; +import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.common.client.utils.TextUtils; 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.gwtext.client.core.Connection; -import com.gwtext.client.core.EventCallback; -import com.gwtext.client.core.EventObject; -import com.gwtext.client.core.Position; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; -import com.gwtext.client.widgets.form.Field; -import com.gwtext.client.widgets.form.Form; -import com.gwtext.client.widgets.form.FormPanel; -import com.gwtext.client.widgets.form.Hidden; -import com.gwtext.client.widgets.form.Label; -import com.gwtext.client.widgets.form.TextField; -import com.gwtext.client.widgets.form.event.FieldListenerAdapter; -import com.gwtext.client.widgets.form.event.FormListener; +import com.google.gwt.core.client.GWT; +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.Button; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.FileUpload; +import com.google.gwt.user.client.ui.FormPanel; +import com.google.gwt.user.client.ui.FormPanel.SubmitCompleteEvent; +import com.google.gwt.user.client.ui.FormPanel.SubmitEvent; +import com.google.gwt.user.client.ui.Hidden; +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 abstract class EntityOptionsLogoPanel extends FormPanel implements EntityOptionsLogoView { +public class EntityOptionsLogoPanel extends Composite implements EntityOptionsLogoView { - public static final String ICON_UPLD_SERVLET = "/ws/servlets/EntityLogoUploadManager"; - private final Hidden userhashField; - private final Hidden tokenField; - private final TextField file; + public static final String ICON_UPLD_SERVLET = "servlets/EntityLogoUploadManager"; private final Label dialogInfoLabel; + private final FileUpload fileUpload = new FileUpload(); + private final FormPanel form = new FormPanel(); private final I18nTranslationService i18n; + private OnAcceptCallback onAccept; + private final IconLabel tabTitle; + private final Hidden tokenField; + private final Hidden userhashField; - public EntityOptionsLogoPanel(final EntityOptionsLogoPresenter presenter, final WorkspaceSkeleton wskel, - final I18nTranslationService i18n, final String panelId, final String buttonId, final String inputId) { + // private final TextField file; + + public EntityOptionsLogoPanel(final EventBus eventBus, final I18nTranslationService i18n, final String panelId, + final String buttonId, final String inputId, final NavResources res) { super(); this.i18n = i18n; - super.setHeight(EntityOptionsView.HEIGHT); - super.setButtonAlign(Position.LEFT); - super.setFrame(true); - super.setAutoScroll(false); - super.setBorder(false); - super.setFileUpload(true); - super.setWidth(400); - super.setIconCls("k-picture-icon"); - super.setMethod(Connection.POST); - super.setUrl(ICON_UPLD_SERVLET); - super.setWaitMsgTarget(true); - super.setHideLabels(true); - super.setPaddings(10); - super.addFormListener(new FormListener() { - public boolean doBeforeAction(final Form form) { - return true; - } + tabTitle = new IconLabel(res.picture(), ""); + // super.setButtonAlign(HorizontalAlignment.LEFT); + // super.setFrame(true); + // super.setAutoScroll(false); + // super.setBorder(false); + // super.setFileUpload(true); + // super.setWidth(400); + // super.setIconCls("k-picture-icon"); + // super.setMethod(Method.POST); + // super.setUrl(ICON_UPLD_SERVLET); + // super.setWaitMsgTarget(true); + // super.setHideLabels(true); + // super.setPadding(10); + // super.addFormListener(new FormListener() { + // @Override + // public boolean doBeforeAction(final Form form) { + // return true; + // } + // + // @Override + // public void onActionComplete(final Form form, final int httpStatus, + // final String responseText) { + // presenter.onSubmitComplete(httpStatus, responseText); + // } + // + // @Override + // public void onActionFailed(final Form form, final int httpStatus, + // final String responseText) { + // presenter.onSubmitFailed(httpStatus, responseText); + // } + // }); + // super.add(dialogInfoLabel); + // file = new TextField("File", inputId); + // final EventCallback keyListener = new EventCallback() { + // @Override + // public void execute(final EventObject e) { + // // setEnableFileField(); + // } + // }; + // file.addKeyPressListener(keyListener); + // file.setId(inputId); + // file.setInputType("file"); + // super.add(file); + // final FieldListenerAdapter changeListener = new + // FieldListenerAdapter() { + // @Override + // public void onChange(final Field field, final Object newVal, final + // Object oldVal) { + // NotifyUser.info("change"); + // // setEnableFileField(); + // } + // }; + // // Don't works: + // file.addListener(changeListener); + // setId(panelId); + // + // sendButton.setId(buttonId); + // super.addButton(sendButton); - public void onActionComplete(final Form form, final int httpStatus, final String responseText) { - presenter.onSubmitComplete(httpStatus, responseText); - } + dialogInfoLabel = new Label(); - public void onActionFailed(final Form form, final int httpStatus, final String responseText) { - presenter.onSubmitFailed(httpStatus, responseText); - } - }); - dialogInfoLabel = new Label(); - super.add(dialogInfoLabel); - file = new TextField("File", inputId); - final EventCallback keyListener = new EventCallback() { - public void execute(final EventObject e) { - // setEnableFileField(); - } - }; - file.addKeyPressListener(keyListener); - file.setId(inputId); - file.setInputType("file"); + form.setEncoding(FormPanel.ENCODING_MULTIPART); + form.setMethod(FormPanel.METHOD_POST); + form.setAction(GWT.getModuleBaseURL() + ICON_UPLD_SERVLET); + userhashField = new Hidden(FileConstants.HASH, FileConstants.HASH); tokenField = new Hidden(FileConstants.TOKEN, FileConstants.TOKEN); - super.add(userhashField); - super.add(tokenField); - super.add(file); - final FieldListenerAdapter changeListener = new FieldListenerAdapter() { + + final VerticalPanel holder = new VerticalPanel(); + + fileUpload.setName("upload"); + holder.add(dialogInfoLabel); + holder.add(fileUpload); + holder.add(userhashField); + holder.add(tokenField); + holder.add(new Button(i18n.t("Send"), new ClickHandler() { @Override - public void onChange(final Field field, final Object newVal, final Object oldVal) { - OldNotifyUser.info("change"); - // setEnableFileField(); + public void onClick(final ClickEvent event) { + Log.info("You selected: " + fileUpload.getFilename(), null); + form.submit(); } - }; - // Don't works: - file.addListener(changeListener); - setId(panelId); + })); - final Button sendButton = new Button(i18n.t("Send"), new ButtonListenerAdapter() { + form.addSubmitHandler(new FormPanel.SubmitHandler() { @Override - public void onClick(final Button button, final EventObject e) { - final String filename = file.getValueAsString(); - if (filename != null && filename.length() > 0) { - getForm().submit(); + public void onSubmit(final SubmitEvent event) { + // final String filename = file.getValueAsString(); + // if (filename != null && filename.length() > 0) { + // getForm().submit(); + // } + + if (!"".equalsIgnoreCase(fileUpload.getFilename())) { + GWT.log("UPLOADING FILE????", null); + // NOW WHAT???? + } else { + event.cancel(); // cancel the event } + } }); - sendButton.setId(buttonId); - super.addButton(sendButton); + + form.addSubmitCompleteHandler(new FormPanel.SubmitCompleteHandler() { + @Override + public void onSubmitComplete(final SubmitCompleteEvent event) { + CurrentLogoChangedEvent.fire(eventBus); + } + }); + form.add(holder); + initWidget(form); + setHeight(String.valueOf(EntityOptionsView.HEIGHT)); } - // BrowseButton browseButton = new BrowseButton("SelectIcon"); - // browseButton.addListener(new BrowseButtonListenerAdapter() { - // @Override - // public void onInputFileChange(BrowseButton browseButton, String filename) - // { - // // - // } - // }); + @Override + public OnAcceptCallback getOnSubmit() { + // TODO Auto-generated method stub + return null; + } + @Override + public IsWidget getTabTitle() { + return tabTitle; + } + public void reset() { - super.getForm().reset(); + form.reset(); } + @Override public void setNormalGroupsLabels() { - dialogInfoLabel.setHtml(i18n.t("Select an image in your computer as the logo for this group. " + dialogInfoLabel.setText(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) - + DefaultFormUtils.brbr()); - super.setTitle(CoreMessages.ENT_LOGO_SELECTOR_NORMAL_TITLE); - doLayoutIfNeeded(); + + TextUtils.brbr()); + tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_NORMAL_TITLE); } + @Override public void setPersonalGroupsLabels() { - dialogInfoLabel.setHtml(i18n.t("Select an image in your computer as your avatar. " + dialogInfoLabel.setText(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) + "<br/><br/>"); - super.setTitle(CoreMessages.ENT_LOGO_SELECTOR_PERSON_TITLE); - doLayoutIfNeeded(); + tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_PERSON_TITLE); } + @Override public void setUploadParams(final String userHash, final String token) { userhashField.setValue(userHash); tokenField.setValue(token); } - private void doLayoutIfNeeded() { - if (super.isRendered()) { - doLayout(false); - } - } - } Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,54 +17,59 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.workspace.client.options.logo; +package cc.kune.gspace.client.options.logo; -import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.noti.OldNotifyUser; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.options.EntityOptions; - +import cc.kune.chat.client.ChatClient; +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.client.ws.entheader.EntityHeader; +import cc.kune.gspace.client.options.EntityOptions; -import com.calclab.suco.client.ioc.Provider; +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 { - - protected EntityOptionsLogoView view; - protected final Session session; + protected final Provider<ChatClient> chatEngine; private final EntityHeader entityLogo; private final EntityOptions entityOptions; + protected final Session session; protected final Provider<UserServiceAsync> userService; - protected final Provider<ChatEngine> chatEngine; + protected EntityOptionsLogoView view; - public EntityOptionsLogoPresenter(final Session session, final EntityHeader entityLogo, + public EntityOptionsLogoPresenter(final EventBus eventBus, final Session session, final EntityHeader entityLogo, final EntityOptions entityOptions, final Provider<UserServiceAsync> userService, - final Provider<ChatEngine> chatEngine) { + final Provider<ChatClient> chatEngine) { this.session = session; this.entityLogo = entityLogo; this.entityOptions = entityOptions; this.userService = userService; this.chatEngine = chatEngine; + eventBus.addHandler(CurrentLogoChangedEvent.getType(), new CurrentLogoChangedEvent.CurrentLogoChangedHandler() { + @Override + public void onCurrentLogoChanged(final CurrentLogoChangedEvent event) { + onSubmitComplete(); + } + }); } - public View getView() { + public IsWidget getView() { return view; } - public void init(final EntityOptionsLogoView view) { + protected void init(final EntityOptionsLogoView view) { this.view = view; - entityOptions.addTab(view); + entityOptions.addTab(view, view.getTabTitle()); setState(); } - public void onSubmitComplete(final int httpStatus, final String photoBinary) { + public void onSubmitComplete() { entityLogo.reloadGroupLogoImage(); } public void onSubmitFailed(final int httpStatus, final String responseText) { - OldNotifyUser.error("Error setting the logo: " + responseText); + NotifyUser.error("Error setting the logo: " + responseText); } protected abstract void setState(); Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoView.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptionsLogoView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,12 +17,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.workspace.client.options.logo; +package cc.kune.gspace.client.options.logo; -import org.ourproject.kune.platf.client.View; +import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.gspace.client.options.EntityOptionsTabView; -public interface EntityOptionsLogoView extends View { +public interface EntityOptionsLogoView extends EntityOptionsTabView { + OnAcceptCallback getOnSubmit(); + void setNormalGroupsLabels(); void setPersonalGroupsLabels(); Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogo.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogo.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.logo; +package cc.kune.gspace.client.options.logo; public interface GroupOptionsLogo extends EntityOptionsLogo { Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPanel.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,20 +17,22 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.logo; +package cc.kune.gspace.client.options.logo; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.client.services.FileConstants; import cc.kune.core.shared.i18n.I18nTranslationService; -public class GroupOptionsLogoPanel extends EntityOptionsLogoPanel { +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"; - public static final String BUTTON_ID = "k-golp-sendb"; - public GroupOptionsLogoPanel(final EntityOptionsLogoPresenter presenter, final WorkspaceSkeleton wskel, - final I18nTranslationService i18n) { - super(presenter, wskel, i18n, PANEL_ID, BUTTON_ID, FileConstants.GROUP_LOGO_FIELD); + @Inject + public GroupOptionsLogoPanel(final EventBus eventBus, final I18nTranslationService i18n, final NavResources res) { + super(eventBus, i18n, PANEL_ID, BUTTON_ID, FileConstants.GROUP_LOGO_FIELD, res); } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,34 +17,39 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.logo; +package cc.kune.gspace.client.options.logo; -import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.options.EntityOptions; - +import cc.kune.chat.client.ChatClient; 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.client.ws.entheader.EntityHeader; +import cc.kune.gspace.client.options.GroupOptions; -import com.calclab.suco.client.events.Listener2; -import com.calclab.suco.client.ioc.Provider; +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; public class GroupOptionsLogoPresenter extends EntityOptionsLogoPresenter { - public GroupOptionsLogoPresenter(final Session session, final EntityHeader entityLogo, - final EntityOptions entityOptions, final StateManager stateManager, - final Provider<UserServiceAsync> userService, final Provider<ChatEngine> chatEngine) { - super(session, entityLogo, entityOptions, userService, chatEngine); - stateManager.onGroupChanged(new Listener2<String, String>() { - public void onEvent(final String group1, final String group2) { + @Inject + public GroupOptionsLogoPresenter(final EventBus eventBus, final Session session, final EntityHeader entityLogo, + final GroupOptions entityOptions, final StateManager stateManager, + final Provider<UserServiceAsync> userService, final Provider<ChatClient> chatEngine, + final GroupOptionsLogoView view) { + super(eventBus, session, entityLogo, entityOptions, userService, chatEngine); + init(view); + stateManager.onGroupChanged(true, new GroupChangedHandler() { + @Override + public void onGroupChanged(final GroupChangedEvent event) { setState(); } }); } - @Override - public void init(final EntityOptionsLogoView view) { + private void init(final GroupOptionsLogoView view) { super.init(view); view.setNormalGroupsLabels(); } Added: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,5 @@ +package cc.kune.gspace.client.options.logo; + +public interface GroupOptionsLogoView extends EntityOptionsLogoView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/logo/GroupOptionsLogoView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogo.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogo.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.logo; +package cc.kune.gspace.client.options.logo; public interface UserOptionsLogo extends EntityOptionsLogo { Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPanel.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,20 +17,22 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.logo; +package cc.kune.gspace.client.options.logo; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.client.services.FileConstants; import cc.kune.core.shared.i18n.I18nTranslationService; -public class UserOptionsLogoPanel extends EntityOptionsLogoPanel { +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"; - public static final String BUTTON_ID = "k-uolp-sendb"; - public UserOptionsLogoPanel(final EntityOptionsLogoPresenter presenter, final WorkspaceSkeleton wskel, - final I18nTranslationService i18n) { - super(presenter, wskel, i18n, PANEL_ID, BUTTON_ID, FileConstants.USER_LOGO_FIELD); + @Inject + public UserOptionsLogoPanel(final EventBus eventBus, final I18nTranslationService i18n, final NavResources res) { + super(eventBus, i18n, PANEL_ID, BUTTON_ID, FileConstants.USER_LOGO_FIELD, res); } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,48 +17,53 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.logo; +package cc.kune.gspace.client.options.logo; -import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.options.EntityOptions; - +import cc.kune.chat.client.ChatClient; 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.client.ws.entheader.EntityHeader; import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.UserInfoDTO; +import cc.kune.gspace.client.options.UserOptions; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; public class UserOptionsLogoPresenter extends EntityOptionsLogoPresenter { - public UserOptionsLogoPresenter(final Session session, final EntityHeader entityLogo, - final EntityOptions entityOptions, final StateManager stateManager, - final Provider<UserServiceAsync> userService, final Provider<ChatEngine> chatEngine) { - super(session, entityLogo, entityOptions, userService, chatEngine); - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO parameter) { + @Inject + public UserOptionsLogoPresenter(final EventBus eventBus, final Session session, final EntityHeader entityLogo, + final UserOptions entityOptions, final StateManager stateManager, + final Provider<UserServiceAsync> userService, final Provider<ChatClient> chatEngine, + final UserOptionsLogoView view) { + super(eventBus, session, entityLogo, entityOptions, userService, chatEngine); + init(view); + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { setState(); } }); } - @Override - public void init(final EntityOptionsLogoView view) { + private void init(final UserOptionsLogoView view) { super.init(view); view.setPersonalGroupsLabels(); } @Override - public void onSubmitComplete(final int httpStatus, final String photoBinary) { - super.onSubmitComplete(httpStatus, photoBinary); + public void onSubmitComplete() { + super.onSubmitComplete(); 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) { chatEngine.get().setAvatar(photoBinary); } Added: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,5 @@ +package cc.kune.gspace.client.options.logo; + +public interface UserOptionsLogoView extends EntityOptionsLogoView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/logo/UserOptionsLogoView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/options/pscape (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape) Modified: trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConf.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConf.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConf.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.pscape; +package cc.kune.gspace.client.options.pscape; public interface EntityOptionsPublicSpaceConf { Modified: trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,58 +17,56 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.pscape; +package cc.kune.gspace.client.options.pscape; -import org.ourproject.kune.platf.client.ui.noti.OldNotifyUser; -import org.ourproject.kune.workspace.client.options.EntityOptionsView; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsThemeSelector; - +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.client.services.FileDownloadUtils; import cc.kune.core.client.services.ImageSize; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.EntityOptionsView; 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.user.client.ui.Button; import com.google.gwt.user.client.ui.HorizontalPanel; 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; -import com.google.gwt.user.client.ui.Widget; -import com.gwtext.client.core.EventObject; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; -public class EntityOptionsPublicSpaceConfPanel extends Panel implements EntityOptionsPublicSpaceConfView { +public class EntityOptionsPublicSpaceConfPanel extends VerticalPanel implements EntityOptionsPublicSpaceConfView { private final Image backImage; + private final Button clearBtn; + private final Label currentBackLabel; private final FileDownloadUtils downUtils; - private final Label currentBackLabel; private final Label noBackLabel; - private final Button clearBtn; + private final IconLabel tabTitle; - public EntityOptionsPublicSpaceConfPanel(final EntityOptionsPublicSpaceConfPresenter presenter, - final WorkspaceSkeleton ws, final I18nTranslationService i18n, final WsThemeSelector wsSelector, - final FileDownloadUtils downUtils) { + public EntityOptionsPublicSpaceConfPanel(final I18nTranslationService i18n, final FileDownloadUtils downUtils, + final CoreResources res) { this.downUtils = downUtils; - super.setTitle(i18n.t("Style")); - super.setIconCls("k-colors-icon"); - super.setAutoScroll(true); - super.setBorder(false); - super.setHeight(EntityOptionsView.HEIGHT); - super.setFrame(true); - super.setPaddings(10); + tabTitle = new IconLabel(res.themeChoose(), i18n.t("Style")); + // super.setIconCls("k-colors-icon"); + // super.setAutoScroll(true); + // super.setBorder(false); + super.setHeight(String.valueOf(EntityOptionsView.HEIGHT)); + // super.setFrame(true); + // super.setPaddings(10); final HorizontalPanel wsHP = new HorizontalPanel(); final Label wsThemeInfo = new Label(i18n.t("Change this workspace theme:")); - final Widget toolbarWsChange = (Widget) wsSelector.getView(); - toolbarWsChange.addStyleName("kune-Margin-Medium-l"); + // final Widget toolbarWsChange = (Widget) wsSelector.getView(); + // toolbarWsChange.addStyleName("kune-Margin-Medium-l"); wsHP.add(wsThemeInfo); - wsHP.add(toolbarWsChange); + // wsHP.add(toolbarWsChange); add(wsHP); final VerticalPanel backPanel = new VerticalPanel(); currentBackLabel = new Label(i18n.t("Current background image: ")); @@ -77,13 +75,7 @@ backImage.addStyleName("kune-Margin-Medium-trbl"); noBackLabel.addStyleName("kune-Margin-Medium-tb"); clearBtn = new Button(i18n.t("Clear")); - clearBtn.setTooltip(i18n.t("Remove current background image")); - clearBtn.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(final Button button, final EventObject event) { - presenter.clearBackImage(); - } - }); + Tooltip.to(clearBtn, i18n.t("Remove current background image")); backPanel.add(noBackLabel); backPanel.add(currentBackLabel); backPanel.add(backImage); @@ -93,10 +85,12 @@ wsInfo.addStyleName("kune-Margin-Medium-tb"); add(wsInfo); - final Panel stylesPanel = new Panel(); + final VerticalPanel stylesPanel = new VerticalPanel(); final ClickHandler clickHandler = new ClickHandler() { + + @Override public void onClick(final ClickEvent event) { - OldNotifyUser.info(TextUtils.IN_DEVELOPMENT_P); + NotifyUser.info(TextUtils.IN_DEVELOPMENT_P); } }; for (int i = 1; i <= 6; i++) { @@ -108,10 +102,22 @@ setBackImageVisibleImpl(false); } + @Override public void clearBackImage() { setBackImageVisibleImpl(false); } + @Override + public HasClickHandlers getClearBtn() { + return clearBtn; + } + + @Override + public IsWidget getTabTitle() { + return tabTitle; + } + + @Override public void setBackImage(final StateToken token) { backImage.setUrl(downUtils.getImageResizedUrl(token, ImageSize.thumb)); setBackImageVisibleImpl(true); Modified: trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,36 +17,41 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.pscape; +package cc.kune.gspace.client.options.pscape; -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.workspace.client.options.EntityOptions; -import org.ourproject.kune.workspace.client.themes.WsBackManager; - import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.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.ContentSimpleDTO; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.StateAbstractDTO; +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 com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.ioc.Provider; +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 EntityOptionsPublicSpaceConfPresenter implements EntityOptionsPublicSpaceConf { - private EntityOptionsPublicSpaceConfView view; + private final GSpaceBackManager backManager; private final EntityOptions entityOptions; + private final EventBus eventBus; private final Provider<GroupServiceAsync> groupService; private final Session session; - private final WsBackManager backManager; private final StateManager stateManager; + private EntityOptionsPublicSpaceConfView view; - protected EntityOptionsPublicSpaceConfPresenter(final Session session, final StateManager stateManager, - final EntityOptions entityOptions, final Provider<GroupServiceAsync> groupService, - final WsBackManager backManager) { + protected EntityOptionsPublicSpaceConfPresenter(final EventBus eventBus, final Session session, + final StateManager stateManager, final EntityOptions entityOptions, + final Provider<GroupServiceAsync> groupService, final GSpaceBackManager backManager) { + this.eventBus = eventBus; this.session = session; this.stateManager = stateManager; this.entityOptions = entityOptions; @@ -57,6 +62,7 @@ public void clearBackImage() { groupService.get().clearGroupBackImage(session.getUserHash(), session.getCurrentStateToken(), new AsyncCallbackSimple<GroupDTO>() { + @Override public void onSuccess(final GroupDTO result) { view.clearBackImage(); backManager.clearBackImage(); @@ -64,27 +70,37 @@ }); } - public View getView() { + public IsWidget getView() { return view; } public void init(final EntityOptionsPublicSpaceConfView view) { this.view = view; - entityOptions.addTab(view); - setBackImage(session.getContainerState().getGroup().getGroupBackImage()); - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - public void onEvent(final StateAbstractDTO state) { + entityOptions.addTab(view, view.getTabTitle()); + setBackImage(session.getCurrentState().getGroup().getGroupBackImage()); + 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) { + final StateAbstractDTO state = event.getState(); final ContentSimpleDTO backImage = state.getGroup().getGroupBackImage(); setBackImage(backImage); } }); - backManager.addSetBackImage(new Listener<StateToken>() { - public void onEvent(final StateToken token) { - view.setBackImage(token); + eventBus.addHandler(SetBackImageEvent.getType(), new SetBackImageEvent.SetBackImageHandler() { + @Override + public void onSetBackImage(final SetBackImageEvent event) { + view.setBackImage(event.getToken()); } }); - backManager.addBackClear(new Listener0() { - public void onEvent() { + eventBus.addHandler(ClearBackImageEvent.getType(), new ClearBackImageEvent.ClearBackImageHandler() { + @Override + public void onClearBackImage(final ClearBackImageEvent event) { view.clearBackImage(); } }); Modified: trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,16 +17,19 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.pscape; +package cc.kune.gspace.client.options.pscape; -import org.ourproject.kune.platf.client.View; - import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.gspace.client.options.EntityOptionsTabView; -public interface EntityOptionsPublicSpaceConfView extends View { +import com.google.gwt.event.dom.client.HasClickHandlers; +public interface EntityOptionsPublicSpaceConfView extends EntityOptionsTabView { + public void clearBackImage(); + HasClickHandlers getClearBtn(); + public void setBackImage(final StateToken token); } Modified: trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConf.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/GroupOptionsPublicSpaceConf.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConf.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.pscape; +package cc.kune.gspace.client.options.pscape; public interface GroupOptionsPublicSpaceConf extends EntityOptionsPublicSpaceConf { Added: trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConfPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConfPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConfPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,18 @@ +package cc.kune.gspace.client.options.pscape; + +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class GroupOptionsPublicSpaceConfPanel extends EntityOptionsPublicSpaceConfPanel implements + GroupOptionsPublicSpaceConfView { + + @Inject + public GroupOptionsPublicSpaceConfPanel(final I18nTranslationService i18n, final FileDownloadUtils downUtils, + final CoreResources res) { + super(i18n, downUtils, res); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConfPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/GroupOptionsPublicSpaceConfPresenter.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConfPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,40 +17,43 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.pscape; +package cc.kune.gspace.client.options.pscape; -import org.ourproject.kune.workspace.client.options.EntityOptions; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsTheme; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.themes.WsThemeSelector; - import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateChangedEvent; +import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.gspace.client.options.GroupOptions; +import cc.kune.gspace.client.style.GSpaceBackManager; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; public class GroupOptionsPublicSpaceConfPresenter extends EntityOptionsPublicSpaceConfPresenter implements GroupOptionsPublicSpaceConf { - public GroupOptionsPublicSpaceConfPresenter(final Session session, final StateManager stateManager, - final EntityOptions entityOptions, final WsThemeManager themeManager, final WsThemeSelector themeSelector, - final Provider<GroupServiceAsync> groupService, final WsBackManager backManager) { - super(session, stateManager, entityOptions, groupService, backManager); - themeSelector.addThemeSelected(new Listener<WsTheme>() { - public void onEvent(final WsTheme theme) { - themeManager.changeTheme(session.getCurrentStateToken(), theme); + @Inject + public GroupOptionsPublicSpaceConfPresenter(final EventBus eventBus, final Session session, + final StateManager stateManager, final GroupOptions entityOptions, + final Provider<GroupServiceAsync> groupService, final GSpaceBackManager backManager, + final GroupOptionsPublicSpaceConfView view) { + super(eventBus, session, stateManager, entityOptions, groupService, backManager); + // themeSelector.addThemeSelected(new Listener<WsTheme>() { + // public void onEvent(final WsTheme theme) { + // themeManager.changeTheme(session.getCurrentStateToken(), theme); + // } + // }); + init(view); + stateManager.onStateChanged(true, new StateChangedHandler() { + + @Override + public void onStateChanged(final StateChangedEvent event) { + // final String theme = state.getGroup().getWorkspaceTheme(); + // themeSelector.select(theme); } }); - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - public void onEvent(final StateAbstractDTO state) { - final String theme = state.getGroup().getWorkspaceTheme(); - themeSelector.select(theme); - } - }); } } \ No newline at end of file Added: trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConfView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConfView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConfView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,5 @@ +package cc.kune.gspace.client.options.pscape; + +public interface GroupOptionsPublicSpaceConfView extends EntityOptionsPublicSpaceConfView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/pscape/GroupOptionsPublicSpaceConfView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConf.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/UserOptionsPublicSpaceConf.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConf.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.pscape; +package cc.kune.gspace.client.options.pscape; public interface UserOptionsPublicSpaceConf extends EntityOptionsPublicSpaceConf { Added: trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConfPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConfPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConfPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,18 @@ +package cc.kune.gspace.client.options.pscape; + +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class UserOptionsPublicSpaceConfPanel extends EntityOptionsPublicSpaceConfPanel implements + UserOptionsPublicSpaceConfView { + + @Inject + public UserOptionsPublicSpaceConfPanel(final I18nTranslationService i18n, final FileDownloadUtils downUtils, + final CoreResources res) { + super(i18n, downUtils, res); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConfPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/UserOptionsPublicSpaceConfPresenter.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConfPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,50 +17,54 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.pscape; +package cc.kune.gspace.client.options.pscape; -import org.ourproject.kune.workspace.client.options.EntityOptions; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsTheme; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.themes.WsThemeSelector; - import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.state.UserSignInEvent; +import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; import cc.kune.core.shared.dto.UserInfoDTO; +import cc.kune.gspace.client.options.UserOptions; +import cc.kune.gspace.client.style.GSpaceBackManager; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; public class UserOptionsPublicSpaceConfPresenter extends EntityOptionsPublicSpaceConfPresenter implements UserOptionsPublicSpaceConf { - private final WsThemeSelector themeSelector; + // private final WsThemeSelector themeSelector; - public UserOptionsPublicSpaceConfPresenter(final Session session, final StateManager stateManager, - final EntityOptions entityOptions, final WsThemeManager themeManager, final WsThemeSelector themeSelector, - final Provider<GroupServiceAsync> groupService, final WsBackManager backManager) { - super(session, stateManager, entityOptions, groupService, backManager); - this.themeSelector = themeSelector; - themeSelector.addThemeSelected(new Listener<WsTheme>() { - public void onEvent(final WsTheme theme) { - themeManager.changeTheme(session.getCurrentUser().getStateToken(), theme); - } - }); + @Inject + public UserOptionsPublicSpaceConfPresenter(final EventBus eventBus, final Session session, + final StateManager stateManager, final UserOptions entityOptions, + final Provider<GroupServiceAsync> groupService, final GSpaceBackManager backManager, + final UserOptionsPublicSpaceConfView view) { + super(eventBus, session, stateManager, entityOptions, groupService, backManager); + // this.themeSelector = themeSelector; + // themeSelector.addThemeSelected(new Listener<WsTheme>() { + // public void onEvent(final WsTheme theme) { + // themeManager.changeTheme(session.getCurrentUser().getStateToken(), + // theme); + // } + // }); final UserInfoDTO userInfo = session.getCurrentUserInfo(); if (userInfo != null) { setSelector(userInfo); } - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO parameter) { - setSelector(userInfo); + init(view); + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + // setSelector(userInfo); } }); } private void setSelector(final UserInfoDTO userInfo) { - themeSelector.select(userInfo.getUserGroup().getWorkspaceTheme()); + // themeSelector.select(userInfo.getUserGroup().getWorkspaceTheme()); } } Added: trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConfView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConfView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConfView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,5 @@ +package cc.kune.gspace.client.options.pscape; + +public interface UserOptionsPublicSpaceConfView extends EntityOptionsPublicSpaceConfView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/pscape/UserOptionsPublicSpaceConfView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools) Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConf.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConf.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConf.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.tools; +package cc.kune.gspace.client.options.tools; public interface EntityOptionsToolsConf { Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,49 +17,54 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.tools; +package cc.kune.gspace.client.options.tools; import java.util.HashMap; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; -import org.ourproject.kune.workspace.client.options.EntityOptionsView; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.common.client.log.Log; +import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.common.client.ui.IconLabel; +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.allen_sauer.gwt.log.client.Log; -import com.gwtext.client.widgets.ToolTip; -import com.gwtext.client.widgets.form.Checkbox; -import com.gwtext.client.widgets.form.Hidden; -import com.gwtext.client.widgets.form.Label; -import com.gwtext.client.widgets.form.event.CheckboxListenerAdapter; +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.Label; +import com.extjs.gxt.ui.client.widget.form.CheckBox; +import com.extjs.gxt.ui.client.widget.form.HiddenField; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.Widget; public class EntityOptionsToolsConfPanel extends DefaultForm implements EntityOptionsToolsConfView { - - private final EntityOptionsToolsConfPresenter presenter; - private final HashMap<String, Checkbox> fields; + private final HashMap<String, CheckBox> fields; private final I18nTranslationService i18n; + private final IconLabel tabTitle; - public EntityOptionsToolsConfPanel(final EntityOptionsToolsConfPresenter presenter, final WorkspaceSkeleton ws, - final I18nTranslationService i18n) { - super(i18n.t("Tools")); + public EntityOptionsToolsConfPanel(final I18nTranslationService i18n, final CoreResources res) { + tabTitle = new IconLabel(res.kunePreferences(), i18n.t("Tools")); this.i18n = i18n; super.setHeight(EntityOptionsView.HEIGHT); super.setFrame(true); - super.add(new Hidden()); + super.add(new HiddenField()); super.getFormPanel().setLabelWidth(20); - this.presenter = presenter; - fields = new HashMap<String, Checkbox>(); + fields = new HashMap<String, CheckBox>(); } - public void add(final ToolSimpleDTO tool) { - final Checkbox checkbox = new Checkbox(tool.getRootName()); - checkbox.setChecked(false); - checkbox.addListener(new CheckboxListenerAdapter() { + @Override + public void add(final ToolSimpleDTO tool, final ClickHandler handler) { + final CheckBox checkbox = new CheckBox(); + checkbox.setFieldLabel(tool.getRootName()); + checkbox.setValue(false); + checkbox.addListener(Events.Change, new Listener<BaseEvent>() { @Override - public void onCheck(final Checkbox field, final boolean checked) { - presenter.onCheck(tool, checked); + public void handleEvent(final BaseEvent be) { + handler.onClick(null); + // presenter.onCheck(tool, checked); } }); super.add(checkbox); @@ -67,21 +72,55 @@ doLayoutIfNeeded(); } + @Override + public Widget asWidget() { + return super.getFormPanel(); + } + + @Override public void clear() { - super.getFormPanel().removeAll(true); + super.getFormPanel().removeAll(); fields.clear(); final Label label = new Label(); - label.setHtml(i18n.t("Here you can select the tools used:") + "<br/><br/>"); + label.setText(i18n.t("Here you can select the tools used:"));// + + // "<br/><br/>"); 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 setChecked(final String tool, final boolean checked) { - final Checkbox field = getTool(tool); + final CheckBox field = getTool(tool); field.setValue(checked); } + @Override public void setEnabled(final String tool, final boolean enabled) { - final Checkbox field = getTool(tool); + final CheckBox field = getTool(tool); if (enabled) { field.enable(); } else { @@ -89,27 +128,9 @@ } } + @Override public void setTooltip(final String tool, final String tip) { - final Checkbox field = getTool(tool); - final ToolTip tooltip = new ToolTip(); - tooltip.setHtml(tip); - tooltip.setWidth(250); - tooltip.applyTo(field); - field.setTitle(tip); - doLayoutIfNeeded(); + final CheckBox field = getTool(tool); + Tooltip.to(field, tip); } - - private void doLayoutIfNeeded() { - if (super.getFormPanel().isRendered()) { - super.getFormPanel().doLayout(); - } - } - - 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; - } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,14 +17,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.tools; +package cc.kune.gspace.client.options.tools; import java.util.Collection; import java.util.List; -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.workspace.client.options.EntityOptions; - import cc.kune.common.client.notify.NotifyLevel; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; @@ -32,9 +29,13 @@ 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.calclab.suco.client.ioc.Provider; +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 { @@ -67,7 +68,7 @@ protected abstract StateToken getOperationToken(); - public View getView() { + public IsWidget getView() { return view; } @@ -76,10 +77,10 @@ public void init(final EntityOptionsToolsConfView view) { this.view = view; setState(); - entityOptions.addTab(view); + entityOptions.addTab(view, view.getTabTitle()); } - public void onCheck(final ToolSimpleDTO tool, final boolean checked) { + private void onCheck(final ToolSimpleDTO tool, final boolean checked) { final List<String> enabledTools = getEnabledTools(); final String toolName = tool.getName(); if (checked) { @@ -103,7 +104,12 @@ reset(); final Collection<ToolSimpleDTO> toolCollection = getAllTools(); for (final ToolSimpleDTO tool : toolCollection) { - view.add(tool); + view.add(tool, new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + onCheck(tool, view.isChecked(tool.getName())); + } + }); view.setEnabled(tool.getName(), true); } for (final String tool : getEnabledTools()) { Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfView.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,18 +17,21 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.tools; +package cc.kune.gspace.client.options.tools; -import org.ourproject.kune.platf.client.View; - import cc.kune.core.shared.dto.ToolSimpleDTO; +import cc.kune.gspace.client.options.EntityOptionsTabView; -public interface EntityOptionsToolsConfView extends View { +import com.google.gwt.event.dom.client.ClickHandler; - void add(ToolSimpleDTO tool); +public interface EntityOptionsToolsConfView extends EntityOptionsTabView { + void add(ToolSimpleDTO tool, ClickHandler clickHandler); + void clear(); + boolean isChecked(String tool); + void setChecked(String tool, boolean checked); void setEnabled(String tool, boolean enabled); Deleted: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolConf.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolConf.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolConf.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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 org.ourproject.kune.workspace.client.options.tools; - -public interface GroupOptionsToolConf extends EntityOptionsToolsConf { - -} Copied: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConf.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolConf.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConf.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConf.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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 GroupOptionsToolsConf extends EntityOptionsToolsConf { + +} Added: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,15 @@ +package cc.kune.gspace.client.options.tools; + +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) { + super(i18n, res); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,32 +17,36 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.tools; +package cc.kune.gspace.client.options.tools; import java.util.Collection; import java.util.List; -import org.ourproject.kune.workspace.client.options.EntityOptions; - 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.calclab.suco.client.events.Listener2; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Inject; +import com.google.inject.Provider; -public class GroupOptionsToolsConfPresenter extends EntityOptionsToolsConfPresenter implements GroupOptionsToolConf { +public class GroupOptionsToolsConfPresenter extends EntityOptionsToolsConfPresenter implements GroupOptionsToolsConf { + @Inject public GroupOptionsToolsConfPresenter(final StateManager stateManager, final Session session, - final I18nTranslationService i18n, final EntityOptions entityOptions, - final Provider<GroupServiceAsync> groupService) { + final I18nTranslationService i18n, final GroupOptions entityOptions, + final Provider<GroupServiceAsync> groupService, final GroupOptionsToolsConfView view) { super(session, stateManager, i18n, entityOptions, groupService); - stateManager.onGroupChanged(new Listener2<String, String>() { - public void onEvent(final String group1, final String group2) { + init(view); + stateManager.onGroupChanged(true, new GroupChangedHandler() { + @Override + public void onGroupChanged(final GroupChangedEvent event) { setState(); } }); Added: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,5 @@ +package cc.kune.gspace.client.options.tools; + +public interface GroupOptionsToolsConfView extends EntityOptionsToolsConfView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptionsToolsConfView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConf.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConf.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConf.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.tools; +package cc.kune.gspace.client.options.tools; public interface UserOptionsToolsConf extends EntityOptionsToolsConf { Added: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,15 @@ +package cc.kune.gspace.client.options.tools; + +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) { + super(i18n, res); + } + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java 2011-04-26 11:38:16 UTC (rev 1320) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -17,32 +17,35 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.options.tools; +package cc.kune.gspace.client.options.tools; import java.util.Collection; import java.util.List; -import org.ourproject.kune.workspace.client.options.EntityOptions; - import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.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.dto.UserInfoDTO; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.options.UserOptions; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; +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 EntityOptions entityOptions, - final Provider<GroupServiceAsync> groupService) { + final I18nTranslationService i18n, final UserOptions entityOptions, + final Provider<GroupServiceAsync> groupService, final GroupOptionsToolsConfView view) { super(session, stateManager, i18n, entityOptions, groupService); - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO parameter) { + init(view); + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { setState(); } }); Added: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfView.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,5 @@ +package cc.kune.gspace.client.options.tools; + +public interface UserOptionsToolsConfView extends EntityOptionsToolsConfView { + +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/options/tools/UserOptionsToolsConfView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-04-28 00:56:31 UTC (rev 1324) @@ -45,7 +45,7 @@ .entityHeader span { font-size: 56px; - margin-left: 15px; + /* margin-left: 15px; */ color: #550000; font-weight: bold; font: 'UbuntuBold', Arial; Added: trunk/src/main/java/cc/kune/gspace/client/style/ClearBackImageEvent.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/style/ClearBackImageEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/style/ClearBackImageEvent.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,58 @@ +package cc.kune.gspace.client.style; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; + +import com.google.gwt.event.shared.HasHandlers; + +public class ClearBackImageEvent extends GwtEvent<ClearBackImageEvent.ClearBackImageHandler> { + + public interface HasClearBackImageHandlers extends HasHandlers { + HandlerRegistration addClearBackImageHandler(ClearBackImageHandler handler); + } + + public interface ClearBackImageHandler extends EventHandler { + public void onClearBackImage(ClearBackImageEvent event); + } + + private static final Type<ClearBackImageHandler> TYPE = new Type<ClearBackImageHandler>(); + + public static void fire(HasHandlers source) { + source.fireEvent(new ClearBackImageEvent()); + } + + public static Type<ClearBackImageHandler> getType() { + return TYPE; + } + + + public ClearBackImageEvent() { + } + + @Override + public Type<ClearBackImageHandler> getAssociatedType() { + return TYPE; + } + + @Override + protected void dispatch(ClearBackImageHandler handler) { + handler.onClearBackImage(this); + } + + @Override + public boolean equals(Object obj) { + return super.equals(obj); + } + + @Override + public int hashCode() { + return super.hashCode(); + } + + @Override + public String toString() { + return "ClearBackImageEvent[" + + "]"; + } +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/style/ClearBackImageEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/gspace/client/style/GSpaceBackManager.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/style/GSpaceBackManager.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/style/GSpaceBackManager.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,30 @@ +/* + * + * 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.style; + +import cc.kune.core.shared.domain.utils.StateToken; + +public interface GSpaceBackManager { + + void clearBackImage(); + + void setBackImage(StateToken token); + +} Copied: trunk/src/main/java/cc/kune/gspace/client/style/GSpaceBackManagerImpl.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/style/GSpaceBackManagerImpl.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/style/GSpaceBackManagerImpl.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,64 @@ +/* + * + * 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.style; + +import org.cobogw.gwt.user.client.CSS; + +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.shared.domain.utils.StateToken; + +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.RootPanel; +import com.google.inject.Inject; + +public class GSpaceBackManagerImpl implements GSpaceBackManager { + + private static final StateToken NO_TOKEN = new StateToken("none.none.0.0"); + private final FileDownloadUtils downloadUtils; + private final EventBus eventBus; + private StateToken lastToken; + + @Inject + public GSpaceBackManagerImpl(final EventBus eventBus, final FileDownloadUtils downloadUtils) { + this.eventBus = eventBus; + this.downloadUtils = downloadUtils; + lastToken = NO_TOKEN; + } + + @Override + public void clearBackImage() { + if (!lastToken.equals(NO_TOKEN)) { + DOM.setStyleAttribute(RootPanel.getBodyElement(), CSS.A.BACKGROUND, "transparent"); + lastToken = NO_TOKEN; + } + ClearBackImageEvent.fire(eventBus); + } + + @Override + public void setBackImage(final StateToken token) { + if (!token.equals(lastToken)) { + final String bodyProp = "#FFFFFF url('" + downloadUtils.getImageUrl(token) + "') fixed no-repeat top left"; + DOM.setStyleAttribute(RootPanel.getBodyElement(), CSS.A.BACKGROUND, bodyProp); + lastToken = token; + } + SetBackImageEvent.fire(eventBus, token); + } +} Added: trunk/src/main/java/cc/kune/gspace/client/style/SetBackImageEvent.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/style/SetBackImageEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/style/SetBackImageEvent.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,83 @@ +package cc.kune.gspace.client.style; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; + +import com.google.gwt.event.shared.HasHandlers; + +public class SetBackImageEvent extends GwtEvent<SetBackImageEvent.SetBackImageHandler> { + + public interface HasSetBackImageHandlers extends HasHandlers { + HandlerRegistration addSetBackImageHandler(SetBackImageHandler handler); + } + + public interface SetBackImageHandler extends EventHandler { + public void onSetBackImage(SetBackImageEvent event); + } + + private static final Type<SetBackImageHandler> TYPE = new Type<SetBackImageHandler>(); + + public static void fire(HasHandlers source, cc.kune.core.shared.domain.utils.StateToken token) { + source.fireEvent(new SetBackImageEvent(token)); + } + + public static Type<SetBackImageHandler> getType() { + return TYPE; + } + + cc.kune.core.shared.domain.utils.StateToken token; + + public SetBackImageEvent(cc.kune.core.shared.domain.utils.StateToken token) { + this.token = token; + } + + protected SetBackImageEvent() { + // Possibly for serialization. + } + + @Override + public Type<SetBackImageHandler> getAssociatedType() { + return TYPE; + } + + public cc.kune.core.shared.domain.utils.StateToken getToken() { + return token; + } + + @Override + protected void dispatch(SetBackImageHandler handler) { + handler.onSetBackImage(this); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + SetBackImageEvent other = (SetBackImageEvent) obj; + if (token == null) { + if (other.token != null) + return false; + } else if (!token.equals(other.token)) + return false; + return true; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + (token == null ? 1 : token.hashCode()); + return hashCode; + } + + @Override + public String toString() { + return "SetBackImageEvent[" + + token + + "]"; + } +} Property changes on: trunk/src/main/java/cc/kune/gspace/client/style/SetBackImageEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -31,7 +31,6 @@ import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; @@ -43,6 +42,7 @@ import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.gspace.client.style.GSpaceBackManager; import com.calclab.suco.client.ioc.Provider; @@ -55,7 +55,7 @@ final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, final BlogViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final WsBackManager wsBackManager) { + final GSpaceBackManager wsBackManager) { super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -30,7 +30,6 @@ import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; @@ -42,6 +41,7 @@ import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.gspace.client.style.GSpaceBackManager; import com.calclab.suco.client.ioc.Provider; @@ -54,7 +54,7 @@ final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, final GalleryViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final WsBackManager wsBackManager) { + final GSpaceBackManager wsBackManager) { super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialog.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialog.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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 org.ourproject.kune.platf.client.ui.dialogs.tabbed; - -import org.ourproject.kune.platf.client.View; - -import cc.kune.common.client.notify.NotifyLevel; - -public interface AbstractTabbedDialog { - - void activateTab(int index); - - void addTab(View view); - - public void hideMessages(); - - public void setErrorMessage(String message, NotifyLevel level); - - void show(); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -1,236 +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 org.ourproject.kune.platf.client.ui.dialogs.tabbed; - -import java.util.ArrayList; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; - -import cc.kune.common.client.notify.NotifyLevel; -import cc.kune.common.client.notify.NotifyLevelImages; -import cc.kune.core.client.ui.dialogs.MessageToolbar; - -import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.events.Listener0; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.Component; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.TabPanel; -import com.gwtext.client.widgets.event.WindowListenerAdapter; - -public abstract class AbstractTabbedDialogPanel implements AbstractTabbedDialogView { - private final ArrayList<Button> buttons; - private BasicDialog dialog; - private final String dialogId; - private final String errorLabelId; - private final int height; - private String iconCls; - private final NotifyLevelImages images; - private MessageToolbar messageErrorBar; - private final int minHeight; - private final int minWidth; - private final boolean modal; - private Listener0 onHideListener; - private TabPanel tabPanel; - private String title; - private final int width; - - public AbstractTabbedDialogPanel(final String dialogId, final String title, final int width, final int height, - final int minWidth, final int minHeight, final boolean modal, final NotifyLevelImages images, - final String errorLabelId) { - this.dialogId = dialogId; - this.title = title; - this.width = width; - this.height = height; - this.minWidth = minWidth; - this.minHeight = minHeight; - this.modal = modal; - this.images = images; - this.errorLabelId = errorLabelId; - buttons = new ArrayList<Button>(); - } - - @Override - public void activateTab(final int index) { - createDialogIfNecessary(); - tabPanel.activate(index); - } - - /** - * User before show/render - * - * @param button - */ - public void addButton(final Button button) { - buttons.add(button); - } - - private void addHideListener() { - dialog.addListener(new WindowListenerAdapter() { - @Override - public void onClose(final Panel panel) { - onHideListener.onEvent(); - } - - @Override - public void onHide(final Component component) { - onHideListener.onEvent(); - } - }); - } - - public void addHideListener(final Listener0 onHideListener) { - this.onHideListener = onHideListener; - if (dialog != null) { - addHideListener(); - } - } - - @Override - public void addTab(final View view) { - addTabPanel(castPanel(view)); - doLayoutIfNeeded(); - } - - private void addTabPanel(final Panel newTab) { - createDialogIfNecessary(); - tabPanel.add(newTab); - } - - private Panel castPanel(final View view) { - Panel panel; - if (view instanceof Panel) { - panel = (Panel) view; - } else if (view instanceof DefaultForm) { - panel = ((DefaultForm) view).getFormPanel(); - } else { - panel = null; - Log.error("Programatic error: Unexpected element added to GroupOptions"); - } - return panel; - } - - @Override - public void createAndShow() { - show(); - setFirstTabActive(); - } - - private void createDialog() { - dialog = new BasicDialog(dialogId, title, modal, true, width, height, minWidth, minHeight); - dialog.setCollapsible(false); - messageErrorBar = new MessageToolbar(images, errorLabelId); - // FIXME in gxt: dialog.setBottomToolbar(messageErrorBar.getToolbar()); - tabPanel = new TabPanel(); - tabPanel.setBorder(false); - dialog.add(tabPanel); - if (iconCls != null) { - dialog.setIconCls(iconCls); - } - if (onHideListener != null) { - addHideListener(); - } - for (final Button button : buttons) { - dialog.addButton(button); - } - } - - private void createDialogIfNecessary() { - if (dialog == null) { - createDialog(); - } - } - - @Override - public void destroy() { - if (dialog != null) { - dialog.destroy(); - dialog = null; - } - } - - public void doLayoutIfNeeded() { - if (dialog.isRendered()) { - dialog.doLayout(false); - } - } - - @Override - public void hide() { - if (dialog != null) { - if (dialog.isVisible()) { - dialog.hide(); - } - } - } - - @Override - public void hideMessages() { - if (dialog != null) { - messageErrorBar.hideErrorMessage(); - } - } - - @Override - public void insertTab(final int index, final View view) { - insertTabPanel(index, castPanel(view)); - doLayoutIfNeeded(); - } - - private void insertTabPanel(final int index, final Panel newTab) { - createDialogIfNecessary(); - tabPanel.insert(index, newTab); - } - - public boolean isVisible() { - createDialogIfNecessary(); - return dialog.isVisible(); - } - - @Override - public void setErrorMessage(final String message, final NotifyLevel level) { - messageErrorBar.setErrorMessage(message, level); - } - - public void setFirstTabActive() { - tabPanel.setActiveTab(0); - } - - public void setIconCls(final String iconCls) { - this.iconCls = iconCls; - if (dialog != null) { - dialog.setIconCls(iconCls); - } - } - - public void setTitle(final String title) { - this.title = title; - if (dialog != null) { - dialog.setTitle(title); - } - } - - public void show() { - createDialogIfNecessary(); - dialog.show(); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -1,71 +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 org.ourproject.kune.platf.client.ui.dialogs.tabbed; - -import org.ourproject.kune.platf.client.View; - -import cc.kune.common.client.notify.NotifyLevel; - -public abstract class AbstractTabbedDialogPresenter implements AbstractTabbedDialog { - - private AbstractTabbedDialogView view; - - @Override - public void activateTab(final int index) { - view.activateTab(index); - } - - @Override - public void addTab(final View tab) { - view.addTab(tab); - } - - public View getView() { - return view; - } - - public void hide() { - view.hide(); - } - - @Override - public void hideMessages() { - view.hideMessages(); - } - - public void init(final AbstractTabbedDialogView view) { - this.view = view; - } - - public void insertTab(final int index, final View tab) { - view.insertTab(index, tab); - } - - public void setErrorMessage(final String message, final NotifyLevel level) { - view.setErrorMessage(message, level); - } - - @Override - public void show() { - hideMessages(); - view.createAndShow(); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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 org.ourproject.kune.platf.client.ui.dialogs.tabbed; - -import org.ourproject.kune.platf.client.View; - -import cc.kune.common.client.notify.NotifyLevel; - -public interface AbstractTabbedDialogView extends View { - - void activateTab(int index); - - void addTab(View tab); - - void createAndShow(); - - void destroy(); - - void hide(); - - void hideMessages(); - - void insertTab(int index, View tab); - - void setErrorMessage(final String message, final NotifyLevel level); - -} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialog.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialog.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialog.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialog.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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 org.ourproject.kune.platf.client.ui.dialogs.tabbed; + +import org.ourproject.kune.platf.client.View; + +import cc.kune.common.client.notify.NotifyLevel; + +public interface OldAbstractTabbedDialog { + + void activateTab(int index); + + void addTab(View view); + + public void hideMessages(); + + public void setErrorMessage(String message, NotifyLevel level); + + void show(); + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialogPanel.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialogPanel.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialogPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,236 @@ +/* + * + * 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 org.ourproject.kune.platf.client.ui.dialogs.tabbed; + +import java.util.ArrayList; + +import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; +import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; + +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevelImages; +import cc.kune.common.client.ui.dialogs.MessageToolbar; + +import com.allen_sauer.gwt.log.client.Log; +import com.calclab.suco.client.events.Listener0; +import com.gwtext.client.widgets.Button; +import com.gwtext.client.widgets.Component; +import com.gwtext.client.widgets.Panel; +import com.gwtext.client.widgets.TabPanel; +import com.gwtext.client.widgets.event.WindowListenerAdapter; + +public abstract class OldAbstractTabbedDialogPanel implements OldAbstractTabbedDialogView { + private final ArrayList<Button> buttons; + private BasicDialog dialog; + private final String dialogId; + private final String errorLabelId; + private final int height; + private String iconCls; + private final NotifyLevelImages images; + private MessageToolbar messageErrorBar; + private final int minHeight; + private final int minWidth; + private final boolean modal; + private Listener0 onHideListener; + private TabPanel tabPanel; + private String title; + private final int width; + + public OldAbstractTabbedDialogPanel(final String dialogId, final String title, final int width, final int height, + final int minWidth, final int minHeight, final boolean modal, final NotifyLevelImages images, + final String errorLabelId) { + this.dialogId = dialogId; + this.title = title; + this.width = width; + this.height = height; + this.minWidth = minWidth; + this.minHeight = minHeight; + this.modal = modal; + this.images = images; + this.errorLabelId = errorLabelId; + buttons = new ArrayList<Button>(); + } + + @Override + public void activateTab(final int index) { + createDialogIfNecessary(); + tabPanel.activate(index); + } + + /** + * User before show/render + * + * @param button + */ + public void addButton(final Button button) { + buttons.add(button); + } + + private void addHideListener() { + dialog.addListener(new WindowListenerAdapter() { + @Override + public void onClose(final Panel panel) { + onHideListener.onEvent(); + } + + @Override + public void onHide(final Component component) { + onHideListener.onEvent(); + } + }); + } + + public void addHideListener(final Listener0 onHideListener) { + this.onHideListener = onHideListener; + if (dialog != null) { + addHideListener(); + } + } + + @Override + public void addTab(final View view) { + addTabPanel(castPanel(view)); + doLayoutIfNeeded(); + } + + private void addTabPanel(final Panel newTab) { + createDialogIfNecessary(); + tabPanel.add(newTab); + } + + private Panel castPanel(final View view) { + Panel panel; + if (view instanceof Panel) { + panel = (Panel) view; + } else if (view instanceof DefaultForm) { + panel = ((DefaultForm) view).getFormPanel(); + } else { + panel = null; + Log.error("Programatic error: Unexpected element added to GroupOptions"); + } + return panel; + } + + @Override + public void createAndShow() { + show(); + setFirstTabActive(); + } + + private void createDialog() { + dialog = new BasicDialog(dialogId, title, modal, true, width, height, minWidth, minHeight); + dialog.setCollapsible(false); + messageErrorBar = new MessageToolbar(images, errorLabelId); + // FIXME in gxt: dialog.setBottomToolbar(messageErrorBar.getToolbar()); + tabPanel = new TabPanel(); + tabPanel.setBorder(false); + dialog.add(tabPanel); + if (iconCls != null) { + dialog.setIconCls(iconCls); + } + if (onHideListener != null) { + addHideListener(); + } + for (final Button button : buttons) { + dialog.addButton(button); + } + } + + private void createDialogIfNecessary() { + if (dialog == null) { + createDialog(); + } + } + + @Override + public void destroy() { + if (dialog != null) { + dialog.destroy(); + dialog = null; + } + } + + public void doLayoutIfNeeded() { + if (dialog.isRendered()) { + dialog.doLayout(false); + } + } + + @Override + public void hide() { + if (dialog != null) { + if (dialog.isVisible()) { + dialog.hide(); + } + } + } + + @Override + public void hideMessages() { + if (dialog != null) { + messageErrorBar.hideErrorMessage(); + } + } + + @Override + public void insertTab(final int index, final View view) { + insertTabPanel(index, castPanel(view)); + doLayoutIfNeeded(); + } + + private void insertTabPanel(final int index, final Panel newTab) { + createDialogIfNecessary(); + tabPanel.insert(index, newTab); + } + + public boolean isVisible() { + createDialogIfNecessary(); + return dialog.isVisible(); + } + + @Override + public void setErrorMessage(final String message, final NotifyLevel level) { + messageErrorBar.setErrorMessage(message, level); + } + + public void setFirstTabActive() { + tabPanel.setActiveTab(0); + } + + public void setIconCls(final String iconCls) { + this.iconCls = iconCls; + if (dialog != null) { + dialog.setIconCls(iconCls); + } + } + + public void setTitle(final String title) { + this.title = title; + if (dialog != null) { + dialog.setTitle(title); + } + } + + public void show() { + createDialogIfNecessary(); + dialog.show(); + } +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialogPresenter.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialogPresenter.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialogPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -0,0 +1,71 @@ +/* + * + * 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 org.ourproject.kune.platf.client.ui.dialogs.tabbed; + +import org.ourproject.kune.platf.client.View; + +import cc.kune.common.client.notify.NotifyLevel; + +public abstract class OldAbstractTabbedDialogPresenter implements OldAbstractTabbedDialog { + + private OldAbstractTabbedDialogView view; + + @Override + public void activateTab(final int index) { + view.activateTab(index); + } + + @Override + public void addTab(final View tab) { + view.addTab(tab); + } + + public View getView() { + return view; + } + + public void hide() { + view.hide(); + } + + @Override + public void hideMessages() { + view.hideMessages(); + } + + public void init(final OldAbstractTabbedDialogView view) { + this.view = view; + } + + public void insertTab(final int index, final View tab) { + view.insertTab(index, tab); + } + + public void setErrorMessage(final String message, final NotifyLevel level) { + view.setErrorMessage(message, level); + } + + @Override + public void show() { + hideMessages(); + view.createAndShow(); + } + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialogView.java (from rev 1320, trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialogView.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/OldAbstractTabbedDialogView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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 org.ourproject.kune.platf.client.ui.dialogs.tabbed; + +import org.ourproject.kune.platf.client.View; + +import cc.kune.common.client.notify.NotifyLevel; + +public interface OldAbstractTabbedDialogView extends View { + + void activateTab(int index); + + void addTab(View tab); + + void createAndShow(); + + void destroy(); + + void hide(); + + void hideMessages(); + + void insertTab(int index, View tab); + + void setErrorMessage(final String message, final NotifyLevel level); + +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialog.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialog.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,12 +19,12 @@ */ package org.ourproject.kune.platf.client.ui.rte.edithtml; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialog; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialog; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; -public interface EditHtmlDialog extends AbstractTabbedDialog { +public interface EditHtmlDialog extends OldAbstractTabbedDialog { String getHtml(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.client.ui.rte.edithtml; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogPanel; import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; import cc.kune.common.client.notify.NotifyLevel; @@ -31,7 +31,7 @@ import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.event.ButtonListenerAdapter; -public class EditHtmlDialogPanel extends AbstractTabbedDialogPanel implements EditHtmlDialogView { +public class EditHtmlDialogPanel extends OldAbstractTabbedDialogPanel implements EditHtmlDialogView { public static final String EDIG_HTML_DIALOG_ERROR_ID = "ehtml-dialgo-error"; public static final String EDIT_HTML_DIALOG = "ehtml-dialog"; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPresenter.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,12 +19,12 @@ */ package org.ourproject.kune.platf.client.ui.rte.edithtml; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogPresenter; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; -public class EditHtmlDialogPresenter extends AbstractTabbedDialogPresenter implements EditHtmlDialog { +public class EditHtmlDialogPresenter extends OldAbstractTabbedDialogPresenter implements EditHtmlDialog { private Listener<String> updateListener; private Listener0 cancelListener; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogView.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -20,9 +20,9 @@ package org.ourproject.kune.platf.client.ui.rte.edithtml; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogView; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogView; -public interface EditHtmlDialogView extends AbstractTabbedDialogView, View { +public interface EditHtmlDialogView extends OldAbstractTabbedDialogView, View { int HEIGHT = 225; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialog.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialog.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,12 +19,12 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertimg; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialog; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialog; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; -public interface InsertImageDialog extends AbstractTabbedDialog { +public interface InsertImageDialog extends OldAbstractTabbedDialog { void fireOnInsertImage(ImageInfo imageInfo); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertimg; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogPanel; import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -29,7 +29,7 @@ import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.event.ButtonListenerAdapter; -public class InsertImageDialogPanel extends AbstractTabbedDialogPanel implements InsertImageDialogView { +public class InsertImageDialogPanel extends OldAbstractTabbedDialogPanel implements InsertImageDialogView { private static final String INSERT_IMG_DIALOG = "k-iip-dial"; private static final String INSERT_IMG_DIALOG_ERROR_ID = "k-iip-err"; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,14 +19,14 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertimg; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogPresenter; import cc.kune.core.client.ui.utils.ContentPosition; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; -public class InsertImageDialogPresenter extends AbstractTabbedDialogPresenter implements InsertImageDialog { +public class InsertImageDialogPresenter extends OldAbstractTabbedDialogPresenter implements InsertImageDialog { private Listener<ImageInfo> onCreateListener; private ImageInfo imageInfo; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogView.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,9 +19,9 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertimg; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogView; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogView; -public interface InsertImageDialogView extends AbstractTabbedDialogView { +public interface InsertImageDialogView extends OldAbstractTabbedDialogView { int HEIGHT = 350; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialog.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialog.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,12 +19,12 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertlink; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialog; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialog; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; -public interface InsertLinkDialog extends AbstractTabbedDialog { +public interface InsertLinkDialog extends OldAbstractTabbedDialog { void fireOnInsertLink(LinkInfo linkInfo); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertlink; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogPanel; import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -29,7 +29,7 @@ import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.event.ButtonListenerAdapter; -public class InsertLinkDialogPanel extends AbstractTabbedDialogPanel implements InsertLinkDialogView { +public class InsertLinkDialogPanel extends OldAbstractTabbedDialogPanel implements InsertLinkDialogView { public static final String TEXT_EDT_INSERT_DIALOG = "k-ted-iep-dialog"; public static final String TEXT_EDT_INSERT_DIALOG_ERROR_ID = "k-ted-iep-dialog-err"; private final InsertLinkGroup textEditorInsertElementGroup; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPresenter.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,12 +19,12 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertlink; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogPresenter; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; -public class InsertLinkDialogPresenter extends AbstractTabbedDialogPresenter implements InsertLinkDialog { +public class InsertLinkDialogPresenter extends OldAbstractTabbedDialogPresenter implements InsertLinkDialog { private Listener<LinkInfo> onCreateListener; private LinkInfo linkInfo; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogView.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -20,9 +20,9 @@ package org.ourproject.kune.platf.client.ui.rte.insertlink; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogView; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogView; -public interface InsertLinkDialogView extends AbstractTabbedDialogView, View { +public interface InsertLinkDialogView extends OldAbstractTabbedDialogView, View { int HEIGHT = 350; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialog.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialog.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,12 +19,12 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertmedia; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialog; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialog; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; -public interface InsertMediaDialog extends AbstractTabbedDialog { +public interface InsertMediaDialog extends OldAbstractTabbedDialog { void fireOnInsertMedia(String html); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertmedia; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogPanel; import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -29,7 +29,7 @@ import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.event.ButtonListenerAdapter; -public class InsertMediaDialogPanel extends AbstractTabbedDialogPanel implements InsertMediaDialogView { +public class InsertMediaDialogPanel extends OldAbstractTabbedDialogPanel implements InsertMediaDialogView { private static final String INSERT_MEDIA_DIALOG = "k-imdp-dialog"; private static final String INSERT_MEDIA_DIALOG_ERROR_ID = "k-imdp-dialog-err"; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPresenter.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,12 +19,12 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertmedia; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogPresenter; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; -public class InsertMediaDialogPresenter extends AbstractTabbedDialogPresenter implements InsertMediaDialog { +public class InsertMediaDialogPresenter extends OldAbstractTabbedDialogPresenter implements InsertMediaDialog { private Listener0 onInsertPressed; Listener<String> onCreateListener; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialog.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialog.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,11 +19,11 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertspecialchar; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialog; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialog; import com.calclab.suco.client.events.Listener; -public interface InsertSpecialCharDialog extends AbstractTabbedDialog { +public interface InsertSpecialCharDialog extends OldAbstractTabbedDialog { String DEF_LABEL = "Click on a character below to insert it into the document."; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertspecialchar; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogPanel; import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; import cc.kune.common.client.notify.NotifyLevelImages; @@ -29,7 +29,7 @@ import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.event.ButtonListenerAdapter; -public class InsertSpecialCharDialogPanel extends AbstractTabbedDialogPanel implements InsertSpecialCharDialogView { +public class InsertSpecialCharDialogPanel extends OldAbstractTabbedDialogPanel implements InsertSpecialCharDialogView { private static final String INSERT_SPECIAL_CHAR_DIALOG = "iscdp-dial"; private static final String INSERT_SPECIAL_CHAR_DIALOG_ERROR_ID = "iscdp-err"; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPresenter.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,11 +19,11 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertspecialchar; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogPresenter; import com.calclab.suco.client.events.Listener; -public class InsertSpecialCharDialogPresenter extends AbstractTabbedDialogPresenter implements InsertSpecialCharDialog { +public class InsertSpecialCharDialogPresenter extends OldAbstractTabbedDialogPresenter implements InsertSpecialCharDialog { private Listener<String> onInsertSpecialChar; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogView.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -19,9 +19,9 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertspecialchar; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogView; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.OldAbstractTabbedDialogView; -public interface InsertSpecialCharDialogView extends AbstractTabbedDialogView { +public interface InsertSpecialCharDialogView extends OldAbstractTabbedDialogView { int HEIGHT = 315; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -31,7 +31,6 @@ import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; @@ -43,6 +42,7 @@ import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.gspace.client.style.GSpaceBackManager; import com.calclab.suco.client.ioc.Provider; @@ -55,7 +55,7 @@ final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, final WikiViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final WsBackManager wsBackManager) { + final GSpaceBackManager wsBackManager) { super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/OldAbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/OldAbstractFoldableContentActions.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/OldAbstractFoldableContentActions.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -37,7 +37,6 @@ import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; @@ -61,6 +60,7 @@ import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; +import cc.kune.gspace.client.style.GSpaceBackManager; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; @@ -99,7 +99,7 @@ protected final StateManager stateManager; protected final Provider<ContentEditor> textEditorProvider; - private final WsBackManager wsBackManager; + private final GSpaceBackManager wsBackManager; public OldAbstractFoldableContentActions(final Session session, final StateManager stateManager, final I18nUITranslationService i18n, final ErrorHandler errorHandler, @@ -109,7 +109,7 @@ final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, final Provider<FileDownloadUtils> fileDownloadProvider, final Provider<ContentEditor> textEditorProvider, final Provider<ContextPropEditor> contextPropEditorProvider, final FoldableContent foldableContent, - final EntityHeader entityLogo, final WsBackManager wsBackManager) { + final EntityHeader entityLogo, final GSpaceBackManager wsBackManager) { this.session = session; this.stateManager = stateManager; this.i18n = i18n; Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptions.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptions.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -1,43 +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 org.ourproject.kune.workspace.client.options; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialog; - -import cc.kune.common.client.notify.NotifyLevel; - -public interface EntityOptions extends AbstractTabbedDialog { - - @Override - public void addTab(View tab); - - public View getView(); - - @Override - public void hideMessages(); - - @Override - public void setErrorMessage(String message, NotifyLevel level); - - @Override - public void show(); - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -1,28 +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 org.ourproject.kune.workspace.client.options; - -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogView; - -public interface EntityOptionsView extends AbstractTabbedDialogView { - - int HEIGHT = 270; - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptions.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptions.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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 org.ourproject.kune.workspace.client.options; - -public interface GroupOptions extends EntityOptions { -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -1,63 +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 org.ourproject.kune.workspace.client.options; - -import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; -import org.ourproject.kune.platf.client.app.GroupOptionsCollection; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; - -import cc.kune.common.client.notify.NotifyLevelImages; -import cc.kune.core.client.resources.CoreMessages; -import cc.kune.core.shared.i18n.I18nTranslationService; - -public class GroupOptionsPanel extends AbstractTabbedDialogPanel implements GroupOptionsView { - - public static final String GROUP_OP_PANEL_ID = "k-gop-diagpan"; - public static final String GROUP_OPTIONS_ERROR_ID = "k-gop-err-mess"; - private final EntityHeader entityHeader; - - private final GroupOptionsCollection entityPreferencesGroup; - - public GroupOptionsPanel(final EntityOptions presenter, final EntityHeader entityHeader, - final I18nTranslationService i18n, final NotifyLevelImages images, - final GroupOptionsCollection entityOptionsGroup) { - super(GROUP_OP_PANEL_ID, "", 400, HEIGHT + 80, 400, HEIGHT + 80, false, images, GROUP_OPTIONS_ERROR_ID); - this.entityHeader = entityHeader; - this.entityPreferencesGroup = entityOptionsGroup; - super.setIconCls("k-options-icon"); - super.setTitle(i18n.t(CoreMessages.GROUP_OPTIONS_DIALOG_TITLE)); - } - - @Override - public void addAction(final OldGuiActionDescrip descriptor) { - entityHeader.addAction(descriptor); - } - - @Override - public void createAndShow() { - createAndShowItImpl(); - } - - private void createAndShowItImpl() { - entityPreferencesGroup.createAll(); - super.createAndShow(); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -1,78 +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 org.ourproject.kune.workspace.client.options; - -import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; -import org.ourproject.kune.platf.client.actions.Action; -import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; - -import cc.kune.core.client.resources.icons.IconConstants; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener; - -public class GroupOptionsPresenter extends AbstractTabbedDialogPresenter implements GroupOptions { - public static final String GROUP_OPTIONS_ICON = "k-eop-icon"; - private GroupOptionsView view; - private final I18nTranslationService i18n; - private final IconResources img; - private ButtonDescriptor prefsItem; - - public GroupOptionsPresenter(final StateManager stateManager, final I18nTranslationService i18n, - final IconResources img) { - this.i18n = i18n; - this.img = img; - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - public void onEvent(final StateAbstractDTO state) { - if (!state.getGroup().isPersonal() && state.getGroupRights().isAdministrable()) { - prefsItem.setVisible(true); - } else { - view.hide(); - prefsItem.setVisible(false); - } - } - }); - } - - public void init(final GroupOptionsView view) { - super.init(view); - this.view = view; - createActions(); - } - - private void createActions() { - final AbstractExtendedAction groupPrefsAction = new AbstractExtendedAction() { - public void actionPerformed(final ActionEvent event) { - show(); - } - }; - groupPrefsAction.putValue(Action.NAME, i18n.t("Group options")); - groupPrefsAction.putValue(Action.SMALL_ICON, IconConstants.toPath(img.prefs())); - prefsItem = new ButtonDescriptor(groupPrefsAction); - prefsItem.setId(GROUP_OPTIONS_ICON); - prefsItem.setVisible(false); - view.addAction(prefsItem); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsView.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -1,28 +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 org.ourproject.kune.workspace.client.options; - -import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; - -public interface GroupOptionsView extends EntityOptionsView { - - void addAction(OldGuiActionDescrip descriptor); - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptions.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptions.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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 org.ourproject.kune.workspace.client.options; - -public interface UserOptions extends EntityOptions { -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -1,55 +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 org.ourproject.kune.workspace.client.options; - -import org.ourproject.kune.platf.client.app.UserOptionsCollection; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; - -import cc.kune.common.client.notify.NotifyLevelImages; -import cc.kune.core.client.resources.CoreMessages; -import cc.kune.core.shared.i18n.I18nTranslationService; - -public class UserOptionsPanel extends AbstractTabbedDialogPanel implements UserOptionsView { - - public static final String USER_OP_PANEL_ID = "k-uop-diagpan"; - public static final String USER_OPTIONS_ERROR_ID = "k-uop-err-mess"; - - private final UserOptionsCollection userPreferencesGroup; - - public UserOptionsPanel(final EntityOptions presenter, final EntityHeader entityHeader, - final I18nTranslationService i18n, final NotifyLevelImages images, - final UserOptionsCollection userOptionsGroup) { - super(USER_OP_PANEL_ID, "", 400, HEIGHT + 80, 400, HEIGHT + 80, false, images, USER_OPTIONS_ERROR_ID); - this.userPreferencesGroup = userOptionsGroup; - super.setIconCls("k-options-icon"); - super.setTitle(i18n.t(CoreMessages.USER_OPTIONS_DIALOG_TITLE)); - } - - @Override - public void createAndShow() { - createAndShowItImpl(); - } - - private void createAndShowItImpl() { - userPreferencesGroup.createAll(); - super.createAndShow(); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -1,85 +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 org.ourproject.kune.workspace.client.options; - -import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; -import org.ourproject.kune.platf.client.actions.Action; -import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; - -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener0; - -public class UserOptionsPresenter extends AbstractTabbedDialogPresenter implements UserOptions { - - private final I18nTranslationService i18n; - private final IconResources img; - private final Session session; - private final StateManager stateManager; - // private final SiteUserOptions userOptions; - private UserOptionsView view; - - public UserOptionsPresenter(final Session session, final StateManager stateManager, - final I18nTranslationService i18n, final IconResources img) {// , - // final - // SiteUserOptions - // userOptions) - // { - this.session = session; - this.stateManager = stateManager; - this.i18n = i18n; - this.img = img; - // this.userOptions = userOptions; - session.onUserSignOut(new Listener0() { - @Override - public void onEvent() { - view.hide(); - } - }); - } - - private void createActions() { - final AbstractExtendedAction userPrefsAction = new AbstractExtendedAction() { - @Override - public void actionPerformed(final ActionEvent event) { - if (!session.isInCurrentUserSpace()) { - stateManager.gotoStateToken(session.getCurrentUser().getStateToken()); - } - show(); - } - }; - userPrefsAction.putValue(Action.NAME, i18n.t("Your preferences")); - userPrefsAction.putValue(Action.SMALL_ICON, img.prefs()); - final OldMenuItemDescriptor prefsItem = new OldMenuItemDescriptor(userPrefsAction); - prefsItem.setPosition(1); - // userOptions.addAction(prefsItem); - } - - public void init(final UserOptionsView view) { - super.init(view); - this.view = view; - createActions(); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsView.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsView.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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 org.ourproject.kune.workspace.client.options; - -public interface UserOptionsView extends EntityOptionsView { - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -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 org.ourproject.kune.workspace.client.themes; - - -import cc.kune.core.shared.domain.utils.StateToken; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; - -public interface WsBackManager { - - void addBackClear(Listener0 listener); - - void addSetBackImage(Listener<StateToken> listener); - - void clearBackImage(); - - void setBackImage(StateToken token); - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -1,76 +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 org.ourproject.kune.workspace.client.themes; - -import org.cobogw.gwt.user.client.CSS; - -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.shared.domain.utils.StateToken; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.ui.RootPanel; - -public class WsBackManagerImpl implements WsBackManager { - - private static final StateToken NO_TOKEN = new StateToken("none.none.0.0"); - private final FileDownloadUtils downloadUtils; - private StateToken lastToken; - - // private final Event0 onBackClear; - // private final Event<StateToken> onSetBackImage; - - public WsBackManagerImpl(final FileDownloadUtils downloadUtils) { - this.downloadUtils = downloadUtils; - lastToken = NO_TOKEN; - // this.onBackClear = new Event0("onBackClear"); - // this.onSetBackImage = new Event<StateToken>("onSetBackImage"); - } - - @Override - public void addBackClear(final Listener0 listener) { - // onBackClear.add(listener); - } - - @Override - public void addSetBackImage(final Listener<StateToken> listener) { - // onSetBackImage.add(listener); - } - - @Override - public void clearBackImage() { - // onBackClear.fire(); - if (!lastToken.equals(NO_TOKEN)) { - DOM.setStyleAttribute(RootPanel.getBodyElement(), CSS.A.BACKGROUND, "transparent"); - lastToken = NO_TOKEN; - } - } - - @Override - public void setBackImage(final StateToken token) { - // onSetBackImage.fire(token); - if (!token.equals(lastToken)) { - final String bodyProp = "#FFFFFF url('" + downloadUtils.getImageUrl(token) + "') fixed no-repeat top left"; - DOM.setStyleAttribute(RootPanel.getBodyElement(), CSS.A.BACKGROUND, bodyProp); - lastToken = token; - } - } -} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java 2011-04-27 20:48:48 UTC (rev 1323) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java 2011-04-28 00:56:31 UTC (rev 1324) @@ -29,6 +29,7 @@ import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.InitDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.gspace.client.style.GSpaceBackManager; import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; @@ -40,10 +41,10 @@ private final Provider<GroupServiceAsync> groupServiceProvider; private WsTheme previousTheme; private final Session session; - private final WsBackManager wsBackManager; + private final GSpaceBackManager wsBackManager; public WsThemeManager(final Session session, final Provider<GroupServiceAsync> groupServiceProvider, - final StateManager stateManager, final WsBackManager wsBackManager) { + final StateManager stateManager, final GSpaceBackManager wsBackManager) { this.session = session; this.groupServiceProvider = groupServiceProvider; this.wsBackManager = wsBackManager;

1 0

r1323 - trunk/src/main/resources/db
by Vicente J. Ruiz Jurado 27 Apr '11

27 Apr '11

Author: vjrj_ Date: 2011-04-27 22:48:48 +0200 (Wed, 27 Apr 2011) New Revision: 1323 Added: trunk/src/main/resources/db/update-0015-waveid.sql Log: Wave typeid removed Added: trunk/src/main/resources/db/update-0015-waveid.sql =================================================================== --- trunk/src/main/resources/db/update-0015-waveid.sql (rev 0) +++ trunk/src/main/resources/db/update-0015-waveid.sql 2011-04-27 20:48:48 UTC (rev 1323) @@ -0,0 +1 @@ +UPDATE `contents` SET typeId='docs.doc' WHERE typeId='docs.wave'; \ No newline at end of file

1 0

27 Apr '11

Author: vjrj_ Date: 2011-04-27 17:32:01 +0200 (Wed, 27 Apr 2011) New Revision: 1322 Added: trunk/.codepro/ trunk/.codepro/deadCodeEntryPoints.xml trunk/src/main/java/cc/kune/blogs/shared/ trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java trunk/src/main/java/cc/kune/core/KuneCore.gwt.xml trunk/src/main/java/cc/kune/core/shared/ToolConstants.java trunk/src/main/java/cc/kune/docs/shared/ trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java Removed: trunk/src/main/java/cc/kune/core/Core.gwt.xml Modified: trunk/.project trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/blogs/KuneBlogs.gwt.xml trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java trunk/src/main/java/cc/kune/blogs/client/actions/NewPostBtn.java trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java trunk/src/main/java/cc/kune/chat/client/resources/ChatResources.java trunk/src/main/java/cc/kune/common/client/utils/Pair.java trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNActionsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNMembersActionsRegistry.java trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java trunk/src/main/java/cc/kune/core/client/ui/utils/ContentPosition.java trunk/src/main/java/cc/kune/core/server/content/ContentManager.java trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java trunk/src/main/java/cc/kune/core/server/manager/impl/ContentConstants.java trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java trunk/src/main/java/cc/kune/core/server/tool/ServerTool.java trunk/src/main/java/cc/kune/docs/KuneDocs.gwt.xml trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java trunk/src/main/java/cc/kune/docs/client/actions/NewDocBtn.java trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java trunk/src/main/java/cc/kune/gspace/client/actions/ActionGroups.java trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPresenter.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java trunk/src/main/java/cc/kune/wave/client/WebClient.java trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java trunk/src/main/java/cc/kune/wave/server/KuneWaveManager.java trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java trunk/src/main/resources/db/liquibase_changelog.xml trunk/src/test/java/cc/kune/blogs/server/BlogServerToolTest.java trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java trunk/src/test/java/cc/kune/core/server/manager/ContentManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/GroupManagerTest.java trunk/src/test/java/cc/kune/docs/DocumentToolTest.java trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java trunk/src/test/java/cc/kune/wave/server/KuneWaveManagerDefaultTest.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java Log: More blogs/docs and WIAB integration work Added: trunk/.codepro/deadCodeEntryPoints.xml =================================================================== --- trunk/.codepro/deadCodeEntryPoints.xml (rev 0) +++ trunk/.codepro/deadCodeEntryPoints.xml 2011-04-27 15:32:01 UTC (rev 1322) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entry-points + version="1"> + <explicit-entry-points> + <explicit-entry-point + handle="=kune/src\/main\/java<cc.kune.client{KuneEntryPoint.java[KuneEntryPoint~onModuleLoad"/> + </explicit-entry-points> + <include-main + enabled="true"/> + <include-tests + enabled="false"/> + <include-xml + enabled="true"/> +</entry-points> \ No newline at end of file Property changes on: trunk/.codepro/deadCodeEntryPoints.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/.project =================================================================== --- trunk/.project 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/.project 2011-04-27 15:32:01 UTC (rev 1322) @@ -1,38 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>kune</name> - <comment>kune free/open/libre collaboration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects/> - <buildSpec> - <buildCommand> - <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> - </buildCommand> - <buildCommand> - <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.common.project.facet.core.builder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - </buildCommand> - <buildCommand> - <name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name> - </buildCommand> - <buildCommand> - <name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - <nature>org.eclipse.ajdt.ui.ajnature</nature> - <nature>com.google.gwt.eclipse.core.gwtNature</nature> - <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature> - <nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature> - </natures> -</projectDescription> \ No newline at end of file + <name>kune</name> + <comment>kune free/open/libre collaboration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.ajdt.ui.ajnature</nature> + <nature>com.google.gwt.eclipse.core.gwtNature</nature> + <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature> + <nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature> + <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> + </natures> +</projectDescription> Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-04-27 15:32:01 UTC (rev 1322) @@ -3,7 +3,7 @@ <module rename-to="ws"> <inherits name="com.google.gwt.user.User" /> <inherits name='com.google.gwt.logging.Logging' /> - <inherits name="cc.kune.core.Core" /> + <inherits name="cc.kune.core.KuneCore" /> <inherits name="cc.kune.wave.KuneWave" /> <inherits name="cc.kune.chat.KuneChat" /> <inherits name="cc.kune.docs.KuneDocs" /> Modified: trunk/src/main/java/cc/kune/blogs/KuneBlogs.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/blogs/KuneBlogs.gwt.xml 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/blogs/KuneBlogs.gwt.xml 2011-04-27 15:32:01 UTC (rev 1322) @@ -1,5 +1,6 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module> - <inherits name="cc.kune.core.Core" /> - <source path="client" /> + <inherits name="cc.kune.core.KuneCore" /> + <source path="client" /> + <source path="shared" /> </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,6 +19,11 @@ */ package cc.kune.blogs.client; +import static cc.kune.blogs.shared.BlogsConstants.NAME; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_BLOG; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_ROOT; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_UPLOADEDFILE; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.nav.NavResources; @@ -29,11 +34,6 @@ public class BlogsClientTool extends FoldableAbstractClientTool { - public static final String NAME = "blogs"; - public static final String TYPE_BLOG = NAME + "." + "blog"; - public static final String TYPE_POST = NAME + "." + "post"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + FoldableAbstractClientTool.UPLOADEDFILE_SUFFIX; private final NavResources navResources; @Inject Modified: trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,10 +19,10 @@ \*/ package cc.kune.blogs.client.actions; -import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_BLOG; -import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_POST; -import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_ROOT; -import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_UPLOADEDFILE; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_BLOG; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_ROOT; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_UPLOADEDFILE; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.resources.CoreResources; Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -1,6 +1,6 @@ package cc.kune.blogs.client.actions; -import cc.kune.blogs.client.BlogsClientTool; +import cc.kune.blogs.shared.BlogsConstants; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.actions.NewContainerBtn; @@ -12,7 +12,7 @@ @Inject public NewBlogBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res) { super(i18n, action, res, i18n.t("New blog"), i18n.t("Create a new blog"), i18n.t("New blog"), - BlogsClientTool.TYPE_BLOG); + BlogsConstants.TYPE_BLOG); } } Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewPostBtn.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/NewPostBtn.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/blogs/client/actions/NewPostBtn.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -1,6 +1,6 @@ package cc.kune.blogs.client.actions; -import cc.kune.blogs.client.BlogsClientTool; +import cc.kune.blogs.shared.BlogsConstants; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -14,7 +14,7 @@ public NewPostBtn(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg) { super(i18n, action, res, shorcutReg, i18n.t("New post"), i18n.t("Create a new blog post"), i18n.t("New post"), - BlogsClientTool.TYPE_POST); + BlogsConstants.TYPE_POST); } } Modified: trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,7 +19,11 @@ */ package cc.kune.blogs.server; - +import static cc.kune.blogs.shared.BlogsConstants.NAME; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_BLOG; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_ROOT; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_UPLOADEDFILE; import cc.kune.core.client.errors.ContainerNotPermittedException; import cc.kune.core.client.errors.ContentNotPermittedException; import cc.kune.core.server.content.ContainerManager; @@ -40,17 +44,12 @@ import com.google.inject.Inject; public class BlogServerTool implements ServerTool { - public static final String NAME = "blogs"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_BLOG = NAME + "." + "blog"; - public static final String TYPE_POST = NAME + "." + "post"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + ServerTool.UPLOADEDFILE_SUFFIX; public static final String ROOT_NAME = "blogs"; - private final ContentManager contentManager; private final ToolConfigurationManager configurationManager; private final ContainerManager containerManager; + private final ContentManager contentManager; private final I18nTranslationService i18n; @Inject @@ -62,85 +61,94 @@ this.i18n = translationService; } - public void checkTypesBeforeContainerCreation(String parentTypeId, String typeId) { + void checkContainerTypeId(final String parentTypeId, final String typeId) { + if (typeId.equals(TYPE_BLOG)) { + // ok valid container + if ((typeId.equals(TYPE_BLOG) && parentTypeId.equals(TYPE_ROOT))) { + // ok + } else { + throw new ContainerNotPermittedException(); + } + } else { + throw new ContainerNotPermittedException(); + } + } + + void checkContentTypeId(final String parentTypeId, final String typeId) { + if (typeId.equals(TYPE_UPLOADEDFILE) || typeId.equals(TYPE_POST)) { + // ok valid content + if ((typeId.equals(TYPE_UPLOADEDFILE) && parentTypeId.equals(TYPE_BLOG)) + || (typeId.equals(TYPE_POST) && parentTypeId.equals(TYPE_BLOG))) { + // ok + } else { + throw new ContentNotPermittedException(); + } + + } else { + throw new ContentNotPermittedException(); + } + } + + @Override + public void checkTypesBeforeContainerCreation(final String parentTypeId, final String typeId) { checkContainerTypeId(parentTypeId, typeId); } - public void checkTypesBeforeContentCreation(String parentTypeId, String typeId) { + @Override + public void checkTypesBeforeContentCreation(final String parentTypeId, final String typeId) { checkContentTypeId(parentTypeId, typeId); } + @Override public String getName() { return NAME; } + @Override public String getRootName() { return ROOT_NAME; } + @Override public ServerToolTarget getTarget() { return ServerToolTarget.forBoth; } - public Group initGroup(final User user, final Group group) { + @Override + public Group initGroup(final User user, final Group group, final Object... otherVars) { final ToolConfiguration config = new ToolConfiguration(); final Container rootFolder = containerManager.createRootFolder(group, NAME, ROOT_NAME, TYPE_ROOT); config.setRoot(rootFolder); group.setToolConfig(NAME, config); configurationManager.persist(config); - I18nLanguage language = user.getLanguage(); + final I18nLanguage language = user.getLanguage(); final Container blog = containerManager.createFolder(group, rootFolder, i18n.t("Blog sample"), language, TYPE_BLOG); - final Content content = contentManager.createContent(i18n.t("A post sample"), "", user, blog, - BlogServerTool.TYPE_POST); + final Content content = contentManager.createContent(i18n.t("A post sample"), + i18n.t("This is only a post sample. You can edit it, rename the post and this blog"), user, blog, + TYPE_POST); content.addAuthor(user); content.setLanguage(language); content.setTypeId(TYPE_POST); content.setStatus(ContentStatus.publishedOnline); - contentManager.save(user, content, - i18n.t("This is only a post sample. You can edit it, rename the post and this blog")); + contentManager.save(user, content); return group; } + @Override public void onCreateContainer(final Container container, final Container parent) { } + @Override public void onCreateContent(final Content content, final Container parent) { } + @Override @Inject public void register(final ServerToolRegistry registry) { registry.register(this); } - - void checkContainerTypeId(final String parentTypeId, final String typeId) { - if (typeId.equals(TYPE_BLOG)) { - // ok valid container - if ((typeId.equals(TYPE_BLOG) && parentTypeId.equals(TYPE_ROOT))) { - // ok - } else { - throw new ContainerNotPermittedException(); - } - } else { - throw new ContainerNotPermittedException(); - } - } - - void checkContentTypeId(final String parentTypeId, final String typeId) { - if (typeId.equals(TYPE_UPLOADEDFILE) || typeId.equals(TYPE_POST)) { - // ok valid content - if ((typeId.equals(TYPE_UPLOADEDFILE) && parentTypeId.equals(TYPE_BLOG)) - || (typeId.equals(TYPE_POST) && parentTypeId.equals(TYPE_BLOG))) { - // ok - } else { - throw new ContentNotPermittedException(); - } - - } else { - throw new ContentNotPermittedException(); - } - } } Added: trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -0,0 +1,15 @@ +package cc.kune.blogs.shared; + +import cc.kune.core.shared.ToolConstants; + +public final class BlogsConstants { + + public static final String NAME = "blogs"; + public static final String TYPE_BLOG = NAME + "." + "blog"; + public static final String TYPE_POST = NAME + "." + "post"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + + private BlogsConstants() { + } +} Property changes on: trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -54,7 +54,7 @@ putValue(Action.NAME, i18n.t("Group's public room")); putValue(Action.SHORT_DESCRIPTION, i18n.t("Enter to this group public chat room")); putValue(Action.SMALL_ICON, res.groupChat()); - setInviteMembers(false); + setInviteMembersImpl(false); } @Override @@ -103,6 +103,10 @@ } public void setInviteMembers(final boolean inviteMembers) { + setInviteMembersImpl(inviteMembers); + } + + private void setInviteMembersImpl(final boolean inviteMembers) { this.inviteMembers = inviteMembers; } Modified: trunk/src/main/java/cc/kune/chat/client/resources/ChatResources.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/resources/ChatResources.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/chat/client/resources/ChatResources.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -87,7 +87,7 @@ ImageResource unavailable(); @Source("user_add.png") - ImageResource user_add(); + ImageResource userAdd(); @Source("xa.png") ImageResource xa(); Modified: trunk/src/main/java/cc/kune/common/client/utils/Pair.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/Pair.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/common/client/utils/Pair.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,7 +19,7 @@ * @param <L> * @param <R> */ -public class Pair<L, R> { +public final class Pair<L, R> { public static <L, R> Pair<L, R> create(final L l, final R r) { return new Pair<L, R>(l, r); } Deleted: trunk/src/main/java/cc/kune/core/Core.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/core/Core.gwt.xml 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2011-04-27 15:32:01 UTC (rev 1322) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> -<module rename-to="ws"> -  -  - <source path='client' - excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> - <source path="shared" /> - <public path="public" /> -  - <inherits name="com.google.gwt.user.User" /> - <inherits name="cc.kune.gspace.GSpace" /> - <inherits name="cc.kune.msgs.KuneMsgs" /> - <inherits name="cc.kune.common.KuneCommon" /> - <inherits name="com.extjs.gxt.ui.GXT" /> - - <inherits name="com.calclab.suco.Suco" /> - <inherits name='com.gwtplatform.mvp.Mvp' /> -  -  -</module> \ No newline at end of file Copied: trunk/src/main/java/cc/kune/core/KuneCore.gwt.xml (from rev 1320, trunk/src/main/java/cc/kune/core/Core.gwt.xml) =================================================================== --- trunk/src/main/java/cc/kune/core/KuneCore.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/core/KuneCore.gwt.xml 2011-04-27 15:32:01 UTC (rev 1322) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> +<module rename-to="ws"> +  +  + <source path='client' + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> + <source path="shared" /> + <public path="public" /> +  + <inherits name="com.google.gwt.user.User" /> + <inherits name="cc.kune.gspace.GSpace" /> + <inherits name="cc.kune.msgs.KuneMsgs" /> + <inherits name="cc.kune.common.KuneCommon" /> + <inherits name="com.extjs.gxt.ui.GXT" /> + + <inherits name="com.calclab.suco.Suco" /> + <inherits name='com.gwtplatform.mvp.Mvp' /> +  +  +</module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -89,7 +89,8 @@ } @Override - public void setEditableWaveContent(final WaveRef waveRef, final boolean isNewWave) { + public void setEditableWaveContent(final WaveRef waveRef, final boolean isNewWave) { // NOPMD by vjrj on 27/04/11 8:40 + // FIXME } // public void setWave(final String waveId, final Listener0 onLoaded) { Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -31,13 +31,12 @@ interface AbstractSNPanelUiBinder extends UiBinder<Widget, AbstractSNPanel> { } - private static final String CATEG_HEIGHT = "80px"; - + private final static int AVATARLABELMAXSIZE = 4; + private final static int AVATARSIZE = 22; + private final static String CATEG_HEIGHT = "80px"; private static AbstractSNPanelUiBinder uiBinder = GWT.create(AbstractSNPanelUiBinder.class); - protected final ActionSimplePanel actions; - int AVATARLABELMAXSIZE = 4; - int AVATARSIZE = 22; + protected final ActionSimplePanel actions; ActionFlowPanel bottomActionsToolbar; @UiField FlowPanel bottomPanel; Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -17,7 +17,7 @@ @Inject public GroupSNPanel(final I18nTranslationService i18n, final GuiProvider guiProvider, final GSpaceArmor armor) { super(i18n, guiProvider, armor); - setVisible(false); + setVisibleImpl(false); mainTitle.setText(i18n.t("Group members")); Tooltip.to(mainTitle, i18n.t("People and groups collaborating in this group")); firstCategoryLabel.setText(i18n.t("Admins")); @@ -83,6 +83,10 @@ @Override public void setVisible(final boolean visible) { + setVisibleImpl(visible); + } + + private void setVisibleImpl(final boolean visible) { mainPanel.setVisible(visible); } Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -18,7 +18,7 @@ @Inject public UserSNPanel(final I18nTranslationService i18n, final GuiProvider guiProvider, final GSpaceArmor armor) { super(i18n, guiProvider, armor); - setVisible(false); + setVisibleImpl(false); mainTitle.setText(i18n.t("His/her network:")); mainTitle.setTitle(i18n.t("This user buddies and groups where participes")); firstCategoryLabel.setText(i18n.t("Buddies")); @@ -76,6 +76,10 @@ @Override public void setVisible(final boolean visible) { + setVisibleImpl(visible); + } + + private void setVisibleImpl(final boolean visible) { mainPanel.setVisible(visible); } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNActionsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNActionsRegistry.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNActionsRegistry.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -4,4 +4,8 @@ @SuppressWarnings("serial") public abstract class AbstractSNActionsRegistry extends GuiActionDescCollection { + + public AbstractSNActionsRegistry() { + super(); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNMembersActionsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNMembersActionsRegistry.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNMembersActionsRegistry.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -8,4 +8,8 @@ @SuppressWarnings("serial") public abstract class AbstractSNMembersActionsRegistry extends ArrayList<Provider<MenuItemDescriptor>> { + + public AbstractSNMembersActionsRegistry() { + super(); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -42,7 +42,8 @@ this.server = server; this.eventBus = eventBus; this.cacheMap = new HashMap<StateToken, StateAbstractDTO>(); - useCache = true; + // Don't use while we don't check changes in the server + useCache = false; } @Override Modified: trunk/src/main/java/cc/kune/core/client/ui/utils/ContentPosition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/utils/ContentPosition.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/client/ui/utils/ContentPosition.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -35,11 +35,11 @@ public static final String RIGHT = "right"; private static I18nTranslationService i18n; private static Object[][] positionObjs; - public static final String[][] positions = { new String[] { LEFT }, new String[] { CENTER }, new String[] { RIGHT } }; + public static final String[][] POSITIONS = { new String[] { LEFT }, new String[] { CENTER }, new String[] { RIGHT } }; public synchronized static Object[][] getPositions() { if (positionObjs == null) { - final String[][] values = positions; + final String[][] values = POSITIONS; positionObjs = new Object[values.length][1]; int i = 0; for (final String[] position : values) { Modified: trunk/src/main/java/cc/kune/core/server/content/ContentManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContentManager.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/server/content/ContentManager.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -21,7 +21,6 @@ import java.util.Date; - import cc.kune.core.client.errors.DefaultException; import cc.kune.core.server.manager.Manager; import cc.kune.core.server.manager.impl.SearchResult; @@ -62,6 +61,8 @@ Content renameContent(User user, Long contentId, String newName) throws DefaultException; + Content save(User user, Content content); + Content save(User editor, Content content, String body); SearchResult<Content> search(String search); Modified: trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -28,7 +28,10 @@ import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; +import org.waveprotocol.wave.model.waveref.WaveRef; +import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; +import cc.kune.blogs.shared.BlogsConstants; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.I18nNotFoundException; import cc.kune.core.client.errors.NameInUseException; @@ -42,6 +45,7 @@ import cc.kune.core.server.utils.FilenameUtils; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.RateResult; +import cc.kune.docs.shared.DocsConstants; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.I18nLanguage; @@ -52,6 +56,8 @@ import cc.kune.domain.finders.ContentFinder; import cc.kune.domain.finders.I18nLanguageFinder; import cc.kune.domain.finders.UserFinder; +import cc.kune.wave.server.KuneWaveManager; +import cc.kune.wave.server.ParticipantUtils; import com.google.inject.Inject; import com.google.inject.Provider; @@ -63,14 +69,17 @@ private final ContainerFinder containerFinder; private final ContentFinder contentFinder; private final FinderService finder; + private final KuneWaveManager kuneWaveManager; private final I18nLanguageFinder languageFinder; + private final ParticipantUtils participantUtils; private final TagUserContentManager tagManager; private final UserFinder userFinder; @Inject public ContentManagerDefault(final ContentFinder contentFinder, final ContainerFinder containerFinder, final Provider<EntityManager> provider, final FinderService finder, final UserFinder userFinder, - final I18nLanguageFinder languageFinder, final TagUserContentManager tagManager) { + final I18nLanguageFinder languageFinder, final TagUserContentManager tagManager, + final KuneWaveManager kuneWaveManager, final ParticipantUtils participantUtils) { super(provider, Content.class); this.contentFinder = contentFinder; this.containerFinder = containerFinder; @@ -78,6 +87,8 @@ this.userFinder = userFinder; this.languageFinder = languageFinder; this.tagManager = tagManager; + this.kuneWaveManager = kuneWaveManager; + this.participantUtils = participantUtils; } @Override @@ -93,6 +104,7 @@ @Override public Content createContent(final String title, final String body, final User author, final Container container, final String typeId) { + String contentBody; FilenameUtils.checkBasicFilename(title); final String newtitle = findInexistentTitle(container, title); final Content newContent = new Content(); @@ -103,7 +115,14 @@ newContent.setContainer(container); final Revision revision = new Revision(newContent); revision.setTitle(newtitle); - revision.setBody(body); + // Duplicate in StateServiceDefault + if ((typeId.equals(DocsConstants.TYPE_DOCUMENT)) || (typeId.equals(BlogsConstants.TYPE_POST))) { + final WaveRef waveRef = kuneWaveManager.createWave(title, body, participantUtils.of(author.getShortName())); + contentBody = JavaWaverefEncoder.encodeToUriPathSegment(waveRef); + } else { + contentBody = body; + } + revision.setBody(contentBody); newContent.addRevision(revision); return persist(newContent); } @@ -187,6 +206,11 @@ } @Override + public Content save(final User editor, final Content content) { + return persist(content); + } + + @Override public Content save(final User editor, final Content content, final String body) { final Revision revision = new Revision(content); revision.setEditor(editor); Modified: trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -5,8 +5,6 @@ import javax.persistence.NoResultException; import org.waveprotocol.box.server.authentication.PasswordDigest; -import org.waveprotocol.wave.model.waveref.WaveRef; -import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; import cc.kune.core.client.errors.UserMustBeLoggedException; import cc.kune.core.server.content.ContentManager; @@ -83,17 +81,15 @@ final License defaultLicense = licenseManager.findByShortName(defaultLicenseId); final Group siteGroup = new Group(siteShortName, siteName, defaultLicense, GroupType.PROJECT); - groupManager.createGroup(siteGroup, user); + groupManager.createGroup(siteGroup, user, ContentConstants.INITIAL_CONTENT.replaceAll("\\[%s\\]", siteName)); + final Content defaultContent = siteGroup.getDefaultContent(); + contentManager.setStatus(defaultContent.getId(), ContentStatus.publishedOnline); + contentManager.save(user, defaultContent); + userManager.reIndex(); groupManager.reIndex(); - final Content defaultContent = siteGroup.getDefaultContent(); - final WaveRef waveId = kuneWaveManager.createWave( - ContentConstants.INITIAL_CONTENT.replaceAll("\\[%s\\]", siteName), user.getShortName()); - contentManager.save(user, defaultContent, JavaWaverefEncoder.encodeToUriPathSegment(waveId)); - - contentManager.setStatus(defaultContent.getId(), ContentStatus.publishedOnline); } private void createLicenses() { Modified: trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -21,7 +21,6 @@ import java.util.List; - import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.EmailAddressInUseException; import cc.kune.core.client.errors.GroupNameInUseException; @@ -39,7 +38,8 @@ void clearGroupBackImage(Group group); - Group createGroup(Group group, User user) throws GroupNameInUseException, UserMustBeLoggedException; + Group createGroup(Group group, User user, String publicDescrip) throws GroupNameInUseException, + UserMustBeLoggedException; Group createUserGroup(User user) throws GroupNameInUseException, EmailAddressInUseException; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/ContentConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/ContentConstants.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/ContentConstants.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -1,6 +1,6 @@ package cc.kune.core.server.manager.impl; -public class ContentConstants { +public final class ContentConstants { public static final String INITIAL_CONTENT = "<span style=\"font-weight: bold;\">Welcome to [%s]</span><br/>" + " <br/>" + " This site is powered by <a target=\"_blank\"" @@ -167,6 +167,8 @@ + " the ones others shared with you. You can use the search box to" + " search through all your waves, using specific keywords.<br/>"; + public static final String WELCOME_WAVE_CONTENT_TITLE = "Welcome to [%s]"; + private ContentConstants() { } } Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -46,6 +46,7 @@ import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.dto.GroupType; +import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.AccessLists; import cc.kune.domain.Content; import cc.kune.domain.Group; @@ -65,6 +66,7 @@ public class GroupManagerDefault extends DefaultManager<Group, Long> implements GroupManager { private final GroupFinder finder; + private final I18nTranslationService i18n; private final KuneProperties kuneProperties; private final LicenseFinder licenseFinder; private final LicenseManager licenseManager; @@ -77,7 +79,7 @@ public GroupManagerDefault(final Provider<EntityManager> provider, final GroupFinder finder, final UserFinder userFinder, final KuneProperties kuneProperties, final DatabaseProperties properties, final ServerToolRegistry registry, final LicenseManager licenseManager, final LicenseFinder licenseFinder, - final ServerToolRegistry serverToolRegistry) { + final ServerToolRegistry serverToolRegistry, final I18nTranslationService i18n) { super(provider, Group.class); this.finder = finder; this.userFinder = userFinder; @@ -87,6 +89,7 @@ this.licenseManager = licenseManager; this.licenseFinder = licenseFinder; this.serverToolRegistry = serverToolRegistry; + this.i18n = i18n; } @Override @@ -110,8 +113,8 @@ } @Override - public Group createGroup(final Group group, final User user) throws GroupNameInUseException, - UserMustBeLoggedException { + public Group createGroup(final Group group, final User user, final String publicDescrip) + throws GroupNameInUseException, UserMustBeLoggedException { final String defaultSiteWorkspaceTheme = kuneProperties.get(KuneProperties.WS_THEMES_DEF); if (User.isKnownUser(user)) { if (group.getGroupType().equals(GroupType.COMMUNITY)) { @@ -128,7 +131,8 @@ group.setDefaultLicense(license); group.setWorkspaceTheme(defaultSiteWorkspaceTheme); initSocialNetwork(group, user.getUserGroup()); - initGroup(user, group, serverToolRegistry.getToolsForGroupsKeys()); + final String title = i18n.t("About [%s]", group.getLongName()); + initGroup(user, group, serverToolRegistry.getToolsForGroupsKeys(), title, publicDescrip); return group; } else { throw new UserMustBeLoggedException(); @@ -160,9 +164,12 @@ userGroup.setDefaultContent(null); user.setUserGroup(userGroup); initSocialNetwork(userGroup, userGroup); + + final String title = i18n.t("[%s] Bio", user.getName()); + final String body = "<h1>" + title + "</h1>" + i18n.t("This user has not written its biography yet"); try { initGroup(user, userGroup, wantPersonalHomepage ? serverToolRegistry.getToolsForUserKeys() - : ServerToolRegistry.emptyToolList); + : ServerToolRegistry.emptyToolList, title, body); super.persist(user, User.class); } catch (final PersistenceException e) { if (e.getCause() instanceof ConstraintViolationException) { @@ -204,8 +211,8 @@ return findByShortName(shortName); } - private void initGroup(final User user, final Group group, final Collection<String> toolsToEnable) - throws GroupNameInUseException { + private void initGroup(final User user, final Group group, final Collection<String> toolsToEnable, + final Object... vars) throws GroupNameInUseException { try { persist(group); } catch (final IllegalStateException e) { @@ -218,7 +225,7 @@ } for (final ServerTool tool : registry.all()) { if (toolsToEnable.contains(tool.getName())) { - tool.initGroup(user, group); + tool.initGroup(user, group, vars); } } } Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -137,8 +137,11 @@ final User user = new User(shortName, longName, email, passwd, passwdDigest.getDigest(), passwdDigest.getSalt(), language, country, tz); kuneWaveManager.createWave( + ContentConstants.WELCOME_WAVE_CONTENT_TITLE.replaceAll("\\[%s\\]", + databaseProperties.getDefaultSiteName()), ContentConstants.WELCOME_WAVE_CONTENT.replaceAll("\\[%s\\]", - databaseProperties.getDefaultSiteName()), databaseProperties.getAdminShortName(), shortName); + databaseProperties.getDefaultSiteName()), + participantUtils.of(databaseProperties.getAdminShortName()), participantUtils.of(shortName)); return user; } catch (final RuntimeException e) { try { Modified: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -23,9 +23,6 @@ import javax.persistence.NoResultException; -import org.waveprotocol.wave.model.waveref.WaveRef; -import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; - import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.ContentNotFoundException; import cc.kune.core.client.errors.DefaultException; @@ -70,7 +67,6 @@ import cc.kune.domain.Content; import cc.kune.domain.Group; import cc.kune.domain.User; -import cc.kune.wave.server.KuneWaveManager; import com.google.inject.Inject; import com.google.inject.Provider; @@ -86,7 +82,6 @@ private final CreationService creationService; private final FinderService finderService; private final GroupManager groupManager; - private final KuneWaveManager kuneWaveManager; private final Mapper mapper; private final AccessRightsService rightsService; private final StateService stateService; @@ -100,7 +95,7 @@ final StateService stateService, final CreationService creationService, final GroupManager groupManager, final XmppManager xmppManager, final ContentManager contentManager, final ContainerManager containerManager, final TagUserContentManager tagManager, - final CommentManager commentManager, final Mapper mapper, final KuneWaveManager kuneWaveManager) { + final CommentManager commentManager, final Mapper mapper) { this.finderService = finderService; this.userSessionProvider = userSessionProvider; this.accessService = accessService; @@ -114,7 +109,6 @@ this.tagManager = tagManager; this.commentManager = commentManager; this.mapper = mapper; - this.kuneWaveManager = kuneWaveManager; } @Override @@ -158,9 +152,7 @@ @Transactional public StateContentDTO addContent(final String userHash, final StateToken parentToken, final String title, final String typeId) throws DefaultException { - final String body = ""; - final WaveRef waveRef = kuneWaveManager.createWave(body, getCurrentUser().getShortName()); - return createContent(parentToken, title, typeId, JavaWaverefEncoder.encodeToUriPathSegment(waveRef)); + return createContent(parentToken, title, typeId); } @Override @@ -207,11 +199,11 @@ return null; } - private StateContentDTO createContent(final StateToken parentToken, final String title, final String typeId, - final String body) { + private StateContentDTO createContent(final StateToken parentToken, final String title, final String typeId) { final User user = getCurrentUser(); final Container container = accessService.accessToContainer(ContentUtils.parseId(parentToken.getFolder()), user, AccessRol.Editor); + final String body = ""; final Content addedContent = creationService.createContent(title, body, user, container, typeId); return getState(user, addedContent); } Modified: trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,9 +19,6 @@ */ package cc.kune.core.server.rpc; -import org.waveprotocol.wave.model.waveref.WaveRef; -import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; - import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.rpcservices.GroupService; import cc.kune.core.server.UserSession; @@ -108,10 +105,9 @@ final String tags, final String[] enabledTools) throws DefaultException { final User user = getUserLogged(); final Group group = mapper.map(groupDTO, Group.class); - final Group newGroup = groupManager.createGroup(group, user); - final WaveRef waveId = kuneWaveManager.createWave("<h1>" + i18n.t("About [%s]", groupDTO.getLongName()) - + "</h1>" + publicDesc, user.getShortName()); - contentManager.save(user, newGroup.getDefaultContent(), JavaWaverefEncoder.encodeToUriPathSegment(waveId)); + final Group newGroup = groupManager.createGroup(group, user, publicDesc); + // This is necessary? + contentManager.save(user, newGroup.getDefaultContent()); // contentManager.setTags(user, defContentId, tags); return newGroup.getDefaultContent().getStateToken(); }; Modified: trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -25,8 +25,6 @@ import org.json.JSONObject; import org.waveprotocol.box.server.CoreSettings; import org.waveprotocol.box.server.authentication.SessionManager; -import org.waveprotocol.wave.model.waveref.WaveRef; -import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.DefaultException; @@ -53,7 +51,6 @@ import cc.kune.domain.Group; import cc.kune.domain.User; import cc.kune.wave.server.CustomWaveClientServlet; -import cc.kune.wave.server.KuneWaveManager; import com.google.inject.Inject; import com.google.inject.Provider; @@ -67,7 +64,6 @@ private final ContentManager contentManager; private final GroupManager groupManager; private final I18nTranslationService i18n; - private final KuneWaveManager kuneWaveManager; private final Mapper mapper; private final Provider<SessionService> sessionServiceProvider; private final UserInfoService userInfoService; @@ -83,8 +79,7 @@ @Named(CoreSettings.USE_SOCKETIO) final Boolean useSocketIO, final GroupManager groupManager, final UserInfoService userInfoService, final Mapper mapper, final SessionManager waveSessionManager, final CustomWaveClientServlet waveClientServlet, final I18nTranslationService i18n, - final KuneWaveManager kuneWaveManager, final ContentManager contentManager) { - + final ContentManager contentManager) { this.sessionServiceProvider = sessionServiceProvider; this.userSessionProvider = userSessionProvider; this.userManager = userManager; @@ -95,7 +90,6 @@ this.waveSessionManager = waveSessionManager; this.waveClientServlet = waveClientServlet; this.i18n = i18n; - this.kuneWaveManager = kuneWaveManager; this.contentManager = contentManager; } @@ -106,9 +100,9 @@ userDTO.getPassword(), userDTO.getLanguage().getCode(), userDTO.getCountry().getCode(), userDTO.getTimezone().getId()); final Group userGroup = groupManager.createUserGroup(user, wantPersonalHomepage); - final WaveRef waveId = kuneWaveManager.createWave("<h1>" + i18n.t("[%s] Bio", userDTO.getName()) + "</h1>" - + i18n.t("This user has not written its biography yet"), user.getShortName()); - contentManager.save(user, userGroup.getDefaultContent(), JavaWaverefEncoder.encodeToUriPathSegment(waveId)); + // Is this necessary? try to remove (used when we were setting the def + // content + contentManager.save(user, userGroup.getDefaultContent()); } @Override Modified: trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,6 +19,9 @@ */ package cc.kune.core.server.state; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; +import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; + import org.waveprotocol.wave.model.waveref.InvalidWaveRefException; import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; @@ -29,7 +32,6 @@ import cc.kune.core.server.manager.SocialNetworkManager; import cc.kune.core.server.manager.TagUserContentManager; import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.docs.server.DocumentServerTool; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; @@ -103,10 +105,11 @@ state.setVersion(content.getVersion()); final char[] text = revision.getBody(); final String textBody = text == null ? null : new String(text); - if (typeId.equals(DocumentServerTool.TYPE_WAVE)) { + if (typeId.equals(TYPE_DOCUMENT) || (typeId.equals(TYPE_POST))) { state.setWaveRef(textBody); try { - state.setContent(kuneWaveManager.fetchWavelet(JavaWaverefEncoder.decodeWaveRefFromPath(textBody)).getRootBlip().getContent()); + state.setContent(kuneWaveManager.fetchWavelet(JavaWaverefEncoder.decodeWaveRefFromPath(textBody), + content.getAuthors().get(0).getShortName()).getRootBlip().getContent()); } catch (final InvalidWaveRefException e) { throw new DefaultException("Error retriving Wave"); } Modified: trunk/src/main/java/cc/kune/core/server/tool/ServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/tool/ServerTool.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/core/server/tool/ServerTool.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,7 +19,6 @@ */ package cc.kune.core.server.tool; - import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; @@ -33,10 +32,6 @@ */ public interface ServerTool { - /* Same constant in client */ - public static final String UPLOADEDFILE_SUFFIX = "uploaded"; - public static final String WAVE_SUFFIX = "wave"; - void checkTypesBeforeContainerCreation(String parentTypeId, String typeId); void checkTypesBeforeContentCreation(String parentTypeId, String typeId); @@ -47,7 +42,7 @@ ServerToolTarget getTarget(); - Group initGroup(User user, Group group); + Group initGroup(User user, Group group, Object... vars); void onCreateContainer(Container container, Container parent); Added: trunk/src/main/java/cc/kune/core/shared/ToolConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/ToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/ToolConstants.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -0,0 +1,13 @@ +package cc.kune.core.shared; + +public final class ToolConstants { + + public static final String UPLOADEDFILE_SUFFIX = "uploaded"; + @Deprecated + public static final String WAVE_SUFFIX = "wave"; + + private ToolConstants() { + + } + +} Property changes on: trunk/src/main/java/cc/kune/core/shared/ToolConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/docs/KuneDocs.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/docs/KuneDocs.gwt.xml 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/docs/KuneDocs.gwt.xml 2011-04-27 15:32:01 UTC (rev 1322) @@ -1,5 +1,6 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module> - <inherits name="cc.kune.core.Core" /> - <source path="client" /> + <inherits name="cc.kune.core.KuneCore" /> + <source path="client" /> + <source path="shared" /> </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,6 +19,11 @@ */ package cc.kune.docs.client; +import static cc.kune.docs.shared.DocsConstants.NAME; +import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.nav.NavResources; @@ -28,12 +33,7 @@ import com.google.inject.Inject; public class DocsClientTool extends FoldableAbstractClientTool { - public static final String NAME = "docs"; - public static final String TYPE_DOCUMENT = NAME + "." + "doc"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + FoldableAbstractClientTool.UPLOADEDFILE_SUFFIX; - public static final String TYPE_WAVE = NAME + "." + FoldableAbstractClientTool.WAVE_SUFFIX; + private final NavResources navResources; @Inject @@ -63,7 +63,6 @@ private void registerIcons() { registerContentTypeIcon(TYPE_FOLDER, navResources.folder()); registerContentTypeIcon(TYPE_DOCUMENT, navResources.page()); - registerContentTypeIcon(TYPE_WAVE, navResources.page()); registerUploadTypesAndMimes(TYPE_UPLOADEDFILE); } Modified: trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,11 +19,10 @@ \*/ package cc.kune.docs.client.actions; -import static cc.kune.docs.client.DocsClientTool.TYPE_DOCUMENT; -import static cc.kune.docs.client.DocsClientTool.TYPE_FOLDER; -import static cc.kune.docs.client.DocsClientTool.TYPE_ROOT; -import static cc.kune.docs.client.DocsClientTool.TYPE_UPLOADEDFILE; -import static cc.kune.docs.client.DocsClientTool.TYPE_WAVE; +import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.resources.CoreResources; @@ -40,7 +39,7 @@ final String[] all = { TYPE_ROOT, TYPE_FOLDER, TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; final String[] containers = { TYPE_ROOT, TYPE_FOLDER }; final String[] containersNoRoot = { TYPE_FOLDER }; - final String[] contents = { TYPE_DOCUMENT, TYPE_UPLOADEDFILE, TYPE_WAVE }; + final String[] contents = { TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; final String[] contentsModerated = { TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; @Inject Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewDocBtn.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocBtn.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -3,7 +3,7 @@ import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.docs.client.DocsClientTool; +import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.actions.NewContentBtn; import com.google.inject.Inject; @@ -15,7 +15,7 @@ final GlobalShortcutRegister shorcutReg) { super(i18n, action, res, shorcutReg, i18n.t("New document"), i18n.t("Create a New Document here. " + "This document will be a new 'Page' in the public web if you publish it"), i18n.t("New document"), - DocsClientTool.TYPE_WAVE); + DocsConstants.TYPE_DOCUMENT); } } Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -2,7 +2,7 @@ import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.docs.client.DocsClientTool; +import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.actions.NewContainerBtn; import com.google.inject.Inject; @@ -13,7 +13,7 @@ public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res) { super(i18n, action, res, i18n.t("New folder"), i18n.t("Create a new folder here. A folder will be a 'section' in the public web"), - i18n.t("New folder"), DocsClientTool.TYPE_FOLDER); + i18n.t("New folder"), DocsConstants.TYPE_FOLDER); } } Modified: trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,6 +19,13 @@ */ package cc.kune.docs.server; +import static cc.kune.docs.shared.DocsConstants.NAME; +import static cc.kune.docs.shared.DocsConstants.ROOT_NAME; +import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; + import java.util.Date; import cc.kune.core.client.errors.ContainerNotPermittedException; @@ -31,6 +38,7 @@ import cc.kune.core.server.tool.ServerToolTarget; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.docs.shared.DocsConstants; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; @@ -40,14 +48,6 @@ import com.google.inject.Inject; public class DocumentServerTool implements ServerTool { - public static final String NAME = "docs"; - public static final String ROOT_NAME = "documents"; - public static final String TYPE_DOCUMENT = NAME + "." + "doc"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + ServerTool.UPLOADEDFILE_SUFFIX; - public static final String TYPE_WAVE = NAME + "." + ServerTool.WAVE_SUFFIX; - private final ToolConfigurationManager configurationManager; private final ContainerManager containerManager; private final ContentManager contentManager; @@ -76,10 +76,9 @@ } void checkContentTypeId(final String parentTypeId, final String typeId) { - if (typeId.equals(TYPE_DOCUMENT) || typeId.equals(TYPE_UPLOADEDFILE) || typeId.equals(TYPE_WAVE)) { + if (typeId.equals(TYPE_DOCUMENT) || typeId.equals(TYPE_UPLOADEDFILE)) { // ok valid content if ((typeId.equals(TYPE_DOCUMENT) && (parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_FOLDER))) - || (typeId.equals(TYPE_WAVE) && (parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_FOLDER))) || (typeId.equals(TYPE_UPLOADEDFILE) && (parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_FOLDER)))) { // ok } else { @@ -117,18 +116,18 @@ } @Override - public Group initGroup(final User user, final Group group) { + public Group initGroup(final User user, final Group group, final Object... otherVars) { final ToolConfiguration config = new ToolConfiguration(); final Container rootFolder = containerManager.createRootFolder(group, NAME, ROOT_NAME, TYPE_ROOT); config.setRoot(rootFolder); group.setToolConfig(NAME, config); configurationManager.persist(config); - final String longName = group.getLongName(); - final Content content = contentManager.createContent(i18n.t("About [%s]", longName), "", user, rootFolder, - DocumentServerTool.TYPE_WAVE); + final String title = (String) otherVars[0]; + final String body = (String) otherVars[1]; + final Content content = contentManager.createContent(title, body, user, rootFolder, DocsConstants.TYPE_DOCUMENT); content.addAuthor(user); content.setLanguage(user.getLanguage()); - content.setTypeId(TYPE_WAVE); + content.setTypeId(TYPE_DOCUMENT); content.setStatus(ContentStatus.publishedOnline); content.setPublishedOn(new Date()); group.setDefaultContent(content); Added: trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java =================================================================== --- trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -0,0 +1,20 @@ +package cc.kune.docs.shared; + +import cc.kune.core.shared.ToolConstants; + +public final class DocsConstants { + + public static final String NAME = "docs"; + public static final String ROOT_NAME = "documents"; + public static final String TYPE_DOCUMENT = NAME + "." + "doc"; + public static final String TYPE_FOLDER = NAME + "." + "folder"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + + // @Deprecated + // public static final String TYPE_WAVE = NAME + "." + + // ToolConstants.WAVE_SUFFIX; + + private DocsConstants() { + } +} Property changes on: trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/gspace/client/actions/ActionGroups.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/ActionGroups.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/gspace/client/actions/ActionGroups.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -4,10 +4,10 @@ * A group of actions that must be grouped and showed in some perspective (on * edit, etc) */ -public class ActionGroups { - public static String EDIT = "edit"; - public static String MENUITEM = "menu-item"; - public static String VIEW = "view"; +public final class ActionGroups { + public final static String EDIT = "edit"; + public final static String MENUITEM = "menu-item"; + public final static String VIEW = "view"; private ActionGroups() { } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPresenter.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPresenter.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -2,16 +2,16 @@ import javax.annotation.Nonnull; -import cc.kune.blogs.client.BlogsClientTool; import cc.kune.blogs.client.actions.BlogsClientActions; +import cc.kune.blogs.shared.BlogsConstants; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.dto.HasContent; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.docs.client.DocsClientTool; import cc.kune.docs.client.actions.DocsClientActions; +import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.actions.ActionGroups; import cc.kune.gspace.client.tool.ContentViewer; import cc.kune.gspace.client.tool.ContentViewerSelector; @@ -55,8 +55,8 @@ super(eventBus, view, proxy); this.session = session; this.actionsRegistry = actionsRegistry; - viewerSelector.register(this, true, DocsClientTool.TYPE_WAVE); - viewerSelector.register(this, true, BlogsClientTool.TYPE_POST); + viewerSelector.register(this, true, DocsConstants.TYPE_DOCUMENT); + viewerSelector.register(this, true, BlogsConstants.TYPE_POST); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -23,12 +23,11 @@ public class FolderViewerAsFlowPanel extends AbstractFolderViewerPanel { interface FolderViewerAsFlowPanelUiBinder extends UiBinder<Widget, FolderViewerAsFlowPanel> { } + private static final int ICONLABELMAXSIZE = 20; + private static final int ICONSIZE = 100; private static FolderViewerAsFlowPanelUiBinder uiBinder = GWT.create(FolderViewerAsFlowPanelUiBinder.class); - @UiField FlowPanel flow; - int ICONLABELMAXSIZE = 20; - int ICONSIZE = 100; @Inject public FolderViewerAsFlowPanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n) { Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -2,7 +2,7 @@ import javax.annotation.Nonnull; -import cc.kune.blogs.client.BlogsClientTool; +import cc.kune.blogs.shared.BlogsConstants; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; @@ -21,7 +21,7 @@ import cc.kune.core.shared.dto.HasContent; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.docs.client.DocsClientTool; +import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.actions.ActionGroups; import cc.kune.gspace.client.tool.ContentViewer; import cc.kune.gspace.client.tool.ContentViewerSelector; @@ -87,8 +87,8 @@ this.downloadUtilsProvider = downloadUtilsProvider; this.capabilitiesRegistry = capabilitiesRegistry; iconsRegistry = capabilitiesRegistry.getIconsRegistry(); - viewerSelector.register(this, true, DocsClientTool.TYPE_ROOT, DocsClientTool.TYPE_FOLDER); - viewerSelector.register(this, true, BlogsClientTool.TYPE_ROOT, BlogsClientTool.TYPE_BLOG); + viewerSelector.register(this, true, DocsConstants.TYPE_ROOT, DocsConstants.TYPE_FOLDER); + viewerSelector.register(this, true, BlogsConstants.TYPE_ROOT, BlogsConstants.TYPE_BLOG); useGenericImageIcon = false; } Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -63,6 +63,7 @@ import org.waveprotocol.wave.model.waveref.WaveRef; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.sitebar.spaces.Space; import cc.kune.core.client.sitebar.spaces.SpaceConfEvent; import cc.kune.core.client.state.SiteTokens; @@ -96,7 +97,7 @@ private static final Binder BINDER = GWT.create(Binder.class); - static Log LOG = Log.get(WebClient.class); + static final Log LOG = Log.get(WebClient.class); // Use of GWT logging is only intended for sending exception reports to the // server, nothing else in the client should use java.util.logging. // Please also see WebClientDemo.gwt.xml. @@ -157,7 +158,7 @@ public void onCreateRequest(WaveCreationEvent event) { LOG.info("WaveCreationEvent received"); if (channel == null) { - throw new RuntimeException("Spaghetti attack. Create occured before login"); + throw new DefaultException("Spaghetti attack. Create occured before login"); } openWave(WaveRef.of(idGenerator.newWaveId()), true); Modified: trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -95,7 +95,7 @@ * Try to create a user with the provided username and password. On error, * returns a string containing an error message. On success, returns null. */ - public String tryCreateUser(String username, final PasswordDigest passwordDigest) { + public String tryCreateUser(String username, final PasswordDigest passwordDigest) { // NOPMD by vjrj on 27/04/11 8:36 final String message = null; ParticipantId id = null; Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveManager.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveManager.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveManager.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -1,13 +1,16 @@ package cc.kune.wave.server; +import org.waveprotocol.wave.model.wave.ParticipantId; import org.waveprotocol.wave.model.waveref.WaveRef; import com.google.wave.api.Wavelet; public interface KuneWaveManager { - WaveRef createWave(String message, String... participants); + WaveRef createWave(String message, ParticipantId participants); - Wavelet fetchWavelet(WaveRef waveRef); + WaveRef createWave(String title, String message, ParticipantId... participantsArray); + Wavelet fetchWavelet(WaveRef waveRef, String author); + } Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -5,6 +5,8 @@ import java.util.Map; import java.util.Set; +import javax.annotation.Nonnull; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.waveprotocol.box.server.CoreSettings; @@ -40,6 +42,8 @@ public class KuneWaveManagerDefault implements KuneWaveManager { public static final Log LOG = LogFactory.getLog(KuneWaveManagerDefault.class); + private static final String NO_TITLE = ""; + private final ConversationUtil conversationUtil; private final EventDataConverterManager converterManager; private final String domain; @@ -61,14 +65,20 @@ } @Override - public WaveRef createWave(final String message, final String... participantArray) { + public WaveRef createWave(final String message, final ParticipantId participant) { + return createWave(NO_TITLE, message, participant); + } + + @Override + public WaveRef createWave(@Nonnull final String title, final String message, + @Nonnull final ParticipantId... participantsArray) { String newWaveId = null; String newWaveletId = null; final Set<String> participants = new HashSet<String>(); - for (final String participant : participantArray) { - participants.add(participantUtils.of(participant).toString()); + for (final ParticipantId participant : participantsArray) { + participants.add(participant.toString()); } - final ParticipantId user = participantUtils.of(participantArray[0]); + final ParticipantId user = participantsArray[0]; final OperationQueue opQueue = new OperationQueue(); final Wavelet newWavelet = opQueue.createWavelet(domain, participants); final Blip rootBlip = newWavelet.getRootBlip(); @@ -118,14 +128,14 @@ } @Override - public Wavelet fetchWavelet(final WaveRef waveName) { + public Wavelet fetchWavelet(final WaveRef waveName, final String author) { Wavelet wavelet = null; final OperationQueue opQueue = new OperationQueue(); opQueue.fetchWavelet(waveName.getWaveId(), waveName.getWaveletId()); final OperationContextImpl context = new OperationContextImpl(waveletProvider, converterManager.getEventDataConverter(ProtocolVersion.DEFAULT), conversationUtil); final OperationRequest request = opQueue.getPendingOperations().get(0); - OperationUtil.executeOperation(request, operationRegistry, context, participantUtils.getSuperAdmin()); + OperationUtil.executeOperation(request, operationRegistry, context, participantUtils.of(author)); final String reqId = request.getId(); final JsonRpcResponse response = context.getResponse(reqId); if (response != null) { Modified: trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -21,7 +21,7 @@ public ParticipantUtils((a)Named(CoreSettings.WAVE_SERVER_DOMAIN) final String domain, final DatabaseProperties databaseProperties) throws InvalidParticipantAddress { this.domain = domain; - superAdmin = of(databaseProperties.getAdminShortName()); + superAdmin = ofImpl(databaseProperties.getAdminShortName()); } public ParticipantId getSuperAdmin() { @@ -29,6 +29,10 @@ } public ParticipantId of(final String username) { + return ofImpl(username); + } + + private ParticipantId ofImpl(final String username) { try { if (username.contains(ParticipantId.DOMAIN_PREFIX)) { return ParticipantId.of(username); Modified: trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -36,11 +36,11 @@ import com.google.inject.Inject; public class ChatServerTool implements ServerTool { + public static final String NAME = "chats"; + public static final String ROOT_NAME = "chat rooms"; + public static final String TYPE_CHAT = ChatClientTool.TYPE_CHAT; + public static final String TYPE_ROOM = ChatClientTool.TYPE_ROOM; public static final String TYPE_ROOT = ChatClientTool.TYPE_ROOT; - public static final String TYPE_ROOM = ChatClientTool.TYPE_ROOM; - public static final String TYPE_CHAT = ChatClientTool.TYPE_CHAT; - public static final String ROOT_NAME = "chat rooms"; - public static final String NAME = "chats"; private final ToolConfigurationManager configurationManager; private final ContainerManager containerManager; @@ -50,10 +50,23 @@ this.containerManager = containerManager; } + private void checkContainerTypeId(final String parentTypeId, final String typeId) { + if (typeId.equals(TYPE_ROOM)) { + if (!parentTypeId.equals(TYPE_ROOT)) { + throw new ContainerNotPermittedException(); + } + // ok valid container + } else { + throw new ContainerNotPermittedException(); + } + } + + @Override public void checkTypesBeforeContainerCreation(final String parentTypeId, final String typeId) { checkContainerTypeId(parentTypeId, typeId); } + @Override public void checkTypesBeforeContentCreation(final String parentTypeId, final String typeId) { if (!parentTypeId.equals(TYPE_ROOM)) { throw new ContainerNotPermittedException(); @@ -61,19 +74,23 @@ // in the future chat history checks } + @Override public String getName() { return NAME; } + @Override public String getRootName() { return ROOT_NAME; } + @Override public ServerToolTarget getTarget() { return ServerToolTarget.forGroups; } - public Group initGroup(final User user, final Group group) { + @Override + public Group initGroup(final User user, final Group group, final Object... otherVars) { final ToolConfiguration config = new ToolConfiguration(); final Container container = containerManager.createRootFolder(group, NAME, ROOT_NAME, TYPE_ROOT); config.setRoot(container); @@ -82,26 +99,18 @@ return group; } + @Override public void onCreateContainer(final Container container, final Container parent) { } + @Override public void onCreateContent(final Content content, final Container parent) { } + @Override @Inject public void register(final ServerToolRegistry registry) { registry.register(this); } - private void checkContainerTypeId(final String parentTypeId, final String typeId) { - if (typeId.equals(TYPE_ROOM)) { - if (!parentTypeId.equals(TYPE_ROOT)) { - throw new ContainerNotPermittedException(); - } - // ok valid container - } else { - throw new ContainerNotPermittedException(); - } - } - } Modified: trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,7 +19,6 @@ */ package org.ourproject.kune.gallery.server; - import cc.kune.core.client.errors.ContainerNotPermittedException; import cc.kune.core.client.errors.ContentNotPermittedException; import cc.kune.core.server.content.ContainerManager; @@ -27,6 +26,7 @@ import cc.kune.core.server.tool.ServerTool; import cc.kune.core.server.tool.ServerToolRegistry; import cc.kune.core.server.tool.ServerToolTarget; +import cc.kune.core.shared.ToolConstants; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.Container; import cc.kune.domain.Content; @@ -38,11 +38,11 @@ public class GalleryServerTool implements ServerTool { public static final String NAME = "gallery"; + public static final String ROOT_NAME = "gallery"; + public static final String TYPE_ALBUM = NAME + "." + "album"; public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_ALBUM = NAME + "." + "album"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + ServerTool.UPLOADEDFILE_SUFFIX; - public static final String ROOT_NAME = "gallery"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; private final ToolConfigurationManager configurationManager; private final ContainerManager containerManager; @@ -56,27 +56,59 @@ this.i18n = translationService; } - public void checkTypesBeforeContainerCreation(String parentTypeId, String typeId) { + void checkContainerTypeId(final String parentTypeId, final String typeId) { + if (typeId.equals(TYPE_ALBUM)) { + // ok valid container + if ((typeId.equals(TYPE_ALBUM) && (parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_ALBUM)))) { + // ok + } else { + throw new ContainerNotPermittedException(); + } + } else { + throw new ContainerNotPermittedException(); + } + } + + void checkContentTypeId(final String parentTypeId, final String typeId) { + if (typeId.equals(TYPE_UPLOADEDFILE)) { + // ok valid content + if (typeId.equals(TYPE_UPLOADEDFILE) && (parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_ALBUM))) { + // ok + } else { + throw new ContentNotPermittedException(); + } + } else { + throw new ContentNotPermittedException(); + } + } + + @Override + public void checkTypesBeforeContainerCreation(final String parentTypeId, final String typeId) { checkContainerTypeId(parentTypeId, typeId); } - public void checkTypesBeforeContentCreation(String parentTypeId, String typeId) { + @Override + public void checkTypesBeforeContentCreation(final String parentTypeId, final String typeId) { checkContentTypeId(parentTypeId, typeId); } + @Override public String getName() { return NAME; } + @Override public String getRootName() { return ROOT_NAME; } + @Override public ServerToolTarget getTarget() { return ServerToolTarget.forBoth; } - public Group initGroup(final User user, final Group group) { + @Override + public Group initGroup(final User user, final Group group, final Object... otherVars) { final ToolConfiguration config = new ToolConfiguration(); final Container rootFolder = containerManager.createRootFolder(group, NAME, ROOT_NAME, TYPE_ROOT); config.setRoot(rootFolder); @@ -87,40 +119,17 @@ return group; } + @Override public void onCreateContainer(final Container container, final Container parent) { } + @Override public void onCreateContent(final Content content, final Container parent) { } + @Override @Inject public void register(final ServerToolRegistry registry) { registry.register(this); } - - void checkContainerTypeId(final String parentTypeId, final String typeId) { - if (typeId.equals(TYPE_ALBUM)) { - // ok valid container - if ((typeId.equals(TYPE_ALBUM) && (parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_ALBUM)))) { - // ok - } else { - throw new ContainerNotPermittedException(); - } - } else { - throw new ContainerNotPermittedException(); - } - } - - void checkContentTypeId(final String parentTypeId, final String typeId) { - if (typeId.equals(TYPE_UPLOADEDFILE)) { - // ok valid content - if (typeId.equals(TYPE_UPLOADEDFILE) && (parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_ALBUM))) { - // ok - } else { - throw new ContentNotPermittedException(); - } - } else { - throw new ContentNotPermittedException(); - } - } } Modified: trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -21,7 +21,6 @@ import java.util.Date; - import cc.kune.core.client.errors.ContainerNotPermittedException; import cc.kune.core.client.errors.ContentNotPermittedException; import cc.kune.core.server.content.ContainerManager; @@ -30,6 +29,7 @@ import cc.kune.core.server.tool.ServerTool; import cc.kune.core.server.tool.ServerToolRegistry; import cc.kune.core.server.tool.ServerToolTarget; +import cc.kune.core.shared.ToolConstants; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -44,16 +44,16 @@ public class WikiServerTool implements ServerTool { public static final String NAME = "wiki"; + public static final String ROOT_NAME = "wiki"; + public static final String TYPE_FOLDER = NAME + "." + "folder"; public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + public static final String TYPE_WIKIPAGE = NAME + "." + "wikipage"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + ServerTool.UPLOADEDFILE_SUFFIX; - public static final String ROOT_NAME = "wiki"; - - private final ContentManager contentManager; private final ToolConfigurationManager configurationManager; private final ContainerManager containerManager; + private final ContentManager contentManager; private final I18nTranslationService i18n; @Inject @@ -65,27 +65,61 @@ this.i18n = translationService; } - public void checkTypesBeforeContainerCreation(String parentTypeId, String typeId) { + void checkContainerTypeId(final String parentTypeId, final String typeId) { + if (typeId.equals(TYPE_FOLDER)) { + // ok valid container + if ((typeId.equals(TYPE_FOLDER) && (parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_FOLDER)))) { + // ok + } else { + throw new ContainerNotPermittedException(); + } + } else { + throw new ContainerNotPermittedException(); + } + } + + void checkContentTypeId(final String parentTypeId, final String typeId) { + if (typeId.equals(TYPE_WIKIPAGE) || typeId.equals(TYPE_UPLOADEDFILE)) { + // ok valid content + final boolean parentIsFolderOrRoot = parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_FOLDER); + if ((typeId.equals(TYPE_UPLOADEDFILE) && parentIsFolderOrRoot) + || (typeId.equals(TYPE_WIKIPAGE) && parentIsFolderOrRoot)) { + // ok + } else { + throw new ContentNotPermittedException(); + } + } else { + throw new ContentNotPermittedException(); + } + } + + @Override + public void checkTypesBeforeContainerCreation(final String parentTypeId, final String typeId) { checkContainerTypeId(parentTypeId, typeId); } - public void checkTypesBeforeContentCreation(String parentTypeId, String typeId) { + @Override + public void checkTypesBeforeContentCreation(final String parentTypeId, final String typeId) { checkContentTypeId(parentTypeId, typeId); } + @Override public String getName() { return NAME; } + @Override public String getRootName() { return ROOT_NAME; } + @Override public ServerToolTarget getTarget() { return ServerToolTarget.forBoth; } - public Group initGroup(final User user, final Group group) { + @Override + public Group initGroup(final User user, final Group group, final Object... otherVars) { final ToolConfiguration config = new ToolConfiguration(); final Container rootFolder = containerManager.createRootFolder(group, NAME, ROOT_NAME, TYPE_ROOT); setContainerWikiAcl(rootFolder); @@ -103,50 +137,25 @@ return group; } + @Override public void onCreateContainer(final Container container, final Container parent) { setContainerWikiAcl(container); } + @Override public void onCreateContent(final Content content, final Container parent) { content.setStatus(ContentStatus.publishedOnline); content.setPublishedOn(new Date()); } + @Override @Inject public void register(final ServerToolRegistry registry) { registry.register(this); } - void checkContainerTypeId(final String parentTypeId, final String typeId) { - if (typeId.equals(TYPE_FOLDER)) { - // ok valid container - if ((typeId.equals(TYPE_FOLDER) && (parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_FOLDER)))) { - // ok - } else { - throw new ContainerNotPermittedException(); - } - } else { - throw new ContainerNotPermittedException(); - } - } - - void checkContentTypeId(final String parentTypeId, final String typeId) { - if (typeId.equals(TYPE_WIKIPAGE) || typeId.equals(TYPE_UPLOADEDFILE)) { - // ok valid content - boolean parentIsFolderOrRoot = parentTypeId.equals(TYPE_ROOT) || parentTypeId.equals(TYPE_FOLDER); - if ((typeId.equals(TYPE_UPLOADEDFILE) && parentIsFolderOrRoot) - || (typeId.equals(TYPE_WIKIPAGE) && parentIsFolderOrRoot)) { - // ok - } else { - throw new ContentNotPermittedException(); - } - } else { - throw new ContentNotPermittedException(); - } - } - private void setContainerWikiAcl(final Container container) { - AccessLists wikiAcl = new AccessLists(); + final AccessLists wikiAcl = new AccessLists(); wikiAcl.getAdmins().setMode(GroupListMode.NORMAL); wikiAcl.getAdmins().add(container.getOwner()); wikiAcl.getEditors().setMode(GroupListMode.EVERYONE); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.workspace.client.ctxnav; -import static cc.kune.docs.client.DocsClientTool.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; import java.util.HashMap; Modified: trunk/src/main/resources/db/liquibase_changelog.xml =================================================================== --- trunk/src/main/resources/db/liquibase_changelog.xml 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/main/resources/db/liquibase_changelog.xml 2011-04-27 15:32:01 UTC (rev 1322) @@ -125,5 +125,10 @@ encoding="utf8" stripComments="1" /> <rollback>DELETE FROM `ext_media_descriptors` WHERE id BETWEEN 1 AND 6;</rollback> </changeSet> - + <changeSet id="19" author="vjrj"> + <comment>Wave id migration</comment> + <sqlFile path="src/main/resources/db/update-0015-waveid.sql" + encoding="utf8" stripComments="1" /> + <rollback>SELECT * FROM globalize_countries;</rollback> + </changeSet> </databaseChangeLog> Modified: trunk/src/test/java/cc/kune/blogs/server/BlogServerToolTest.java =================================================================== --- trunk/src/test/java/cc/kune/blogs/server/BlogServerToolTest.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/test/java/cc/kune/blogs/server/BlogServerToolTest.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,15 +19,14 @@ */ package cc.kune.blogs.server; -import static cc.kune.blogs.server.BlogServerTool.TYPE_BLOG; -import static cc.kune.blogs.server.BlogServerTool.TYPE_POST; -import static cc.kune.blogs.server.BlogServerTool.TYPE_ROOT; -import static cc.kune.blogs.server.BlogServerTool.TYPE_UPLOADEDFILE; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_BLOG; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_ROOT; +import static cc.kune.blogs.shared.BlogsConstants.TYPE_UPLOADEDFILE; import org.junit.Before; import org.junit.Test; -import cc.kune.blogs.server.BlogServerTool; import cc.kune.core.client.errors.ContainerNotPermittedException; import cc.kune.core.client.errors.ContentNotPermittedException; Modified: trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,6 +19,7 @@ */ package cc.kune.core.server; +import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; import static org.junit.Assert.assertEquals; import java.util.TimeZone; @@ -33,7 +34,6 @@ import cc.kune.core.server.manager.I18nLanguageManager; import cc.kune.core.server.manager.LicenseManager; import cc.kune.core.server.manager.UserManager; -import cc.kune.docs.server.DocumentServerTool; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.I18nCountry; @@ -116,7 +116,7 @@ content.setLanguage(english); contentManager.persist(content); container = new Container(); - container.setTypeId(DocumentServerTool.TYPE_FOLDER); + container.setTypeId(TYPE_FOLDER); containerManager.persist(container); } } Modified: trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,6 +19,8 @@ */ package cc.kune.core.server.integration; +import static cc.kune.docs.shared.DocsConstants.NAME; +import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -36,7 +38,6 @@ import cc.kune.core.server.manager.I18nLanguageManager; import cc.kune.core.server.manager.I18nTranslationManager; import cc.kune.core.server.manager.LicenseManager; -import cc.kune.docs.server.DocumentServerTool; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; @@ -80,7 +81,7 @@ @Test public void testDefaultDocumentContent() { final Content content = defaultGroup.getDefaultContent(); - assertEquals(DocumentServerTool.TYPE_WAVE, content.getTypeId()); + assertEquals(TYPE_DOCUMENT, content.getTypeId()); final Container rootDocFolder = content.getContainer(); assertEquals(true, rootDocFolder.isRoot()); } @@ -95,7 +96,7 @@ @Test public void testToolConfiguration() { assertNotNull(defaultGroup); - final ToolConfiguration docToolConfig = defaultGroup.getToolConfiguration(DocumentServerTool.NAME); + final ToolConfiguration docToolConfig = defaultGroup.getToolConfiguration(NAME); assertNotNull(docToolConfig); assertTrue(docToolConfig.isEnabled()); final ToolConfiguration chatToolConfig = defaultGroup.getToolConfiguration(ChatServerTool.NAME); Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,6 +19,7 @@ */ package cc.kune.core.server.integration.content; +import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -38,8 +39,7 @@ import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.docs.client.DocsClientTool; -import cc.kune.docs.server.DocumentServerTool; +import cc.kune.docs.shared.DocsConstants; public class ContentServiceAddTest extends ContentServiceIntegrationTest { @@ -54,7 +54,7 @@ public void noLoggedInShouldThrowIllegalAccess() throws ContentNotFoundException, Exception { defaultContent = getSiteDefaultContent(); contentService.addContent(session.getHash(), defaultContent.getContainer().getStateToken(), "a name", - DocumentServerTool.TYPE_DOCUMENT); + TYPE_DOCUMENT); } @Test @@ -68,7 +68,7 @@ final String title = "New Content Title"; final StateContentDTO added = contentService.addContent(session.getHash(), - defaultContent.getContainer().getStateToken(), title, DocumentServerTool.TYPE_DOCUMENT); + defaultContent.getContainer().getStateToken(), title, TYPE_DOCUMENT); assertNotNull(added); final List<ContentSimpleDTO> contents = added.getContainer().getContents(); assertEquals(title, added.getTitle()); @@ -93,7 +93,7 @@ final ContainerDTO parent = defaultContent.getContainer(); final String title = "folder name"; final StateContainerDTO newState = contentService.addFolder(session.getHash(), parent.getStateToken(), title, - DocsClientTool.TYPE_FOLDER); + DocsConstants.TYPE_FOLDER); assertNotNull(newState); assertNotNull(newState.getGroupMembers()); assertNotNull(newState.getParticipation()); @@ -127,11 +127,11 @@ final ContainerDTO parent = defaultContent.getContainer(); final String title = "folder name"; final StateContainerDTO newState = contentService.addFolder(session.getHash(), parent.getStateToken(), title, - DocsClientTool.TYPE_FOLDER); + DocsConstants.TYPE_FOLDER); assertNotNull(newState); final StateContainerDTO newState2 = contentService.addFolder(session.getHash(), parent.getStateToken(), title, - DocsClientTool.TYPE_FOLDER); + DocsConstants.TYPE_FOLDER); assertNotNull(newState2); final ContainerDTO parentAgain = getSiteDefaultContent().getContainer(); Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,6 +19,7 @@ */ package cc.kune.core.server.integration.content; +import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -41,8 +42,7 @@ import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.dto.UserSimpleDTO; -import cc.kune.docs.client.DocsClientTool; -import cc.kune.docs.server.DocumentServerTool; +import cc.kune.docs.shared.DocsConstants; public class ContentServiceVariousTest extends ContentServiceIntegrationTest { @@ -66,6 +66,24 @@ assertEquals(1, authors4.size()); } + private void checkResult(final TagCloudResult cloudResult) { + assertNotNull(cloudResult.getTagCountList()); + final List<TagCount> summaryTags = cloudResult.getTagCountList(); + assertEquals(3, summaryTags.size()); + + TagCount tagResult = summaryTags.get(0); + assertEquals("afoo2", tagResult.getName()); + assertEquals(1, (long) tagResult.getCount()); + + tagResult = summaryTags.get(1); + assertEquals("bfoo", tagResult.getName()); + assertEquals(1, (long) tagResult.getCount()); + + tagResult = summaryTags.get(2); + assertEquals("cfoa", tagResult.getName()); + assertEquals(1, (long) tagResult.getCount()); + } + @Test public void contentRateAndRetrieve() throws Exception { contentService.rateContent(getHash(), defaultContent.getStateToken(), 4.5); @@ -102,7 +120,7 @@ final String oldTitle = "some title"; String newTitle = "folder new name"; final StateContainerDTO newState = contentService.addFolder(session.getHash(), defaultContent.getStateToken(), - oldTitle, DocsClientTool.TYPE_FOLDER); + oldTitle, DocsConstants.TYPE_FOLDER); final ContainerDTO newFolder = newState.getContainer(); @@ -188,7 +206,7 @@ defaultContent = getSiteDefaultContent(); final StateContainerDTO added = contentService.addContent(session.getHash(), defaultContent.getStateToken(), - "New Content Title", DocumentServerTool.TYPE_DOCUMENT); + "New Content Title", TYPE_DOCUMENT); assertNotNull(added); final ContentSimpleDTO newDefContent = contentService.setAsDefaultContent(session.getHash(), @@ -207,7 +225,7 @@ final String oldTitle = "some title"; String newTitle = "folder new name"; final StateContainerDTO newState = contentService.addFolder(session.getHash(), folder.getStateToken(), - oldTitle, DocsClientTool.TYPE_FOLDER); + oldTitle, DocsConstants.TYPE_FOLDER); final ContainerDTO newFolder = newState.getContainer(); @@ -225,22 +243,4 @@ assertEquals(newTitle, folderAgain.getContainer().getName()); } - private void checkResult(final TagCloudResult cloudResult) { - assertNotNull(cloudResult.getTagCountList()); - final List<TagCount> summaryTags = cloudResult.getTagCountList(); - assertEquals(3, summaryTags.size()); - - TagCount tagResult = summaryTags.get(0); - assertEquals("afoo2", tagResult.getName()); - assertEquals(1, (long) tagResult.getCount()); - - tagResult = summaryTags.get(1); - assertEquals("bfoo", tagResult.getName()); - assertEquals(1, (long) tagResult.getCount()); - - tagResult = summaryTags.get(2); - assertEquals("cfoa", tagResult.getName()); - assertEquals(1, (long) tagResult.getCount()); - } - } Modified: trunk/src/test/java/cc/kune/core/server/manager/ContentManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/ContentManagerTest.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/test/java/cc/kune/core/server/manager/ContentManagerTest.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,6 +19,8 @@ */ package cc.kune.core.server.manager; +import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; import static org.junit.Assert.assertEquals; import org.junit.Ignore; @@ -26,7 +28,6 @@ import cc.kune.core.server.PersistencePreLoadedDataTest; import cc.kune.core.server.manager.impl.SearchResult; -import cc.kune.docs.server.DocumentServerTool; import cc.kune.domain.BasicMimeType; import cc.kune.domain.Content; @@ -37,14 +38,12 @@ private static final String TITLE = "title"; private void createContent() { - final Content cnt = contentManager.createContent(TITLE, BODY, user, container, - DocumentServerTool.TYPE_UPLOADEDFILE); + final Content cnt = contentManager.createContent(TITLE, BODY, user, container, TYPE_UPLOADEDFILE); persist(cnt); } private void createContentWithMimeAndCheck(final String mimetype) { - final Content cnt = contentManager.createContent(TITLE, BODY, user, container, - DocumentServerTool.TYPE_UPLOADEDFILE); + final Content cnt = contentManager.createContent(TITLE, BODY, user, container, TYPE_UPLOADEDFILE); cnt.setMimeType(new BasicMimeType(mimetype)); persist(cnt); final Content newCnt = contentManager.find(cnt.getId()); @@ -113,8 +112,7 @@ */ @Test public void testUTF8Persist() { - final Content cnt = contentManager.createContent("汉语/漢語", "汉语/漢語", user, container, - DocumentServerTool.TYPE_DOCUMENT); + final Content cnt = contentManager.createContent("汉语/漢語", "汉语/漢語", user, container, TYPE_DOCUMENT); final Content newCnt = contentManager.find(cnt.getId()); assertEquals("汉语/漢語", newCnt.getTitle()); } Modified: trunk/src/test/java/cc/kune/core/server/manager/GroupManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/GroupManagerTest.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/test/java/cc/kune/core/server/manager/GroupManagerTest.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -42,10 +42,12 @@ public class GroupManagerTest extends PersistencePreLoadedDataTest { + private static final String PUBLIC_DESCRIP = "Some public descrip"; + @Test public void createdGroupShoudHaveValidSocialNetwork() throws Exception { final Group group = new Group("short", "longName", defLicense, GroupType.PROJECT); - groupManager.createGroup(group, user); + groupManager.createGroup(group, user, PUBLIC_DESCRIP); final SocialNetwork socialNetwork = group.getSocialNetwork(); final AccessLists lists = socialNetwork.getAccessLists(); assertTrue(lists.getAdmins().includes(user.getUserGroup())); @@ -58,7 +60,7 @@ public void createGroup() throws Exception { final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, GroupType.PROJECT); - groupManager.createGroup(group, user); + groupManager.createGroup(group, user, PUBLIC_DESCRIP); final Group otherGroup = groupManager.findByShortName("ysei"); assertEquals(group.getLongName(), otherGroup.getLongName()); @@ -70,7 +72,7 @@ public void createGroupAndSearch() throws Exception, ParseException { final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, GroupType.PROJECT); - groupManager.createGroup(group, user); + groupManager.createGroup(group, user, PUBLIC_DESCRIP); groupManager.reIndex(); final SearchResult<Group> result = groupManager.search("ysei"); assertEquals(1, result.getSize()); @@ -82,12 +84,12 @@ public void createGroupWithExistingLongName() throws Exception { final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, GroupType.PROJECT); - groupManager.createGroup(group, user); + groupManager.createGroup(group, user, PUBLIC_DESCRIP); final Group group2 = new Group("ysei2", "Yellow Submarine Environmental Initiative", defLicense, GroupType.PROJECT); group2.setDefaultLicense(defLicense); - groupManager.createGroup(group2, user); + groupManager.createGroup(group2, user, PUBLIC_DESCRIP); rollbackTransaction(); } @@ -96,11 +98,11 @@ public void createGroupWithExistingShortName() throws Exception { final Group group = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, GroupType.PROJECT); - groupManager.createGroup(group, user); + groupManager.createGroup(group, user, PUBLIC_DESCRIP); final Group group2 = new Group("ysei", "Yellow Submarine Environmental Initiative 2", defLicense, GroupType.PROJECT); - groupManager.createGroup(group2, user); + groupManager.createGroup(group2, user, PUBLIC_DESCRIP); rollbackTransaction(); } @@ -108,7 +110,7 @@ private void createTestGroup(final int number) throws Exception { final Group g = new Group("ysei" + number, "Yellow Submarine Environmental Initiative " + number, defLicense, GroupType.PROJECT); - groupManager.createGroup(g, user); + groupManager.createGroup(g, user, PUBLIC_DESCRIP); } @Test(expected = EmailAddressInUseException.class) Modified: trunk/src/test/java/cc/kune/docs/DocumentToolTest.java =================================================================== --- trunk/src/test/java/cc/kune/docs/DocumentToolTest.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/test/java/cc/kune/docs/DocumentToolTest.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,20 +19,23 @@ */ package cc.kune.docs; +import static cc.kune.docs.shared.DocsConstants.NAME; +import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; import static org.junit.Assert.assertEquals; import org.junit.Test; -import cc.kune.docs.client.DocsClientTool; -import cc.kune.docs.server.DocumentServerTool; +import cc.kune.docs.shared.DocsConstants; public class DocumentToolTest { @Test public void clientAndServerSync() { - assertEquals(DocumentServerTool.NAME, DocsClientTool.NAME); - assertEquals(DocumentServerTool.TYPE_ROOT, DocsClientTool.TYPE_ROOT); - assertEquals(DocumentServerTool.TYPE_FOLDER, DocsClientTool.TYPE_FOLDER); - assertEquals(DocumentServerTool.TYPE_DOCUMENT, DocsClientTool.TYPE_DOCUMENT); + assertEquals(NAME, DocsConstants.NAME); + assertEquals(TYPE_ROOT, DocsConstants.TYPE_ROOT); + assertEquals(TYPE_FOLDER, DocsConstants.TYPE_FOLDER); + assertEquals(TYPE_DOCUMENT, DocsConstants.TYPE_DOCUMENT); } } Modified: trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java =================================================================== --- trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,10 +19,10 @@ */ package cc.kune.docs.server; -import static cc.kune.docs.server.DocumentServerTool.TYPE_DOCUMENT; -import static cc.kune.docs.server.DocumentServerTool.TYPE_FOLDER; -import static cc.kune.docs.server.DocumentServerTool.TYPE_ROOT; -import static cc.kune.docs.server.DocumentServerTool.TYPE_UPLOADEDFILE; +import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; import org.junit.Before; import org.junit.Test; Modified: trunk/src/test/java/cc/kune/wave/server/KuneWaveManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/wave/server/KuneWaveManagerDefaultTest.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/test/java/cc/kune/wave/server/KuneWaveManagerDefaultTest.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -19,8 +19,11 @@ public class KuneWaveManagerDefaultTest extends IntegrationTest { private static final String MESSAGE = "testing"; + private static final String TITLE = "title"; @Inject KuneWaveManagerDefault manager; + @Inject + ParticipantUtils participantUtils; @Before public void before() { @@ -31,10 +34,20 @@ @Test public void createWave() throws DefaultException, IOException { doLogin(); - final WaveRef waveletName = manager.createWave(MESSAGE, getSiteAdminShortName()); + final WaveRef waveletName = manager.createWave(MESSAGE, participantUtils.of(getSiteAdminShortName())); assertNotNull(waveletName); - final Wavelet fetchWavelet = manager.fetchWavelet(waveletName); + final Wavelet fetchWavelet = manager.fetchWavelet(waveletName, getSiteAdminShortName()); assertNotNull(fetchWavelet); assertTrue(fetchWavelet.getRootBlip().getContent().contains(MESSAGE)); } + + @Test + public void createWaveWithTitle() throws DefaultException, IOException { + doLogin(); + final WaveRef waveletName = manager.createWave(TITLE, MESSAGE, participantUtils.of(getSiteAdminShortName())); + assertNotNull(waveletName); + final Wavelet fetchWavelet = manager.fetchWavelet(waveletName, getSiteAdminShortName()); + assertNotNull(fetchWavelet); + assertTrue(fetchWavelet.getRootBlip().getContent().contains(MESSAGE)); + } } Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java 2011-04-26 19:57:21 UTC (rev 1321) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java 2011-04-27 15:32:01 UTC (rev 1322) @@ -30,14 +30,14 @@ import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.docs.client.DocsClientTool; +import cc.kune.docs.shared.DocsConstants; public class FileUploaderPresenterTest { private static final String SOMEUSER_HASH = "someuserHash"; private FileUploaderPresenter presenter; + private Session session; private FileUploaderView view; - private Session session; @Before public void before() { @@ -53,7 +53,7 @@ Mockito.when(session.getCurrentStateToken()).thenReturn(new StateToken("group.docs.1.1")); assertTrue(presenter.checkFolderChange()); Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.docs.1", - DocsClientTool.TYPE_UPLOADEDFILE); + DocsConstants.TYPE_UPLOADEDFILE); } @Test @@ -61,7 +61,7 @@ Mockito.when(session.getCurrentStateToken()).thenReturn(new StateToken("group.docs.1")); assertTrue(presenter.checkFolderChange()); Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.docs.1", - DocsClientTool.TYPE_UPLOADEDFILE); + DocsConstants.TYPE_UPLOADEDFILE); } @Test @@ -72,9 +72,9 @@ Mockito.when(session.getCurrentStateToken()).thenReturn(new StateToken("group.docs.2")); assertTrue(presenter.checkFolderChange()); Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.docs.1", - DocsClientTool.TYPE_UPLOADEDFILE); + DocsConstants.TYPE_UPLOADEDFILE); Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.docs.2", - DocsClientTool.TYPE_UPLOADEDFILE); + DocsConstants.TYPE_UPLOADEDFILE); } @Test @@ -85,9 +85,9 @@ Mockito.when(session.getCurrentStateToken()).thenReturn(new StateToken("group.docs.2")); assertFalse(presenter.checkFolderChange()); Mockito.verify(view, Mockito.times(1)).setUploadParams(SOMEUSER_HASH, "group.docs.1", - DocsClientTool.TYPE_UPLOADEDFILE); + DocsConstants.TYPE_UPLOADEDFILE); Mockito.verify(view, Mockito.never()).setUploadParams(SOMEUSER_HASH, "group.docs.2", - DocsClientTool.TYPE_UPLOADEDFILE); + DocsConstants.TYPE_UPLOADEDFILE); } @Test @@ -97,6 +97,6 @@ Mockito.when(session.getCurrentStateToken()).thenReturn(new StateToken("group.docs.1")); assertTrue(presenter.checkFolderChange()); Mockito.verify(view, Mockito.times(2)).setUploadParams(SOMEUSER_HASH, "group.docs.1", - DocsClientTool.TYPE_UPLOADEDFILE); + DocsConstants.TYPE_UPLOADEDFILE); } }

1 0