May 2011 - kune-commits - lists.ourproject.org

r1345 - in trunk/src/main/java: cc/kune/common/client/actions/gwtui cc/kune/common/client/ui cc/kune/core/client/sitebar cc/kune/core/public cc/kune/gspace/public org/ourproject/kune/app/public/images
by Vicente J. Ruiz Jurado 05 May '11

05 May '11

Author: vjrj_ Date: 2011-05-05 05:41:52 +0200 (Thu, 05 May 2011) New Revision: 1345 Added: trunk/src/main/java/cc/kune/gspace/public/styles/ Removed: trunk/src/main/java/org/ourproject/kune/app/public/images/styles/ Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java trunk/src/main/java/cc/kune/core/public/ws.css Log: Some style fixes Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-05-05 03:14:36 UTC (rev 1344) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-05-05 03:41:52 UTC (rev 1345) @@ -43,6 +43,7 @@ @Override protected void clearStyles() { iconLabel.setStyleName("k-none"); + iconLabel.setStyleName("k-table"); } @Override 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-05-05 03:14:36 UTC (rev 1344) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-05-05 03:41:52 UTC (rev 1345) @@ -5,7 +5,7 @@ .label { text-decoration: none; display: table-cell; - float: left; + /* float: left; */ } .label a:link { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-05-05 03:14:36 UTC (rev 1344) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-05-05 03:41:52 UTC (rev 1345) @@ -116,7 +116,7 @@ private void createActions() { LOGGED_USER_MENU.setId(LOGGED_USER_MENU_ID); LOGGED_USER_MENU.setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); - LOGGED_USER_MENU.setStyles("k-no-backimage, k-btn-sitebar, k-fl"); + LOGGED_USER_MENU.setStyles("k-no-backimage, k-btn-sitebar"); LOGGED_USER_MENU.setRightIcon(res.arrowdownsitebar()); siteOptions.getRightToolbar().add(LOGGED_USER_MENU); separator = new ToolbarSeparatorDescriptor(Type.separator, SitebarActionsPresenter.RIGHT_TOOLBAR); Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-05 03:14:36 UTC (rev 1344) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-05 03:41:52 UTC (rev 1345) @@ -1191,4 +1191,16 @@ padding: 2px 0 0 0 !important; } -/* end of suggestbox */ \ No newline at end of file +/* end of suggestbox */ + +.k-table { + display: table; +} + +.k-table-row { + display: table-row; +} + +.k-table-cell { + display: table-cell; +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/gspace/public/styles (from rev 1339, trunk/src/main/java/org/ourproject/kune/app/public/images/styles)

1 0

r1344 - in trunk/src/main/java/cc/kune: common/public core/public gspace/client/resources gspace/client/viewers
by Vicente J. Ruiz Jurado 05 May '11

05 May '11

Author: vjrj_ Date: 2011-05-05 05:14:36 +0200 (Thu, 05 May 2011) New Revision: 1344 Modified: 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/gspace/client/resources/wsArmor.css trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java Log: Some style fixes Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-05-05 02:24:50 UTC (rev 1343) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-05-05 03:14:36 UTC (rev 1344) @@ -450,7 +450,7 @@ vertical-align: top; padding-left: 3px; padding-right: 3px; - float: left; + /* float: left; */ } .k-menuimtem-title { Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-05 02:24:50 UTC (rev 1343) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-05 03:14:36 UTC (rev 1344) @@ -393,6 +393,7 @@ background: none; border: 0px; padding: 0 3px 0 0 !important; + height: 17px !important; } .k-sitebar-wave-status { @@ -840,6 +841,7 @@ white-space: nowrap; } */ + .k-sn-mainpanel .x-btn button,.k-sn-mainpanel button,button.k-button { font: 13px 'Ubuntu', arial; border: 2px solid #CCCCCC; @@ -853,14 +855,14 @@ -moz-border-radius: 5px; border-radius: 5px; vertical-align: middle; - line-height: 2em !important; +/* line-height: 2em !important; */ outline: 0 none; /* height: 26px !important; */ font-weight: bold; width: auto !IMPORTANT; width: 50px; min-width: 50px; - " + height: 28px; /* font-size:small; cursor: pointer; Modified: trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-05-05 02:24:50 UTC (rev 1343) +++ trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-05-05 03:14:36 UTC (rev 1344) @@ -207,8 +207,8 @@ border-width: 7px; height: 0; width: 0; - position: absolute; - bottom: 47px; + position: relative; + bottom: 16px; left: 36px; } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java 2011-05-05 02:24:50 UTC (rev 1343) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentTitleWidget.java 2011-05-05 03:14:36 UTC (rev 1344) @@ -17,17 +17,18 @@ public class ContentTitleWidget extends Composite { private final EditableLabel editableTitle; private final GSpaceArmor gsArmor; + private final I18nTranslationService i18n; private final IconsRegistry iconRegistry; private final Image titleIcon; public ContentTitleWidget(final I18nTranslationService i18n, final GSpaceArmor gsArmor, final IconsRegistry iconRegistry) { + this.i18n = i18n; 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); @@ -54,6 +55,11 @@ } titleIcon.setVisible(hasIcon); editableTitle.setText(title); + if (editable) { + editableTitle.setTooltip(i18n.t("Click to edit")); + } else { + editableTitle.setTooltip(""); + } editableTitle.setEditable(editable); docHeader.add(this); }

1 0

r1343 - in trunk/src/main/java/cc/kune: common/client/actions/gwtui common/client/actions/gxtui common/client/actions/ui common/client/ui common/public core/client/services core/client/sitebar core/client/sn core/client/sn/actions/registry wave/client
by Vicente J. Ruiz Jurado 05 May '11

05 May '11

Author: vjrj_ Date: 2011-05-05 04:24:50 +0200 (Thu, 05 May 2011) New Revision: 1343 Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuTitleItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/client/services/FileDownloadUtils.java trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPresenter.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java trunk/src/main/java/cc/kune/wave/client/WebClient.java Log: Some style fixes Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -123,6 +123,12 @@ layout(); } + @Override + public void setIconUrl(final String url) { + iconLabel.setLeftIconUrl(url); + layout(); + } + public void setPressed(final boolean pressed) { final ToggleButton toggleButton = (ToggleButton) button; Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -192,6 +192,12 @@ layout(); } + @Override + public void setIconUrl(final String url) { + iconLabel.setRightIconUrl(url); + layout(); + } + private void setRadioChecked(final Boolean checked) { iconLabel.setLeftIconResource(checked ? res.radioChecked() : res.radioUnChecked()); } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -81,6 +81,11 @@ } @Override + public void setIconUrl(final String url) { + iconLabel.setLeftIconUrl(url); + } + + @Override public void setText(final String text) { iconLabel.setText(text); } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -114,6 +114,14 @@ } @Override + public void setIconUrl(final String url) { + if (notStandAlone) { + iconLabel.setLeftIconUrl(url); + layout(); + } + } + + @Override public void setText(final String text) { if (notStandAlone) { iconLabel.setText(text); Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuSeparatorGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuSeparatorGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -26,34 +26,40 @@ public class GwtMenuSeparatorGui extends AbstractGuiItem { - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - final AbstractGwtMenuGui menu = ((AbstractGwtMenuGui) descriptor.getParent().getValue(ParentWidget.PARENT_UI)); - if (menu == null) { - throw new UIException("To add a menu separator you need to add the menu before. Item: " + descriptor); - } - menu.addSeparator(); - return menu; + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + final AbstractGwtMenuGui menu = ((AbstractGwtMenuGui) descriptor.getParent().getValue( + ParentWidget.PARENT_UI)); + if (menu == null) { + throw new UIException("To add a menu separator you need to add the menu before. Item: " + + descriptor); } + menu.addSeparator(); + return menu; + } - @Override - protected void setEnabled(final boolean enabled) { - } + @Override + protected void setEnabled(final boolean enabled) { + } - @Override - protected void setIconStyle(final String style) { - } + @Override + protected void setIconStyle(final String style) { + } - @Override - protected void setText(final String text) { - } + @Override + public void setIconUrl(final String url) { + } - @Override - protected void setToolTipText(final String text) { - } + @Override + protected void setText(final String text) { + } - @Override - public boolean shouldBeAdded() { - return false; - } + @Override + protected void setToolTipText(final String text) { + } + + @Override + public boolean shouldBeAdded() { + return false; + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -28,57 +28,64 @@ public class GwtSubMenuGui extends AbstractGwtMenuGui { - private IconLabel iconLabel; - private MenuItem item; + private IconLabel iconLabel; + private MenuItem item; - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.descriptor = descriptor; - super.create(descriptor); - item = new MenuItem("", menu); - iconLabel = new IconLabel(""); - configureItemFromProperties(); - final AbstractGwtMenuGui parentMenu = ((AbstractGwtMenuGui) descriptor.getParent().getValue(PARENT_UI)); - final int position = descriptor.getPosition(); - if (position == GuiActionDescrip.NO_POSITION) { - parentMenu.add(item); - } else { - parentMenu.insert(position, item); - } - descriptor.putValue(ParentWidget.PARENT_UI, this); - return this; + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + super.create(descriptor); + item = new MenuItem("", menu); + iconLabel = new IconLabel(""); + configureItemFromProperties(); + final AbstractGwtMenuGui parentMenu = ((AbstractGwtMenuGui) descriptor.getParent().getValue( + PARENT_UI)); + final int position = descriptor.getPosition(); + if (position == GuiActionDescrip.NO_POSITION) { + parentMenu.add(item); + } else { + parentMenu.insert(position, item); } + descriptor.putValue(ParentWidget.PARENT_UI, this); + return this; + } - private void layout() { - item.setHTML(iconLabel.toString()); - } + private void layout() { + item.setHTML(iconLabel.toString()); + } - @Override - public void setEnabled(final boolean enabled) { - item.setVisible(enabled); - } + @Override + public void setEnabled(final boolean enabled) { + item.setVisible(enabled); + } - @Override - public void setIconStyle(final String style) { - iconLabel.setRightIcon(style); - layout(); - } + @Override + public void setIconStyle(final String style) { + iconLabel.setRightIcon(style); + layout(); + } - @Override - public void setText(final String text) { - iconLabel.setText(text); - layout(); - } + @Override + public void setIconUrl(final String url) { + iconLabel.setRightIconUrl(url); + layout(); + } - @Override - public void setToolTipText(final String tooltip) { - item.setTitle(tooltip); - } + @Override + public void setText(final String text) { + iconLabel.setText(text); + layout(); + } - @Override - public void setVisible(final boolean visible) { - item.setVisible(visible); - iconLabel.setVisible(visible); - layout(); - } + @Override + public void setToolTipText(final String tooltip) { + item.setTitle(tooltip); + } + + @Override + public void setVisible(final boolean visible) { + item.setVisible(visible); + iconLabel.setVisible(visible); + layout(); + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -28,60 +28,64 @@ public class GwtToolbarGui extends AbstractGuiItem implements ParentWidget { - private GwtComplexToolbar toolbar; + private GwtComplexToolbar toolbar; - @Override - public void add(final UIObject uiObject) { - toolbar.add(uiObject); - } + @Override + public void add(final UIObject uiObject) { + toolbar.add(uiObject); + } - public Widget addFill() { - return toolbar.addFill(); - } + public Widget addFill() { + return toolbar.addFill(); + } - public Widget addSeparator() { - return toolbar.addSeparator(); - } + public Widget addSeparator() { + return toolbar.addSeparator(); + } - public Widget addSpacer() { - return toolbar.addSpacer(); - } + public Widget addSpacer() { + return toolbar.addSpacer(); + } - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.descriptor = descriptor; - toolbar = new GwtComplexToolbar(); - initWidget(toolbar); - configureItemFromProperties(); - descriptor.putValue(ParentWidget.PARENT_UI, this); - return this; - } + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + toolbar = new GwtComplexToolbar(); + initWidget(toolbar); + configureItemFromProperties(); + descriptor.putValue(ParentWidget.PARENT_UI, this); + return this; + } - @Override - public void insert(final int position, final UIObject widget) { - toolbar.insert(widget, position); - } + @Override + public void insert(final int position, final UIObject widget) { + toolbar.insert(widget, position); + } - @Override - protected void setEnabled(final boolean enabled) { - } + @Override + protected void setEnabled(final boolean enabled) { + } - @Override - protected void setIconStyle(final String style) { - } + @Override + protected void setIconStyle(final String style) { + } - @Override - protected void setText(final String text) { - } + @Override + public void setIconUrl(final String url) { + } - @Override - protected void setToolTipText(final String text) { - toolbar.setTitle(text); - } + @Override + protected void setText(final String text) { + } - @Override - public boolean shouldBeAdded() { - return true; - } + @Override + protected void setToolTipText(final String text) { + toolbar.setTitle(text); + } + @Override + public boolean shouldBeAdded() { + return true; + } + } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -30,56 +30,62 @@ public class GwtToolbarSeparatorGui extends AbstractGuiItem { - private Widget widget; + private Widget widget; - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.descriptor = descriptor; - final GwtToolbarGui toolbar = ((GwtToolbarGui) descriptor.getParent().getValue(ParentWidget.PARENT_UI)); - if (toolbar == null) { - throw new UIException("To add a toolbar separator you need to add the toolbar before. Item: " + descriptor); - } - final Type type = ((ToolbarSeparatorDescriptor) descriptor).getSeparatorType(); - switch (type) { - case fill: - widget = toolbar.addFill(); - break; - case spacer: - widget = toolbar.addSpacer(); - break; - case separator: - widget = toolbar.addSeparator(); - break; - default: - break; - } - configureItemFromProperties(); - return toolbar; + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + final GwtToolbarGui toolbar = ((GwtToolbarGui) descriptor.getParent().getValue( + ParentWidget.PARENT_UI)); + if (toolbar == null) { + throw new UIException("To add a toolbar separator you need to add the toolbar before. Item: " + + descriptor); } - - @Override - protected void setEnabled(final boolean enabled) { + final Type type = ((ToolbarSeparatorDescriptor) descriptor).getSeparatorType(); + switch (type) { + case fill: + widget = toolbar.addFill(); + break; + case spacer: + widget = toolbar.addSpacer(); + break; + case separator: + widget = toolbar.addSeparator(); + break; + default: + break; } + configureItemFromProperties(); + return toolbar; + } - @Override - protected void setIconStyle(final String style) { - } + @Override + protected void setEnabled(final boolean enabled) { + } - @Override - protected void setText(final String text) { - } + @Override + protected void setIconStyle(final String style) { + } - @Override - protected void setToolTipText(final String text) { - } + @Override + public void setIconUrl(final String url) { + } - @Override - public void setVisible(final boolean visible) { - widget.setVisible(visible); - } + @Override + protected void setText(final String text) { + } - @Override - public boolean shouldBeAdded() { - return false; - } + @Override + protected void setToolTipText(final String text) { + } + + @Override + public void setVisible(final boolean visible) { + widget.setVisible(visible); + } + + @Override + public boolean shouldBeAdded() { + return false; + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -28,6 +28,7 @@ import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.PushButtonDescriptor; +import cc.kune.common.client.errors.NotImplementedException; import com.extjs.gxt.ui.client.Style.ButtonScale; import com.extjs.gxt.ui.client.event.ButtonEvent; @@ -40,112 +41,118 @@ public abstract class AbstractGxtButtonGui extends AbstractChildGuiItem { - private Button button; + private Button button; - public AbstractGxtButtonGui() { - super(); - } + public AbstractGxtButtonGui() { + super(); + } - public AbstractGxtButtonGui(final ButtonDescriptor buttonDescriptor) { - super(buttonDescriptor); - } + public AbstractGxtButtonGui(final ButtonDescriptor buttonDescriptor) { + super(buttonDescriptor); + } - @Override - protected void addStyle(final String style) { - button.addStyleName(style); - } + @Override + protected void addStyle(final String style) { + button.addStyleName(style); + } - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.descriptor = descriptor; - descriptor.putValue(ParentWidget.PARENT_UI, this); - if (descriptor instanceof PushButtonDescriptor) { - button = new ToggleButton(); - } else { - button = new Button(); - } - button.setAutoWidth(false); - button.setAutoHeight(false); - button.setBorders(false); - final String id = descriptor.getId(); - if (id != null) { - button.ensureDebugId(id); - } - button.addSelectionListener(new SelectionListener<ButtonEvent>() { - @Override - public void componentSelected(final ButtonEvent event) { - descriptor.fire(new ActionEvent(button, getTargetObjectOfAction(descriptor), Event.as(event.getEvent()))); - } - }); - if (!descriptor.isChild()) { - // If button is inside a toolbar don't init... - initWidget(button); - } else { - if (descriptor.isChild()) { - child = button; - } - } - super.create(descriptor); - configureItemFromProperties(); - return this; + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + descriptor.putValue(ParentWidget.PARENT_UI, this); + if (descriptor instanceof PushButtonDescriptor) { + button = new ToggleButton(); + } else { + button = new Button(); } - - @Override - protected void setEnabled(final boolean enabled) { - button.setEnabled(enabled); + button.setAutoWidth(false); + button.setAutoHeight(false); + button.setBorders(false); + final String id = descriptor.getId(); + if (id != null) { + button.ensureDebugId(id); } - - @Override - public void setIconResource(final ImageResource icon) { - button.setIcon(AbstractImagePrototype.create(icon)); - button.setScale(ButtonScale.SMALL); + button.addSelectionListener(new SelectionListener<ButtonEvent>() { + @Override + public void componentSelected(final ButtonEvent event) { + descriptor.fire(new ActionEvent(button, getTargetObjectOfAction(descriptor), + Event.as(event.getEvent()))); + } + }); + if (!descriptor.isChild()) { + // If button is inside a toolbar don't init... + initWidget(button); + } else { + if (descriptor.isChild()) { + child = button; + } } + super.create(descriptor); + configureItemFromProperties(); + return this; + } - @Override - protected void setIconStyle(final String style) { - button.setIconStyle(style); - button.setScale(ButtonScale.SMALL); - } + @Override + protected void setEnabled(final boolean enabled) { + button.setEnabled(enabled); + } - public void setPressed(final boolean pressed) { - final ToggleButton toggleButton = (ToggleButton) button; + @Override + public void setIconResource(final ImageResource icon) { + button.setIcon(AbstractImagePrototype.create(icon)); + button.setScale(ButtonScale.SMALL); + } - if (toggleButton.isPressed() != pressed) { - toggleButton.toggle(pressed); - } - } + @Override + protected void setIconStyle(final String style) { + button.setIconStyle(style); + button.setScale(ButtonScale.SMALL); + } - @Override - protected void setText(final String text) { - button.setText(text); - } + @Override + public void setIconUrl(final String url) { + throw new NotImplementedException(); + } - @Override - protected void setToolTipText(final String tooltip) { - if (tooltip != null && !tooltip.isEmpty()) { - final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); - if (key == null) { - // button.setToolTip(new GxtDefTooltip(tooltip)); - button.setTitle(tooltip); - } else { - // button.setToolTip(new GxtDefTooltip(tooltip + - // key.toString())); - button.setTitle(tooltip + key.toString()); - } - } + public void setPressed(final boolean pressed) { + final ToggleButton toggleButton = (ToggleButton) button; + + if (toggleButton.isPressed() != pressed) { + toggleButton.toggle(pressed); } + } - @Override - public void setVisible(final boolean visible) { - if (button.isRendered()) { - // ?? - } - button.setVisible(visible); + @Override + protected void setText(final String text) { + button.setText(text); + } + @Override + protected void setToolTipText(final String tooltip) { + if (tooltip != null && !tooltip.isEmpty()) { + final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); + if (key == null) { + // button.setToolTip(new GxtDefTooltip(tooltip)); + button.setTitle(tooltip); + } else { + // button.setToolTip(new GxtDefTooltip(tooltip + + // key.toString())); + button.setTitle(tooltip + key.toString()); + } } + } - @Override - public boolean shouldBeAdded() { - return !descriptor.isChild(); + @Override + public void setVisible(final boolean visible) { + if (button.isRendered()) { + // ?? } + button.setVisible(visible); + + } + + @Override + public boolean shouldBeAdded() { + return !descriptor.isChild(); + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -27,6 +27,7 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.Position; +import cc.kune.common.client.errors.NotImplementedException; import com.extjs.gxt.ui.client.widget.menu.Menu; import com.extjs.gxt.ui.client.widget.menu.MenuItem; @@ -36,98 +37,103 @@ public abstract class AbstractGxtMenuGui extends AbstractChildGuiItem implements ParentWidget { - public enum MenuPosition { - b, // The top left corner (default) - bl, // The center of the top edge - br, // The bottom right corner ,// The top right corner - c, // The center of the left edge - l, // In the center of the element - r, // The center of the right edge - t, // The bottom left corner - tl, // The center of the bottom edge - tr - } - public static final String DEF_MENU_POSITION = "bl"; - public static final String MENU_POSITION = "menu-position"; - protected Menu menu; + public enum MenuPosition { + b, // The top left corner (default) + bl, // The center of the top edge + br, // The bottom right corner ,// The top right corner + c, // The center of the left edge + l, // In the center of the element + r, // The center of the right edge + t, // The bottom left corner + tl, // The center of the bottom edge + tr + } + public static final String DEF_MENU_POSITION = "bl"; + public static final String MENU_POSITION = "menu-position"; + protected Menu menu; - public AbstractGxtMenuGui() { - } + public AbstractGxtMenuGui() { + } - public AbstractGxtMenuGui(final GuiActionDescrip descriptor) { - super(descriptor); - } + public AbstractGxtMenuGui(final GuiActionDescrip descriptor) { + super(descriptor); + } - @Override - public void add(final UIObject item) { - menu.add((MenuItem) item); - } + @Override + public void add(final UIObject item) { + menu.add((MenuItem) item); + } - public void addSeparator() { - menu.add(new SeparatorMenuItem()); - } + public void addSeparator() { + menu.add(new SeparatorMenuItem()); + } - @Override - public void configureItemFromProperties() { - super.configureItemFromProperties(); - descriptor.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(final PropertyChangeEvent event) { - if (event.getPropertyName().equals(MenuDescriptor.MENU_CLEAR)) { - menu.removeAll(); - } - } - }); - } + @Override + public void configureItemFromProperties() { + super.configureItemFromProperties(); + descriptor.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(final PropertyChangeEvent event) { + if (event.getPropertyName().equals(MenuDescriptor.MENU_CLEAR)) { + menu.removeAll(); + } + } + }); + } - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.descriptor = descriptor; - super.create(descriptor); - menu = new Menu(); - descriptor.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(final PropertyChangeEvent event) { - if (event.getPropertyName().equals(MenuDescriptor.MENU_HIDE)) { - menu.hide(); - } - } - }); - descriptor.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(final PropertyChangeEvent event) { - if (event.getPropertyName().equals(MenuDescriptor.MENU_SHOW)) { - show(descriptor.getValue(MenuDescriptor.MENU_SHOW_NEAR_TO)); - } - } - }); - return this; - } + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + super.create(descriptor); + menu = new Menu(); + descriptor.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(final PropertyChangeEvent event) { + if (event.getPropertyName().equals(MenuDescriptor.MENU_HIDE)) { + menu.hide(); + } + } + }); + descriptor.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(final PropertyChangeEvent event) { + if (event.getPropertyName().equals(MenuDescriptor.MENU_SHOW)) { + show(descriptor.getValue(MenuDescriptor.MENU_SHOW_NEAR_TO)); + } + } + }); + return this; + } - protected String getMenuPosition() { - final MenuPosition position = (MenuPosition) descriptor.getValue(MENU_POSITION); - return position == null ? DEF_MENU_POSITION : position.name(); - } + protected String getMenuPosition() { + final MenuPosition position = (MenuPosition) descriptor.getValue(MENU_POSITION); + return position == null ? DEF_MENU_POSITION : position.name(); + } - @Override - public void insert(final int position, final UIObject item) { - menu.insert((MenuItem) item, position); - } + @Override + public void insert(final int position, final UIObject item) { + menu.insert((MenuItem) item, position); + } - @Override - public boolean shouldBeAdded() { - return !descriptor.isChild(); - } + @Override + public void setIconUrl(final String url) { + throw new NotImplementedException(); + } - public void show(final Object relative) { - if (relative instanceof String) { - menu.show(RootPanel.get((String) relative).getElement(), getMenuPosition()); - } else if (relative instanceof UIObject) { - menu.show(((UIObject) relative).getElement(), getMenuPosition()); - } else if (relative instanceof Position) { - final Position position = (Position) relative; - menu.showAt(position.getX(), position.getY()); - } + @Override + public boolean shouldBeAdded() { + return !descriptor.isChild(); + } + + public void show(final Object relative) { + if (relative instanceof String) { + menu.show(RootPanel.get((String) relative).getElement(), getMenuPosition()); + } else if (relative instanceof UIObject) { + menu.show(((UIObject) relative).getElement(), getMenuPosition()); + } else if (relative instanceof Position) { + final Position position = (Position) relative; + menu.showAt(position.getX(), position.getY()); } + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -31,6 +31,7 @@ import cc.kune.common.client.actions.ui.descrip.MenuCheckItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; +import cc.kune.common.client.errors.NotImplementedException; import cc.kune.common.client.utils.TextUtils; import com.extjs.gxt.ui.client.event.MenuEvent; @@ -45,123 +46,129 @@ public abstract class AbstractGxtMenuItemGui extends AbstractChildGuiItem { - private MenuItem item; + private MenuItem item; - public AbstractGxtMenuItemGui() { - super(); - } + public AbstractGxtMenuItemGui() { + super(); + } - public AbstractGxtMenuItemGui(final MenuItemDescriptor descriptor) { - super(descriptor); + public AbstractGxtMenuItemGui(final MenuItemDescriptor descriptor) { + super(descriptor); - } + } - private void confCheckListener(final MenuItemDescriptor descriptor, final CheckMenuItem checkItem) { - descriptor.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(final PropertyChangeEvent event) { - if (event.getPropertyName().equals(MenuCheckItemDescriptor.CHECKED)) { - checkItem.setChecked((Boolean) event.getNewValue()); - } - } - }); - } - - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.descriptor = descriptor; - if (descriptor instanceof MenuRadioItemDescriptor) { - final CheckMenuItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); - checkItem.setGroup(((MenuRadioItemDescriptor) descriptor).getGroup()); - confCheckListener((MenuItemDescriptor) descriptor, checkItem); - item = checkItem; - } else if (descriptor instanceof MenuCheckItemDescriptor) { - final CheckMenuItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); - confCheckListener((MenuItemDescriptor) descriptor, checkItem); - item = checkItem; - } else { - item = new MenuItem(""); + private void confCheckListener(final MenuItemDescriptor descriptor, final CheckMenuItem checkItem) { + descriptor.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(final PropertyChangeEvent event) { + if (event.getPropertyName().equals(MenuCheckItemDescriptor.CHECKED)) { + checkItem.setChecked((Boolean) event.getNewValue()); } + } + }); + } - final String id = descriptor.getId(); - if (id != null) { - item.ensureDebugId(id); - } - item.addSelectionListener(new SelectionListener<MenuEvent>() { - @Override - public void componentSelected(final MenuEvent ce) { - final AbstractAction action = descriptor.getAction(); - if (action != null) { - action.actionPerformed(new ActionEvent(item, getTargetObjectOfAction(descriptor), - Event.getCurrentEvent())); - } - } - }); - child = item; - super.create(descriptor); - configureItemFromProperties(); - return this; + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + if (descriptor instanceof MenuRadioItemDescriptor) { + final CheckMenuItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); + checkItem.setGroup(((MenuRadioItemDescriptor) descriptor).getGroup()); + confCheckListener((MenuItemDescriptor) descriptor, checkItem); + item = checkItem; + } else if (descriptor instanceof MenuCheckItemDescriptor) { + final CheckMenuItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); + confCheckListener((MenuItemDescriptor) descriptor, checkItem); + item = checkItem; + } else { + item = new MenuItem(""); } - private CheckMenuItem createCheckItem(final MenuItemDescriptor descriptor) { - final CheckMenuItem checkItem = new CheckMenuItem(); - checkItem.setChecked(((MenuCheckItemDescriptor) descriptor).isChecked()); - return checkItem; + final String id = descriptor.getId(); + if (id != null) { + item.ensureDebugId(id); } + item.addSelectionListener(new SelectionListener<MenuEvent>() { + @Override + public void componentSelected(final MenuEvent ce) { + final AbstractAction action = descriptor.getAction(); + if (action != null) { + action.actionPerformed(new ActionEvent(item, getTargetObjectOfAction(descriptor), + Event.getCurrentEvent())); + } + } + }); + child = item; + super.create(descriptor); + configureItemFromProperties(); + return this; + } - private String createShortCut(final KeyStroke key, final String style) { - // See: https://yui-ext.com/forum/showthread.php?t=5762 - final Element keyLabel = DOM.createSpan(); - keyLabel.setId(style); - keyLabel.setInnerText(key.toString()); - return keyLabel.getString(); - } + private CheckMenuItem createCheckItem(final MenuItemDescriptor descriptor) { + final CheckMenuItem checkItem = new CheckMenuItem(); + checkItem.setChecked(((MenuCheckItemDescriptor) descriptor).isChecked()); + return checkItem; + } - public MenuItem getItem() { - return item; - } + private String createShortCut(final KeyStroke key, final String style) { + // See: https://yui-ext.com/forum/showthread.php?t=5762 + final Element keyLabel = DOM.createSpan(); + keyLabel.setId(style); + keyLabel.setInnerText(key.toString()); + return keyLabel.getString(); + } - @Override - protected void setEnabled(final boolean enabled) { - item.setVisible(enabled); - } + public MenuItem getItem() { + return item; + } - @Override - public void setIconResource(final ImageResource icon) { - item.setIcon(AbstractImagePrototype.create(icon)); - } + @Override + protected void setEnabled(final boolean enabled) { + item.setVisible(enabled); + } - @Override - protected void setIconStyle(final String style) { - item.setIconStyle(style); - } + @Override + public void setIconResource(final ImageResource icon) { + item.setIcon(AbstractImagePrototype.create(icon)); + } - @Override - protected void setText(final String text) { - if (text != null) { - final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); - if (key == null) { - item.setText(text); - } else { - item.setText(text + createShortCut(key, "oc-mshortcut-hidden") + createShortCut(key, "oc-mshortcut")); - } - } - } + @Override + protected void setIconStyle(final String style) { + item.setIconStyle(style); + } - @Override - protected void setToolTipText(final String tooltip) { - if (TextUtils.notEmpty(tooltip)) { - item.setToolTip(new GxtDefTooltip(tooltip)); - } + @Override + public void setIconUrl(final String url) { + throw new NotImplementedException(); + } + + @Override + protected void setText(final String text) { + if (text != null) { + final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); + if (key == null) { + item.setText(text); + } else { + item.setText(text + createShortCut(key, "oc-mshortcut-hidden") + + createShortCut(key, "oc-mshortcut")); + } } + } - @Override - public void setVisible(final boolean visible) { - item.setVisible(visible); + @Override + protected void setToolTipText(final String tooltip) { + if (TextUtils.notEmpty(tooltip)) { + item.setToolTip(new GxtDefTooltip(tooltip)); } + } - @Override - public boolean shouldBeAdded() { // NOPMD by vjrj on 18/01/11 0:48 - return false; - } + @Override + public void setVisible(final boolean visible) { + item.setVisible(visible); + } + + @Override + public boolean shouldBeAdded() { // NOPMD by vjrj on 18/01/11 0:48 + return false; + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -25,6 +25,7 @@ import cc.kune.common.client.actions.ui.ParentWidget; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.common.client.errors.NotImplementedException; import cc.kune.common.client.utils.TextUtils; import com.extjs.gxt.ui.client.Style.ButtonScale; @@ -39,125 +40,130 @@ public class GxtMenuGui extends AbstractGxtMenuGui implements ParentWidget { - private SplitButton button; - private boolean notStandAlone; + private SplitButton button; + private boolean notStandAlone; - public GxtMenuGui() { - super(); - } + public GxtMenuGui() { + super(); + } - @Override - public void add(final UIObject item) { - menu.add((MenuItem) item); - } + @Override + public void add(final UIObject item) { + menu.add((MenuItem) item); + } - @Override - public void addSeparator() { - menu.add(new SeparatorMenuItem()); - } + @Override + public void addSeparator() { + menu.add(new SeparatorMenuItem()); + } - @Override - protected void addStyle(final String style) { - button.addStyleName(style); - } + @Override + protected void addStyle(final String style) { + button.addStyleName(style); + } - @Override - public void configureItemFromProperties() { - super.configureItemFromProperties(); - descriptor.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(final PropertyChangeEvent event) { - if (event.getPropertyName().equals(MenuDescriptor.MENU_CLEAR)) { - menu.removeAll(); - } - } - }); - } + @Override + public void configureItemFromProperties() { + super.configureItemFromProperties(); + descriptor.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(final PropertyChangeEvent event) { + if (event.getPropertyName().equals(MenuDescriptor.MENU_CLEAR)) { + menu.removeAll(); + } + } + }); + } - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.descriptor = descriptor; - descriptor.putValue(ParentWidget.PARENT_UI, this); - // Standalone menus are menus without and associated button in a - // toolbar (sometimes, a menu showed in a grid, or other special - // widgets) - notStandAlone = !((MenuDescriptor) descriptor).isStandalone(); - if (notStandAlone) { - button = new SplitButton(""); - button.setStylePrimaryName("oc-button"); - button.addSelectionListener(new SelectionListener<ButtonEvent>() { - @Override - public void componentSelected(final ButtonEvent ce) { - show(button); - } - }); - final String id = descriptor.getId(); - if (id != null) { - button.ensureDebugId(id); - } - if (!descriptor.isChild()) { - initWidget(button); - } else { - child = button; - } + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + descriptor.putValue(ParentWidget.PARENT_UI, this); + // Standalone menus are menus without and associated button in a + // toolbar (sometimes, a menu showed in a grid, or other special + // widgets) + notStandAlone = !((MenuDescriptor) descriptor).isStandalone(); + if (notStandAlone) { + button = new SplitButton(""); + button.setStylePrimaryName("oc-button"); + button.addSelectionListener(new SelectionListener<ButtonEvent>() { + @Override + public void componentSelected(final ButtonEvent ce) { + show(button); } - super.create(descriptor); - configureItemFromProperties(); - return this; + }); + final String id = descriptor.getId(); + if (id != null) { + button.ensureDebugId(id); + } + if (!descriptor.isChild()) { + initWidget(button); + } else { + child = button; + } } + super.create(descriptor); + configureItemFromProperties(); + return this; + } - @Override - public void insert(final int position, final UIObject item) { - menu.insert((MenuItem) item, position); - } + @Override + public void insert(final int position, final UIObject item) { + menu.insert((MenuItem) item, position); + } - @Override - public void setEnabled(final boolean enabled) { - if (button != null) { - button.setEnabled(enabled); - } + @Override + public void setEnabled(final boolean enabled) { + if (button != null) { + button.setEnabled(enabled); } + } - @Override - public void setIconResource(final ImageResource icon) { - if (button != null) { - button.setIcon(AbstractImagePrototype.create(icon)); - button.setScale(ButtonScale.SMALL); - } + @Override + public void setIconResource(final ImageResource icon) { + if (button != null) { + button.setIcon(AbstractImagePrototype.create(icon)); + button.setScale(ButtonScale.SMALL); } + } - @Override - public void setIconStyle(final String style) { - if (button != null) { - button.setIconStyle(style); - } + @Override + public void setIconStyle(final String style) { + if (button != null) { + button.setIconStyle(style); } + } - @Override - public void setText(final String text) { - if (button != null) { - button.setText(text); - } + @Override + public void setIconUrl(final String url) { + throw new NotImplementedException(); + } + + @Override + public void setText(final String text) { + if (button != null) { + button.setText(text); } + } - @Override - public void setToolTipText(final String tooltip) { - if (button != null) { - if (TextUtils.notEmpty(tooltip)) { - button.setToolTip(new GxtDefTooltip(tooltip)); - } - } + @Override + public void setToolTipText(final String tooltip) { + if (button != null) { + if (TextUtils.notEmpty(tooltip)) { + button.setToolTip(new GxtDefTooltip(tooltip)); + } } + } - @Override - public void setVisible(final boolean visible) { - if (button != null) { - button.setVisible(visible); - } + @Override + public void setVisible(final boolean visible) { + if (button != null) { + button.setVisible(visible); } + } - @Override - public boolean shouldBeAdded() { - return notStandAlone; - } + @Override + public boolean shouldBeAdded() { + return notStandAlone; + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuSeparatorGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuSeparatorGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -28,40 +28,44 @@ public class GxtMenuSeparatorGui extends AbstractChildGuiItem implements ParentWidget { - @Override - public void add(final UIObject uiObject) { - } + @Override + public void add(final UIObject uiObject) { + } - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.create(descriptor); - final GxtMenuGui menu = (GxtMenuGui) parent; - menu.addSeparator(); - return menu; - } + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.create(descriptor); + final GxtMenuGui menu = (GxtMenuGui) parent; + menu.addSeparator(); + return menu; + } - @Override - public void insert(final int position, final UIObject widget) { - } + @Override + public void insert(final int position, final UIObject widget) { + } - @Override - protected void setEnabled(final boolean enabled) { - } + @Override + protected void setEnabled(final boolean enabled) { + } - @Override - protected void setIconStyle(final String style) { - } + @Override + protected void setIconStyle(final String style) { + } - @Override - protected void setText(final String text) { - } + @Override + public void setIconUrl(final String url) { + } - @Override - protected void setToolTipText(final String text) { - } + @Override + protected void setText(final String text) { + } - @Override - public boolean shouldBeAdded() { - return false; - } + @Override + protected void setToolTipText(final String text) { + } + + @Override + public boolean shouldBeAdded() { + return false; + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuTitleItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuTitleItemGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuTitleItemGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -23,73 +23,79 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.errors.NotImplementedException; import cc.kune.common.client.utils.TextUtils; import com.extjs.gxt.ui.client.widget.menu.HeaderMenuItem; public class GxtMenuTitleItemGui extends AbstractChildGuiItem { - private HeaderMenuItem item; + private HeaderMenuItem item; - public GxtMenuTitleItemGui() { - super(); - } + public GxtMenuTitleItemGui() { + super(); + } - public GxtMenuTitleItemGui(final MenuItemDescriptor descriptor) { - super(descriptor); + public GxtMenuTitleItemGui(final MenuItemDescriptor descriptor) { + super(descriptor); - } + } - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.descriptor = descriptor; - item = new HeaderMenuItem(""); + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + item = new HeaderMenuItem(""); - final String id = descriptor.getId(); - if (id != null) { - item.ensureDebugId(id); - } - child = item; - super.create(descriptor); - configureItemFromProperties(); - return this; + final String id = descriptor.getId(); + if (id != null) { + item.ensureDebugId(id); } + child = item; + super.create(descriptor); + configureItemFromProperties(); + return this; + } - public HeaderMenuItem getItem() { - return item; - } + public HeaderMenuItem getItem() { + return item; + } - @Override - protected void setEnabled(final boolean enabled) { - item.setVisible(enabled); - } + @Override + protected void setEnabled(final boolean enabled) { + item.setVisible(enabled); + } - @Override - protected void setIconStyle(final String style) { - item.addStyleName(style); - } + @Override + protected void setIconStyle(final String style) { + item.addStyleName(style); + } - @Override - protected void setText(final String text) { - if (text != null) { - item.setText(text); - } - } + @Override + public void setIconUrl(final String url) { + throw new NotImplementedException(); + } - @Override - protected void setToolTipText(final String tooltip) { - if (TextUtils.notEmpty(tooltip)) { - item.setToolTip(new GxtDefTooltip(tooltip)); - } + @Override + protected void setText(final String text) { + if (text != null) { + item.setText(text); } + } - @Override - public void setVisible(final boolean visible) { - item.setVisible(visible); + @Override + protected void setToolTipText(final String tooltip) { + if (TextUtils.notEmpty(tooltip)) { + item.setToolTip(new GxtDefTooltip(tooltip)); } + } - @Override - public boolean shouldBeAdded() { // NOPMD by vjrj on 18/01/11 0:48 - return false; - } + @Override + public void setVisible(final boolean visible) { + item.setVisible(visible); + } + + @Override + public boolean shouldBeAdded() { // NOPMD by vjrj on 18/01/11 0:48 + return false; + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -29,69 +29,73 @@ public class GxtToolbarGui extends AbstractGuiItem implements ParentWidget { - private ToolBar toolbar; + private ToolBar toolbar; - public GxtToolbarGui() { - super(); - } + public GxtToolbarGui() { + super(); + } - public GxtToolbarGui(final GuiActionDescrip descriptor) { - super(descriptor); - } + public GxtToolbarGui(final GuiActionDescrip descriptor) { + super(descriptor); + } - @Override - public void add(final UIObject uiObject) { - toolbar.add((Component) uiObject); - } + @Override + public void add(final UIObject uiObject) { + toolbar.add((Component) uiObject); + } - // public FillToolItem addFill() { - // final FillToolItem item = new FillToolItem(); - // toolbar.add(item); - // return item; - // } - // - // public SeparatorToolItem addSeparator() { - // final SeparatorToolItem item = new SeparatorToolItem(); - // toolbar.add(item); - // return item; - // } - // - // public LabelToolItem addSpacer() { - // final LabelToolItem item = new LabelToolItem(); - // toolbar.add(item); - // return item; - // } + // public FillToolItem addFill() { + // final FillToolItem item = new FillToolItem(); + // toolbar.add(item); + // return item; + // } + // + // public SeparatorToolItem addSeparator() { + // final SeparatorToolItem item = new SeparatorToolItem(); + // toolbar.add(item); + // return item; + // } + // + // public LabelToolItem addSpacer() { + // final LabelToolItem item = new LabelToolItem(); + // toolbar.add(item); + // return item; + // } - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.descriptor = descriptor; - toolbar = new ToolBar(); - initWidget(toolbar); - configureItemFromProperties(); - descriptor.putValue(ParentWidget.PARENT_UI, this); - return this; - } + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + toolbar = new ToolBar(); + initWidget(toolbar); + configureItemFromProperties(); + descriptor.putValue(ParentWidget.PARENT_UI, this); + return this; + } - @Override - public void insert(final int position, final UIObject uiObject) { - toolbar.insert((Component) uiObject, position); - } + @Override + public void insert(final int position, final UIObject uiObject) { + toolbar.insert((Component) uiObject, position); + } - @Override - protected void setEnabled(final boolean enabled) { - } + @Override + protected void setEnabled(final boolean enabled) { + } - @Override - protected void setIconStyle(final String style) { - } + @Override + protected void setIconStyle(final String style) { + } - @Override - protected void setText(final String text) { - } + @Override + public void setIconUrl(final String url) { + } - @Override - protected void setToolTipText(final String text) { - toolbar.setTitle(text); - } + @Override + protected void setText(final String text) { + } + @Override + protected void setToolTipText(final String text) { + toolbar.setTitle(text); + } + } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -31,50 +31,54 @@ public class GxtToolbarSeparatorGui extends AbstractChildGuiItem { - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - final GxtToolbarGui toolbar = (GxtToolbarGui) parent; - final Type type = ((ToolbarSeparatorDescriptor) descriptor).getSeparatorType(); - switch (type) { - case fill: - child = new FillToolItem(); - break; - case spacer: - child = new LabelToolItem(); - break; - case separator: - child = new SeparatorToolItem(); - break; - default: - break; - } - super.create(descriptor); - configureItemFromProperties(); - return toolbar; + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + final GxtToolbarGui toolbar = (GxtToolbarGui) parent; + final Type type = ((ToolbarSeparatorDescriptor) descriptor).getSeparatorType(); + switch (type) { + case fill: + child = new FillToolItem(); + break; + case spacer: + child = new LabelToolItem(); + break; + case separator: + child = new SeparatorToolItem(); + break; + default: + break; } + super.create(descriptor); + configureItemFromProperties(); + return toolbar; + } - @Override - protected void setEnabled(final boolean enabled) { - // do nothing - } + @Override + protected void setEnabled(final boolean enabled) { + // do nothing + } - @Override - protected void setIconStyle(final String style) { - // do nothing - } + @Override + protected void setIconStyle(final String style) { + // do nothing + } - @Override - protected void setText(final String text) { - // do nothing - } + @Override + public void setIconUrl(final String url) { + } - @Override - protected void setToolTipText(final String text) { - // do nothing - } + @Override + protected void setText(final String text) { + // do nothing + } - @Override - public boolean shouldBeAdded() { - return false; - } + @Override + protected void setToolTipText(final String text) { + // do nothing + } + + @Override + public boolean shouldBeAdded() { + return false; + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -35,128 +35,135 @@ public abstract class AbstractGuiItem extends Composite implements GuiBinding { - protected GuiActionDescrip descriptor; + protected GuiActionDescrip descriptor; - public AbstractGuiItem() { - super(); - } + public AbstractGuiItem() { + super(); + } - public AbstractGuiItem(final GuiActionDescrip descriptor) { - super(); - this.descriptor = descriptor; - } + public AbstractGuiItem(final GuiActionDescrip descriptor) { + super(); + this.descriptor = descriptor; + } - protected void addStyle(final String style) { - if (super.isOrWasAttached()) { - super.addStyleName(style); - } + protected void addStyle(final String style) { + if (super.isOrWasAttached()) { + super.addStyleName(style); } + } - protected void clearStyles() { - if (super.isOrWasAttached()) { - super.setStyleName("k-none"); - } + protected void clearStyles() { + if (super.isOrWasAttached()) { + super.setStyleName("k-none"); } + } - private void configure() { - configureProperties(); - final PropertyChangeListener changeListener = createActionPropertyChangeListener(); - descriptor.getAction().addPropertyChangeListener(changeListener); - descriptor.addPropertyChangeListener(changeListener); - } + private void configure() { + configureProperties(); + final PropertyChangeListener changeListener = createActionPropertyChangeListener(); + descriptor.getAction().addPropertyChangeListener(changeListener); + descriptor.addPropertyChangeListener(changeListener); + } - /** - * Sets the item properties from the stored values - */ - public void configureItemFromProperties() { - configure(); - } + /** + * Sets the item properties from the stored values + */ + public void configureItemFromProperties() { + configure(); + } - private void configureProperties() { - setText((String) (descriptor.getValue(Action.NAME))); - setToolTipText((String) (descriptor.getValue(Action.SHORT_DESCRIPTION))); - setIcon(descriptor.getValue(Action.SMALL_ICON)); - setEnabled((Boolean) descriptor.getValue(AbstractAction.ENABLED)); - setVisible((Boolean) descriptor.getValue(GuiActionDescrip.VISIBLE)); - setStyles((String) descriptor.getValue(Action.STYLES)); - } + private void configureProperties() { + setText((String) (descriptor.getValue(Action.NAME))); + setToolTipText((String) (descriptor.getValue(Action.SHORT_DESCRIPTION))); + setIcon(descriptor.getValue(Action.SMALL_ICON)); + setEnabled((Boolean) descriptor.getValue(AbstractAction.ENABLED)); + setVisible((Boolean) descriptor.getValue(GuiActionDescrip.VISIBLE)); + setStyles((String) descriptor.getValue(Action.STYLES)); + } - @Override - public abstract AbstractGuiItem create(final GuiActionDescrip descriptor); + @Override + public abstract AbstractGuiItem create(final GuiActionDescrip descriptor); - private PropertyChangeListener createActionPropertyChangeListener() { - return new PropertyChangeListener() { - @Override - public void propertyChange(final PropertyChangeEvent event) { - final Object newValue = event.getNewValue(); - if (event.getPropertyName().equals(Action.ENABLED)) { - setEnabled((Boolean) newValue); - } else if (event.getPropertyName().equals(Action.NAME)) { - setText((String) newValue); - } else if (event.getPropertyName().equals(Action.SMALL_ICON)) { - setIcon(newValue); - } else if (event.getPropertyName().equals(Action.SHORT_DESCRIPTION)) { - setToolTipText((String) newValue); - } else if (event.getPropertyName().equals(GuiActionDescrip.VISIBLE)) { - setVisible((Boolean) newValue); - } else if (event.getPropertyName().equals(Action.STYLES)) { - setStyles((String) newValue); - } - } - }; - } + private PropertyChangeListener createActionPropertyChangeListener() { + return new PropertyChangeListener() { + @Override + public void propertyChange(final PropertyChangeEvent event) { + final Object newValue = event.getNewValue(); + if (event.getPropertyName().equals(Action.ENABLED)) { + setEnabled((Boolean) newValue); + } else if (event.getPropertyName().equals(Action.NAME)) { + setText((String) newValue); + } else if (event.getPropertyName().equals(Action.SMALL_ICON)) { + setIcon(newValue); + } else if (event.getPropertyName().equals(Action.SHORT_DESCRIPTION)) { + setToolTipText((String) newValue); + } else if (event.getPropertyName().equals(GuiActionDescrip.VISIBLE)) { + setVisible((Boolean) newValue); + } else if (event.getPropertyName().equals(Action.STYLES)) { + setStyles((String) newValue); + } + } + }; + } - protected Object getTargetObjectOfAction(final GuiActionDescrip descriptor) { - // If the action is associated with a item (like a Group, a - // group shortname, a username, etc) we pass this item to - // the action, if not we only pass the menuitem - return descriptor.hasTarget() ? descriptor.getTarget() - : descriptor.isChild() ? descriptor.getParent().getTarget() : ActionEvent.NO_TARGET; - } + protected Object getTargetObjectOfAction(final GuiActionDescrip descriptor) { + // If the action is associated with a item (like a Group, a + // group shortname, a username, etc) we pass this item to + // the action, if not we only pass the menuitem + return descriptor.hasTarget() ? descriptor.getTarget() + : descriptor.isChild() ? descriptor.getParent().getTarget() : ActionEvent.NO_TARGET; + } - protected abstract void setEnabled(boolean enabled); + protected abstract void setEnabled(boolean enabled); - private void setEnabled(final Boolean enabled) { - setEnabled(enabled == null ? true : enabled); - } + private void setEnabled(final Boolean enabled) { + setEnabled(enabled == null ? true : enabled); + } - private void setIcon(final Object icon) { - if (icon instanceof ImageResource) { - setIconResource((ImageResource) icon); - } else if (icon instanceof String) { - setIconStyle((String) icon); - } else if (icon != null) { - throw new NotImplementedException(); - } + private void setIcon(final Object icon) { + if (icon instanceof ImageResource) { + setIconResource((ImageResource) icon); + } else if (icon instanceof String) { + final String iconS = (String) icon; + if (iconS.startsWith("http")) { + setIconUrl(iconS); + } else { + setIconStyle(iconS); + } + } else if (icon != null) { + throw new NotImplementedException(); } + } - public void setIconResource(final ImageResource icon) { - setIconStyle((IconConstants.CSS_SUFFIX + icon.getName())); - } + public void setIconResource(final ImageResource icon) { + setIconStyle((IconConstants.CSS_SUFFIX + icon.getName())); + } - protected abstract void setIconStyle(String style); + protected abstract void setIconStyle(String style); - private void setStyles(final String styles) { - if (styles != null) { - clearStyles(); - for (final String style : TextUtils.splitTags(styles)) { - addStyle(style); - } - } + public abstract void setIconUrl(String url); + + private void setStyles(final String styles) { + if (styles != null) { + clearStyles(); + for (final String style : TextUtils.splitTags(styles)) { + addStyle(style); + } } + } - protected abstract void setText(String text); + protected abstract void setText(String text); - protected abstract void setToolTipText(String text); + protected abstract void setToolTipText(String text); - private void setVisible(final Boolean visible) { - // if you have problems with setVisible check if the GuiItem calls - // configureItemFromProperties on creation - setVisible(visible == null ? true : visible); - } + private void setVisible(final Boolean visible) { + // if you have problems with setVisible check if the GuiItem calls + // configureItemFromProperties on creation + setVisible(visible == null ? true : visible); + } - @Override - public boolean shouldBeAdded() { // NOPMD by vjrj on 18/01/11 0:48 - return true; - } + @Override + public boolean shouldBeAdded() { // NOPMD by vjrj on 18/01/11 0:48 + return true; + } } Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -43,6 +43,8 @@ interface IconTitleUiBinder extends UiBinder<Widget, IconLabel> { } + private static final String DEF = "16px"; + private static IconTitleUiBinder uiBinder = GWT.create(IconTitleUiBinder.class); @UiField @@ -137,6 +139,12 @@ iconLeft.addStyleName("k-iconlabel-left"); } + public void setLeftIconUrl(final String url) { + iconLeft.setUrl(url); + iconLeft.setSize(DEF, DEF); + iconLeft.addStyleName("k-iconlabel-left"); + } + public void setRightIcon(final String imgCss) { iconRight.setUrl("images/clear.gif"); iconRight.setStyleName(imgCss); @@ -149,6 +157,12 @@ iconRight.addStyleName("k-iconlabel-right"); } + public void setRightIconUrl(final String url) { + iconRight.setUrl(url); + iconRight.setSize(DEF, DEF); + iconRight.addStyleName("k-iconlabel-right"); + } + @Override public void setStyleName(final String style) { flow.setStyleName(style); Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-05-05 02:24:50 UTC (rev 1343) @@ -449,6 +449,7 @@ .k-iconlabel-text { vertical-align: top; padding-left: 3px; + padding-right: 3px; float: left; } Modified: trunk/src/main/java/cc/kune/core/client/services/FileDownloadUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/services/FileDownloadUtils.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/core/client/services/FileDownloadUtils.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -23,6 +23,8 @@ import cc.kune.common.client.utils.UrlParam; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.UserSimpleDTO; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.DOM; @@ -31,63 +33,75 @@ public class FileDownloadUtils { - private static final String DOWNLOADSERVLET = "servlets/FileDownloadManager"; - private static final String LOGODOWNLOADSERVLET = "servlets/EntityLogoDownloadManager"; + private static final String DOWNLOADSERVLET = "servlets/FileDownloadManager"; + protected static final String GROUP_NO_AVATAR_IMAGE = "images/group-def-icon.png"; + private static final String LOGODOWNLOADSERVLET = "servlets/EntityLogoDownloadManager"; + protected static final String PERSON_NO_AVATAR_IMAGE = "images/unknown.jpg"; - private final ImageUtils imageUtils; - private final Session session; + private final ImageUtils imageUtils; + private final Session session; - @Inject - public FileDownloadUtils(final Session session, final ImageUtils imageUtils) { - this.session = session; - this.imageUtils = imageUtils; - } + @Inject + public FileDownloadUtils(final Session session, final ImageUtils imageUtils) { + this.session = session; + this.imageUtils = imageUtils; + } - private String calculateUrl(final StateToken token, final boolean download, final boolean useHash) { - final Url url = new Url(GWT.getModuleBaseURL() + DOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, - token.toString())); - if (download) { - url.add(new UrlParam(FileConstants.DOWNLOAD, download)); - } - if (useHash) { - final String hash = session.getUserHash(); - if (hash != null) { - url.add(new UrlParam(FileConstants.HASH, hash)); - } - } - return url.toString(); + private String calculateUrl(final StateToken token, final boolean download, final boolean useHash) { + final Url url = new Url(GWT.getModuleBaseURL() + DOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, + token.toString())); + if (download) { + url.add(new UrlParam(FileConstants.DOWNLOAD, download)); } - - public void downloadFile(final StateToken token) { - final String url = calculateUrl(token, true, true); - DOM.setElementAttribute(RootPanel.get("__download").getElement(), "src", url); + if (useHash) { + final String hash = session.getUserHash(); + if (hash != null) { + url.add(new UrlParam(FileConstants.HASH, hash)); + } } + return url.toString(); + } - public String getImageResizedUrl(final StateToken token, final ImageSize imageSize) { - return calculateUrl(token, false, true) + "&" + new UrlParam(FileConstants.IMGSIZE, imageSize.toString()); - } + public void downloadFile(final StateToken token) { + final String url = calculateUrl(token, true, true); + DOM.setElementAttribute(RootPanel.get("__download").getElement(), "src", url); + } - public String getImageUrl(final StateToken token) { - return calculateUrl(token, false, true); - } + public String getGroupLogo(final GroupDTO group) { + return group.hasLogo() ? getLogoImageUrl(group.getStateToken()) + : group.isPersonal() ? PERSON_NO_AVATAR_IMAGE : GROUP_NO_AVATAR_IMAGE; + } - public String getLogoAvatarHtml(final StateToken groupToken, final boolean groupHasLogo, final boolean isPersonal, - final int size, final int hvspace) { - if (groupHasLogo) { - return "<img hspace='" + hvspace + "' vspace='" + hvspace + "' align='left' style='width: " + size - + "px; height: " + size + "px;' src='" + getLogoImageUrl(groupToken) + "'>"; - } else { - return isPersonal ? imageUtils.getImageHtml(ImageDescriptor.personDef) - : imageUtils.getImageHtml(ImageDescriptor.groupDefIcon); - } - } + public String getImageResizedUrl(final StateToken token, final ImageSize imageSize) { + return calculateUrl(token, false, true) + "&" + + new UrlParam(FileConstants.IMGSIZE, imageSize.toString()); + } - public String getLogoImageUrl(final StateToken token) { - return new Url(GWT.getModuleBaseURL() + LOGODOWNLOADSERVLET, - new UrlParam(FileConstants.TOKEN, token.toString())).toString(); + public String getImageUrl(final StateToken token) { + return calculateUrl(token, false, true); + } + + public String getLogoAvatarHtml(final StateToken groupToken, final boolean groupHasLogo, + final boolean isPersonal, final int size, final int hvspace) { + if (groupHasLogo) { + return "<img hspace='" + hvspace + "' vspace='" + hvspace + "' align='left' style='width: " + size + + "px; height: " + size + "px;' src='" + getLogoImageUrl(groupToken) + "'>"; + } else { + return isPersonal ? imageUtils.getImageHtml(ImageDescriptor.personDef) + : imageUtils.getImageHtml(ImageDescriptor.groupDefIcon); } + } - public String getUrl(final StateToken token) { - return calculateUrl(token, false, false); - } + public String getLogoImageUrl(final StateToken token) { + return new Url(GWT.getModuleBaseURL() + LOGODOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, + token.toString())).toString(); + } + + public String getUrl(final StateToken token) { + return calculateUrl(token, false, false); + } + + public String getUserAvatar(final UserSimpleDTO user) { + return user.hasLogo() ? getLogoImageUrl(user.getStateToken()) : PERSON_NO_AVATAR_IMAGE; + } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -104,8 +104,7 @@ } private void addPartipation(final GroupDTO group) { - final String logoImageUrl = group.hasLogo() ? downloadProvider.get().getLogoImageUrl( - group.getStateToken()) : "images/group-def-icon.gif"; + final String logoImageUrl = downloadProvider.get().getGroupLogo(group); final MenuItemDescriptor participant = new MenuItemDescriptor(gotoGroupAction); participant.setTarget(group); participant.putValue(Action.NAME, group.getLongName()); Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPresenter.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPresenter.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -13,32 +13,31 @@ import com.gwtplatform.mvp.client.View; import com.gwtplatform.mvp.client.proxy.Proxy; -public abstract class AbstractSNPresenter<V extends View, Proxy_ extends Proxy<?>> extends Presenter<View, Proxy<?>> { - protected static final String GROUP_NO_AVATAR_IMAGE = "images/group-def-icon.png"; - protected static final String PERSON_NO_AVATAR_IMAGE = "images/unknown.jpg"; - protected final Provider<FileDownloadUtils> downloadProvider; +public abstract class AbstractSNPresenter<V extends View, Proxy_ extends Proxy<?>> extends + Presenter<View, Proxy<?>> { - public AbstractSNPresenter(final EventBus eventBus, final View view, final Proxy<?> proxy, - final Provider<FileDownloadUtils> downloadProvider) { - super(eventBus, view, proxy); - this.downloadProvider = downloadProvider; - } + protected final Provider<FileDownloadUtils> downloadProvider; - protected GuiActionDescCollection createMenuItems(final Object target, - final AbstractSNMembersActionsRegistry registry, final String title) { - final GuiActionDescCollection items = new GuiActionDescCollection(); - items.add(new MenuTitleItemDescriptor(title)); - for (final Provider<MenuItemDescriptor> provider : registry) { - final MenuItemDescriptor menuItem = provider.get(); - menuItem.setTarget(target); - items.add(menuItem); - } - return items; - } + public AbstractSNPresenter(final EventBus eventBus, final View view, final Proxy<?> proxy, + final Provider<FileDownloadUtils> downloadProvider) { + super(eventBus, view, proxy); + this.downloadProvider = downloadProvider; + } - protected String getAvatar(final GroupDTO group) { - return group.hasLogo() ? downloadProvider.get().getLogoImageUrl(group.getStateToken()) - : group.isPersonal() ? PERSON_NO_AVATAR_IMAGE : GROUP_NO_AVATAR_IMAGE; + protected GuiActionDescCollection createMenuItems(final Object target, + final AbstractSNMembersActionsRegistry registry, final String title) { + final GuiActionDescCollection items = new GuiActionDescCollection(); + items.add(new MenuTitleItemDescriptor(title)); + for (final Provider<MenuItemDescriptor> provider : registry) { + final MenuItemDescriptor menuItem = provider.get(); + menuItem.setTarget(target); + items.add(menuItem); } + return items; + } + protected String getAvatar(final GroupDTO group) { + return downloadProvider.get().getGroupLogo(group); + } + } Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -152,8 +152,7 @@ final UserBuddiesDataDTO userBuddiesData = state.getUserBuddies(); final List<UserSimpleDTO> buddies = userBuddiesData.getBuddies(); for (final UserSimpleDTO user : buddies) { - final String avatarUrl = user.hasLogo() ? downloadProvider.get().getLogoImageUrl( - user.getStateToken()) : PERSON_NO_AVATAR_IMAGE; + final String avatarUrl = downloadProvider.get().getUserAvatar(user); getView().addBuddie(user, avatarUrl, user.getName(), "", createMenuItems(user, userMenuItemsRegistry, user.getName())); } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -29,80 +29,84 @@ @SuppressWarnings("serial") public class GroupSNConfActions extends AbstractSNActionsRegistry { - public static final SubMenuDescriptor MODERATION_SUBMENU = new SubMenuDescriptor(); - public static final MenuDescriptor OPTIONS_MENU = new MenuDescriptor(); - public static final SubMenuDescriptor VISIBILITY_SUBMENU = new SubMenuDescriptor(); + public static final SubMenuDescriptor MODERATION_SUBMENU = new SubMenuDescriptor(); + public static final MenuDescriptor OPTIONS_MENU = new MenuDescriptor(); + public static final String OPTIONS_STYLES = "k-sn-options-menu, k-noborder, k-nobackcolor, k-btn-min"; + public static final SubMenuDescriptor VISIBILITY_SUBMENU = new SubMenuDescriptor(); - @Inject - public GroupSNConfActions(final Session session, final StateManager stateManager, - final I18nTranslationService i18n, final Provider<MembersVisibilityMenuItem> membersVisibility, - final Provider<MembersModerationMenuItem> membersModeration, final CoreResources res, - final IsLoggedCondition isLoggedCondition, final JoinGroupAction joinGroupAction, - final IsGroupCondition isGroupCondition, final UnJoinGroupAction unJoinGroupAction) { - OPTIONS_MENU.withToolTip(i18n.t("Options")).withIcon(res.arrowdownsitebar()).withStyles( - "k-sn-options-menu, k-noborder, k-nobackcolor"); - final GuiActionDescrip optionsTitle = new MenuTitleItemDescriptor(i18n.t("Options")).withParent(OPTIONS_MENU); - final MenuRadioItemDescriptor anyoneItem = membersVisibility.get().withVisibility( - SocialNetworkVisibility.anyone); - final MenuRadioItemDescriptor onlyMembersItem = membersVisibility.get().withVisibility( - SocialNetworkVisibility.onlymembers); - final MenuRadioItemDescriptor onlyAdminsItem = membersVisibility.get().withVisibility( - SocialNetworkVisibility.onlyadmins); - final MenuRadioItemDescriptor closedItem = membersModeration.get().withModeration(AdmissionType.Closed); - final MenuRadioItemDescriptor moderatedItem = membersModeration.get().withModeration(AdmissionType.Moderated); - final MenuRadioItemDescriptor openItem = membersModeration.get().withModeration(AdmissionType.Open); - add(OPTIONS_MENU); - add(optionsTitle); - add(VISIBILITY_SUBMENU.withText(i18n.t("Those who can view this member list")).withParent(OPTIONS_MENU)); - add(MODERATION_SUBMENU.withText(i18n.t("New members policy")).withParent(OPTIONS_MENU)); - add(anyoneItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("anyone"))); - add(onlyMembersItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only members"))); - add(onlyAdminsItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only admins"))); - add(moderatedItem.withParent(MODERATION_SUBMENU).withText(i18n.t("moderate request to join"))); - add(openItem.withParent(MODERATION_SUBMENU).withText(i18n.t("auto accept request to join"))); - // add(closedItem.withParent(MODERATION_SUBMENU).withText( - // i18n.t("closed for new members"))); + @Inject + public GroupSNConfActions(final Session session, final StateManager stateManager, + final I18nTranslationService i18n, final Provider<MembersVisibilityMenuItem> membersVisibility, + final Provider<MembersModerationMenuItem> membersModeration, final CoreResources res, + final IsLoggedCondition isLoggedCondition, final JoinGroupAction joinGroupAction, + final IsGroupCondition isGroupCondition, final UnJoinGroupAction unJoinGroupAction) { + OPTIONS_MENU.withToolTip(i18n.t("Options")).withIcon(res.arrowdownsitebar()).withStyles( + OPTIONS_STYLES); + final GuiActionDescrip optionsTitle = new MenuTitleItemDescriptor(i18n.t("Options")).withParent(OPTIONS_MENU); + final MenuRadioItemDescriptor anyoneItem = membersVisibility.get().withVisibility( + SocialNetworkVisibility.anyone); + final MenuRadioItemDescriptor onlyMembersItem = membersVisibility.get().withVisibility( + SocialNetworkVisibility.onlymembers); + final MenuRadioItemDescriptor onlyAdminsItem = membersVisibility.get().withVisibility( + SocialNetworkVisibility.onlyadmins); + final MenuRadioItemDescriptor closedItem = membersModeration.get().withModeration( + AdmissionType.Closed); + final MenuRadioItemDescriptor moderatedItem = membersModeration.get().withModeration( + AdmissionType.Moderated); + final MenuRadioItemDescriptor openItem = membersModeration.get().withModeration(AdmissionType.Open); + add(OPTIONS_MENU); + add(optionsTitle); + add(VISIBILITY_SUBMENU.withText(i18n.t("Those who can view this member list")).withParent( + OPTIONS_MENU)); + add(MODERATION_SUBMENU.withText(i18n.t("New members policy")).withParent(OPTIONS_MENU)); + add(anyoneItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("anyone"))); + add(onlyMembersItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only members"))); + add(onlyAdminsItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only admins"))); + add(moderatedItem.withParent(MODERATION_SUBMENU).withText(i18n.t("moderate request to join"))); + add(openItem.withParent(MODERATION_SUBMENU).withText(i18n.t("auto accept request to join"))); + // add(closedItem.withParent(MODERATION_SUBMENU).withText( + // i18n.t("closed for new members"))); - final ButtonDescriptor joinBtn = new ButtonDescriptor(joinGroupAction); - final ButtonDescriptor unJoinBtn = new ButtonDescriptor(unJoinGroupAction); - // unJoinBtn.add(isLoggedCondition); - add(joinBtn); // .withStyles("k-no-backimage, k-noborder, k-nobackcolor")); - add(unJoinBtn); // .withStyles("k-no-backimage, k-noborder, k-nobackcolor")); + final ButtonDescriptor joinBtn = new ButtonDescriptor(joinGroupAction); + final ButtonDescriptor unJoinBtn = new ButtonDescriptor(unJoinGroupAction); + // unJoinBtn.add(isLoggedCondition); + add(joinBtn); // .withStyles("k-no-backimage, k-noborder, k-nobackcolor")); + add(unJoinBtn); // .withStyles("k-no-backimage, k-noborder, k-nobackcolor")); - stateManager.onStateChanged(true, new StateChangedHandler() { - @Override - public void onStateChanged(final StateChangedEvent event) { - final boolean administrable = event.getState().getGroupRights().isAdministrable(); - OPTIONS_MENU.setVisible(administrable); - OPTIONS_MENU.setEnabled(administrable); - final StateAbstractDTO state = event.getState(); - final GroupDTO currentGroup = state.getGroup(); - if (currentGroup.isNotPersonal()) { - switch (state.getSocialNetworkData().getSocialNetworkVisibility()) { - case anyone: - anyoneItem.setChecked(true); - break; - case onlyadmins: - onlyAdminsItem.setChecked(true); - break; - case onlymembers: - onlyMembersItem.setChecked(true); - break; - } - } - switch (currentGroup.getAdmissionType()) { - case Moderated: - moderatedItem.setChecked(true); - break; - case Open: - openItem.setChecked(true); - break; - case Closed: - closedItem.setChecked(true); - break; - } - unJoinBtn.setVisible(session.isLogged()); - } - }); - } + stateManager.onStateChanged(true, new StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + final boolean administrable = event.getState().getGroupRights().isAdministrable(); + OPTIONS_MENU.setVisible(administrable); + OPTIONS_MENU.setEnabled(administrable); + final StateAbstractDTO state = event.getState(); + final GroupDTO currentGroup = state.getGroup(); + if (currentGroup.isNotPersonal()) { + switch (state.getSocialNetworkData().getSocialNetworkVisibility()) { + case anyone: + anyoneItem.setChecked(true); + break; + case onlyadmins: + onlyAdminsItem.setChecked(true); + break; + case onlymembers: + onlyMembersItem.setChecked(true); + break; + } + } + switch (currentGroup.getAdmissionType()) { + case Moderated: + moderatedItem.setChecked(true); + break; + case Open: + openItem.setChecked(true); + break; + case Closed: + closedItem.setChecked(true); + break; + } + unJoinBtn.setVisible(session.isLogged()); + } + }); + } } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -22,57 +22,60 @@ @SuppressWarnings("serial") public class UserSNConfActions extends AbstractSNActionsRegistry { - public static final MenuDescriptor OPTIONS_MENU = new MenuDescriptor(); - public static final SubMenuDescriptor VISIBILITY_SUBMENU = new SubMenuDescriptor(); + public static final MenuDescriptor OPTIONS_MENU = new MenuDescriptor(); + public static final SubMenuDescriptor VISIBILITY_SUBMENU = new SubMenuDescriptor(); - @Inject - public UserSNConfActions(final Session session, final StateManager stateManager, final I18nTranslationService i18n, - final Provider<UserSNVisibilityMenuItem> userBuddiesVisibility, final CoreResources res, - final IsGroupCondition isGroupCondition, final AddNewBuddiesAction addNewBuddiesAction) { - OPTIONS_MENU.withToolTip(i18n.t("Options")).withIcon(res.arrowdownsitebar()).withStyles( - "k-sn-options-menu, k-noborder, k-nobackcolor"); - final MenuRadioItemDescriptor anyoneItem = userBuddiesVisibility.get().withVisibility(UserSNetVisibility.anyone); - final MenuRadioItemDescriptor onlyYourBuddiesItem = userBuddiesVisibility.get().withVisibility( - UserSNetVisibility.yourbuddies); - final MenuRadioItemDescriptor onlyYou = userBuddiesVisibility.get().withVisibility(UserSNetVisibility.onlyyou); - assert anyoneItem.getAction() != onlyYourBuddiesItem.getAction(); - assert anyoneItem.getAction() != onlyYou.getAction(); - add(OPTIONS_MENU); - add(VISIBILITY_SUBMENU.withText(i18n.t("Those who can view your network")).withParent(OPTIONS_MENU)); - add(anyoneItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("anyone"))); - add(onlyYourBuddiesItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only your buddies"))); - add(onlyYou.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only you"))); + @Inject + public UserSNConfActions(final Session session, final StateManager stateManager, + final I18nTranslationService i18n, final Provider<UserSNVisibilityMenuItem> userBuddiesVisibility, + final CoreResources res, final IsGroupCondition isGroupCondition, + final AddNewBuddiesAction addNewBuddiesAction) { + OPTIONS_MENU.withToolTip(i18n.t("Options")).withIcon(res.arrowdownsitebar()).withStyles( + GroupSNConfActions.OPTIONS_STYLES); + final MenuRadioItemDescriptor anyoneItem = userBuddiesVisibility.get().withVisibility( + UserSNetVisibility.anyone); + final MenuRadioItemDescriptor onlyYourBuddiesItem = userBuddiesVisibility.get().withVisibility( + UserSNetVisibility.yourbuddies); + final MenuRadioItemDescriptor onlyYou = userBuddiesVisibility.get().withVisibility( + UserSNetVisibility.onlyyou); + assert anyoneItem.getAction() != onlyYourBuddiesItem.getAction(); + assert anyoneItem.getAction() != onlyYou.getAction(); + add(OPTIONS_MENU); + add(VISIBILITY_SUBMENU.withText(i18n.t("Those who can view your network")).withParent(OPTIONS_MENU)); + add(anyoneItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("anyone"))); + add(onlyYourBuddiesItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only your buddies"))); + add(onlyYou.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only you"))); - final ButtonDescriptor addBuddieBtn = new ButtonDescriptor(addNewBuddiesAction); + final ButtonDescriptor addBuddieBtn = new ButtonDescriptor(addNewBuddiesAction); - add(addBuddieBtn.withStyles("k-no-backimage")); + add(addBuddieBtn.withStyles("k-no-backimage")); - stateManager.onStateChanged(true, new StateChangedHandler() { - @Override - public void onStateChanged(final StateChangedEvent event) { - final StateAbstractDTO state = event.getState(); - final boolean administrable = state.getGroupRights().isAdministrable(); - OPTIONS_MENU.setVisible(administrable); - OPTIONS_MENU.setEnabled(administrable); - if (state.getGroup().isPersonal()) { - final UserSNetVisibility visibility = state.getSocialNetworkData().getUserBuddiesVisibility(); - switch (visibility) { - case anyone: - anyoneItem.setChecked(true); - break; - case yourbuddies: - onlyYourBuddiesItem.setChecked(true); - break; - case onlyyou: - onlyYou.setChecked(true); - break; - } - // NotifyUser.info(i18n.t("Visibility of your network is " + - // visibility.toString())); - } - addBuddieBtn.setVisible(session.isLogged() && state.getGroup().isPersonal() - && session.getCurrentUser().getShortName().equals(state.getGroup().getShortName())); - } - }); - } + stateManager.onStateChanged(true, new StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + final StateAbstractDTO state = event.getState(); + final boolean administrable = state.getGroupRights().isAdministrable(); + OPTIONS_MENU.setVisible(administrable); + OPTIONS_MENU.setEnabled(administrable); + if (state.getGroup().isPersonal()) { + final UserSNetVisibility visibility = state.getSocialNetworkData().getUserBuddiesVisibility(); + switch (visibility) { + case anyone: + anyoneItem.setChecked(true); + break; + case yourbuddies: + onlyYourBuddiesItem.setChecked(true); + break; + case onlyyou: + onlyYou.setChecked(true); + break; + } + // NotifyUser.info(i18n.t("Visibility of your network is " + + // visibility.toString())); + } + addBuddieBtn.setVisible(session.isLogged() && state.getGroup().isPersonal() + && session.getCurrentUser().getShortName().equals(state.getGroup().getShortName())); + } + }); + } } Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-05-05 01:45:26 UTC (rev 1342) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-05-05 02:24:50 UTC (rev 1343) @@ -358,7 +358,7 @@ getStackTraceAsync(e, new Accessor<SafeHtml>() { @Override public void use(SafeHtml stack) { - NotifyUser.error("Oops! Something has gone wrong. Please contact the site admins with <em>more details</em>", true); + NotifyUser.error("Oops! Something has gone wrong. Please contact the site admins with <em>more details</em>"); // error.addDetail(stack, null); String message = stack.asString().replace("<br>", "\n"); REMOTE_LOG.severe(message);

1 0

05 May '11

Author: vjrj_ Date: 2011-05-05 03:45:26 +0200 (Thu, 05 May 2011) New Revision: 1342 Modified: trunk/pom.xml trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 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/public/kune-common.css trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java trunk/src/main/java/cc/kune/core/public/about.html trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java Log: Minor fixes in icons and search textbox Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-04 20:47:33 UTC (rev 1341) +++ trunk/pom.xml 2011-05-05 01:45:26 UTC (rev 1342) @@ -908,6 +908,8 @@ <module>${project.groupId}.Kune</module> </modules> <copyWebapp>true</copyWebapp> + <soyc>false</soyc> + <extraJvmArgs>-Xmx1024m -Xss1024k</extraJvmArgs> </configuration> <executions> <execution> Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-05-05 01:45:26 UTC (rev 1342) @@ -39,121 +39,120 @@ public abstract class AbstractGwtButtonGui extends AbstractChildGuiItem { - private ButtonBase button; - protected boolean enableTongle; - private IconLabel iconLabel; - private boolean isChild; + private ButtonBase button; + protected boolean enableTongle; + private IconLabel iconLabel; + private boolean isChild; - public AbstractGwtButtonGui() { - this(null, false); - } + public AbstractGwtButtonGui() { + this(null, false); + } - public AbstractGwtButtonGui(final ButtonDescriptor buttonDescriptor) { - this(buttonDescriptor, false); - } + public AbstractGwtButtonGui(final ButtonDescriptor buttonDescriptor) { + this(buttonDescriptor, false); + } - public AbstractGwtButtonGui(final ButtonDescriptor buttonDescriptor, final boolean enableTongle) { - super(buttonDescriptor); - this.enableTongle = enableTongle; - } + public AbstractGwtButtonGui(final ButtonDescriptor buttonDescriptor, final boolean enableTongle) { + super(buttonDescriptor); + this.enableTongle = enableTongle; + } - @Override - protected void addStyle(final String style) { - iconLabel.addStyleName(style); - button.addStyleName(style); - layout(); - } + @Override + protected void addStyle(final String style) { + button.addStyleName(style); + layout(); + } - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.descriptor = descriptor; - iconLabel = new IconLabel(""); - if (enableTongle) { - button = new ToggleButton(); - } else { - button = new Button(); - } - button.addStyleName("k-button"); - button.addStyleName("k-btn"); - button.addStyleName("k-5corners"); - layout(); - // button.setEnableToggle(enableTongle); - final String id = descriptor.getId(); - if (id != null) { - button.ensureDebugId(id); - } - isChild = descriptor.isChild(); - if (isChild) { - // If button is inside a toolbar don't init... - if (descriptor.isChild()) { - child = button; - } - } else { - initWidget(button); - } - button.addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - descriptor.fire(new ActionEvent(button, getTargetObjectOfAction(descriptor), - Event.as(event.getNativeEvent()))); - } - }); - super.create(descriptor); - configureItemFromProperties(); - return this; + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + iconLabel = new IconLabel(""); + if (enableTongle) { + button = new ToggleButton(); + } else { + button = new Button(); } - - private void layout() { - button.setHTML(iconLabel.getElement().getInnerHTML()); + button.addStyleName("k-button"); + button.addStyleName("k-btn"); + button.addStyleName("k-5corners"); + layout(); + // button.setEnableToggle(enableTongle); + final String id = descriptor.getId(); + if (id != null) { + button.ensureDebugId(id); } - - @Override - public void setEnabled(final boolean enabled) { - button.setEnabled(enabled); + isChild = descriptor.isChild(); + if (isChild) { + // If button is inside a toolbar don't init... + if (descriptor.isChild()) { + child = button; + } + } else { + initWidget(button); } + button.addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + descriptor.fire(new ActionEvent(button, getTargetObjectOfAction(descriptor), + Event.as(event.getNativeEvent()))); + } + }); + super.create(descriptor); + configureItemFromProperties(); + return this; + } - @Override - public void setIconResource(final ImageResource icon) { - iconLabel.setLeftIconResource(icon); - layout(); - } + private void layout() { + button.setHTML(iconLabel.getElement().getInnerHTML()); + } - @Override - protected void setIconStyle(final String style) { - iconLabel.setRightIcon(style); - layout(); - } + @Override + public void setEnabled(final boolean enabled) { + button.setEnabled(enabled); + } - public void setPressed(final boolean pressed) { - final ToggleButton toggleButton = (ToggleButton) button; + @Override + public void setIconResource(final ImageResource icon) { + iconLabel.setLeftIconResource(icon); + layout(); + } - if (toggleButton.isDown() != pressed) { - toggleButton.setDown(pressed); - } - } + @Override + protected void setIconStyle(final String style) { + iconLabel.setRightIcon(style); + layout(); + } - @Override - public void setText(final String text) { - iconLabel.setText(text); - layout(); - } + public void setPressed(final boolean pressed) { + final ToggleButton toggleButton = (ToggleButton) button; - @Override - public void setToolTipText(final String tooltip) { - if (tooltip != null && !tooltip.isEmpty()) { - final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); - Tooltip.to(button, key == null ? tooltip : tooltip + key.toString()); - } + if (toggleButton.isDown() != pressed) { + toggleButton.setDown(pressed); } + } - @Override - public void setVisible(final boolean visible) { - button.setVisible(visible); - } + @Override + public void setText(final String text) { + iconLabel.setText(text); + layout(); + } - @Override - public boolean shouldBeAdded() { - return !descriptor.isChild(); + @Override + public void setToolTipText(final String tooltip) { + if (tooltip != null && !tooltip.isEmpty()) { + final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); + Tooltip.to(button, key == null ? tooltip : tooltip + key.toString()); } + } + @Override + public void setVisible(final boolean visible) { + button.setVisible(visible); + } + + @Override + public boolean shouldBeAdded() { + return !descriptor.isChild(); + } + } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-05-05 01:45:26 UTC (rev 1342) @@ -33,66 +33,67 @@ import com.google.gwt.user.client.Event; public class GwtIconLabelGui extends AbstractGuiItem { - private IconLabel iconLabel; + private IconLabel iconLabel; - @Override - protected void addStyle(final String style) { - iconLabel.addStyleName(style); - } + @Override + protected void addStyle(final String style) { + iconLabel.addStyleName(style); + } - @Override - protected void clearStyles() { - iconLabel.setStyleName("k-none"); + @Override + protected void clearStyles() { + iconLabel.setStyleName("k-none"); + } + + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + iconLabel = new IconLabel(""); + descriptor.putValue(ParentWidget.PARENT_UI, this); + final String id = descriptor.getId(); + if (id != null) { + iconLabel.ensureDebugId(id); } - - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.descriptor = descriptor; - iconLabel = new IconLabel(""); - descriptor.putValue(ParentWidget.PARENT_UI, this); - final String id = descriptor.getId(); - if (id != null) { - iconLabel.ensureDebugId(id); + initWidget(iconLabel); + iconLabel.getFocus().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + final AbstractAction action = descriptor.getAction(); + if (action != null) { + action.actionPerformed(new ActionEvent(iconLabel, getTargetObjectOfAction(descriptor), + Event.as(event.getNativeEvent()))); } - initWidget(iconLabel); - iconLabel.getFocus().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - final AbstractAction action = descriptor.getAction(); - if (action != null) { - action.actionPerformed(new ActionEvent(iconLabel, getTargetObjectOfAction(descriptor), - Event.as(event.getNativeEvent()))); - } - } - }); - configureItemFromProperties(); - return this; - } + } + }); + configureItemFromProperties(); + return this; + } - @Override - public void setEnabled(final boolean enabled) { - super.setVisible(enabled); - } + @Override + public void setEnabled(final boolean enabled) { + super.setVisible(enabled); + } - @Override - protected void setIconStyle(final String style) { - iconLabel.setRightIcon(style); - } + @Override + protected void setIconStyle(final String style) { + iconLabel.setRightIcon(style); + iconLabel.addRightIconStyle("k-fl"); + } - @Override - public void setText(final String text) { - iconLabel.setText(text); - } + @Override + public void setText(final String text) { + iconLabel.setText(text); + } - @Override - public void setToolTipText(final String tooltip) { - final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); - iconLabel.setTooltip(key == null ? tooltip : tooltip + key.toString()); - } + @Override + public void setToolTipText(final String tooltip) { + final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); + iconLabel.setTooltip(key == null ? tooltip : tooltip + key.toString()); + } - @Override - public boolean shouldBeAdded() { - return true; - } + @Override + public boolean shouldBeAdded() { + return true; + } } Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-05-05 01:45:26 UTC (rev 1342) @@ -35,7 +35,7 @@ import com.google.gwt.user.client.ui.HasDirectionalText; import com.google.gwt.user.client.ui.HasWidgets; import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; public class IconLabel extends Composite implements HasWidgets, HasDirectionalText { @@ -52,7 +52,7 @@ @UiField Image iconRight; @UiField - InlineLabel label; + Label label; @UiField FocusPanel self; 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-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-05-05 01:45:26 UTC (rev 1342) @@ -4,6 +4,8 @@ <ui:style> .label { text-decoration: none; + display: table-cell; + float: left; } .label a:link { @@ -11,19 +13,27 @@ color: gray; } - .pad { /* white-space: nowrap; */ + .flow { /* white-space: nowrap; */ outline: 0 none; + display: table-row; } + .tcell { + display: table-cell; + } + .self { outline: 0 none; + display: table; } </ui:style> - <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" /> - <g:InlineLabel ui:field="label" styleName="{style.label}" /> + <g:HTMLPanel> + <g:FocusPanel styleName="{style.self}" ui:field="self"> + <g:FlowPanel styleName="{style.flow}" ui:field="flow"> + <g:Image ui:field="iconLeft" styleName="{style.tcell}" /> + <g:Image ui:field="iconRight" styleName="{style.tcell}" /> + <g:Label ui:field="label" styleName="{style.label}" /> </g:FlowPanel> </g:FocusPanel> + </g:HTMLPanel> </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-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-05-05 01:45:26 UTC (rev 1342) @@ -134,11 +134,11 @@ padding: 22px 4px 3px 4px; } -.k-dialog-title span { +.k-dialog-title div { color: #552200; font-size: 20px; font-weight: bold; - margin: 0 0 0 0px; + margin: 5px 0 5px 10px; } .k-dialog-innerp { @@ -271,7 +271,7 @@ } .oc-menu .gwt-MenuBar-vertical,.gwt-MenuBar-vertical { - background-color: #280b0b; + background-color: #704f4f; border: 2px solid #552200; padding: 3px; font: 16px 'Ubuntu', arial; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-05-05 01:45:26 UTC (rev 1342) @@ -36,80 +36,81 @@ public abstract class SignInAbstractPanel extends ViewImpl { - private final BasicTopDialog dialog; - protected final String errorLabelId; - protected final I18nTranslationService i18n; - protected final NotifyLevelImages images; - private final MaskWidgetView mask; - protected MessageToolbar messageErrorBar; + private final BasicTopDialog dialog; + protected final String errorLabelId; + protected final I18nTranslationService i18n; + protected final NotifyLevelImages images; + private final MaskWidgetView mask; + protected MessageToolbar messageErrorBar; - public SignInAbstractPanel(final String dialogId, final MaskWidgetView mask, final I18nTranslationService i18n, - final String title, final boolean autohide, final boolean modal, final boolean autoscroll, final int width, - 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) { + public SignInAbstractPanel(final String dialogId, final MaskWidgetView mask, + final I18nTranslationService i18n, final String title, final boolean autohide, + final boolean modal, final boolean autoscroll, final int width, 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) { - 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; - this.mask = mask; - } + final Builder builder = new BasicTopDialog.Builder(dialogId, autohide, modal).autoscroll(autoscroll); + builder.width(width).height(heigth).title(title); + 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; + this.mask = mask; + } - @Override - public Widget asWidget() { - return dialog; - } + @Override + public Widget asWidget() { + return dialog; + } - public HasCloseHandlers<PopupPanel> getClose() { - return dialog.getClose(); - } + public HasCloseHandlers<PopupPanel> getClose() { + return dialog.getClose(); + } - public HasClickHandlers getFirstBtn() { - return dialog.getFirstBtn(); - } + public HasClickHandlers getFirstBtn() { + return dialog.getFirstBtn(); + } - public ForIsWidget getInnerPanel() { - return dialog.getInnerPanel(); - } + public ForIsWidget getInnerPanel() { + return dialog.getInnerPanel(); + } - public HasClickHandlers getSecondBtn() { - return dialog.getSecondBtn(); - } + public HasClickHandlers getSecondBtn() { + return dialog.getSecondBtn(); + } - public void hide() { - if (dialog.isVisible()) { - dialog.hide(); - } + public void hide() { + if (dialog.isVisible()) { + dialog.hide(); } + } - public void hideMessages() { - messageErrorBar.hideErrorMessage(); - } + public void hideMessages() { + messageErrorBar.hideErrorMessage(); + } - public void mask(final String message) { - mask.mask(dialog); - } + public void mask(final String message) { + mask.mask(dialog); + } - public void maskProcessing() { - mask.mask(dialog, i18n.t("Processing")); - } + public void maskProcessing() { + mask.mask(dialog, i18n.t("Processing")); + } - public void setErrorMessage(final String message, final NotifyLevel level) { - messageErrorBar.setErrorMessage(message, level); - } + public void setErrorMessage(final String message, final NotifyLevel level) { + messageErrorBar.setErrorMessage(message, level); + } - public void show() { - dialog.showCentered(); - } + public void show() { + dialog.showCentered(); + } - public void unMask() { - mask.unMask(); - } + public void unMask() { + mask.unMask(); + } } 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-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-05-05 01:45:26 UTC (rev 1342) @@ -38,266 +38,266 @@ import com.extjs.gxt.ui.client.widget.form.TextField; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.logical.shared.HasCloseHandlers; -import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.gwtplatform.mvp.client.ViewImpl; public class NewGroupPanel extends ViewImpl implements NewGroupView { - private static final int BIG_FIELD_WIDTH = 280; - public static final String CANCEL_BUTTON = "k-ngp-cancel-bt"; - public static final String COMM_GROUP_TYPE_ID = "k-ngp-type_of_group_comm"; - public static final String ERROR_MSG_BAR = "k-ngp-error-mb"; - private static final int LABEL_WIDTH = 100; - public static final String LONGNAME_FIELD = "k-ngp-long_name"; - private static final String MARGIN_LEFT_105PX = "margin-left: 105px"; - public static final String NEWGROUP_WIZARD = "k-ngp-wiz"; - public static final String ORG_GROUP_TYPE_ID = "k-ngp-type_of_group_org"; - public static final String PROJ_GROUP_TYPE_ID = "k-ngp-type_of_group_proj"; - public static final String PUBLICDESC_FIELD = "k-ngp-public_desc"; - public static final String REGISTER_BUTTON = "k-ngp-finish-bt"; - public static final String SHORTNAME_FIELD = "k-ngp-short_name"; - public static final String TAGS_FIELD = "k-ngp-tags"; - public static final String TYPEOFGROUP_FIELD = "k-ngp-type_of_group"; + private static final int BIG_FIELD_WIDTH = 280; + public static final String CANCEL_BUTTON = "k-ngp-cancel-bt"; + public static final String COMM_GROUP_TYPE_ID = "k-ngp-type_of_group_comm"; + public static final String ERROR_MSG_BAR = "k-ngp-error-mb"; + private static final int LABEL_WIDTH = 100; + public static final String LONGNAME_FIELD = "k-ngp-long_name"; + private static final String MARGIN_LEFT_105PX = "margin-left: 105px"; + public static final String NEWGROUP_WIZARD = "k-ngp-wiz"; + public static final String ORG_GROUP_TYPE_ID = "k-ngp-type_of_group_org"; + public static final String PROJ_GROUP_TYPE_ID = "k-ngp-type_of_group_proj"; + public static final String PUBLICDESC_FIELD = "k-ngp-public_desc"; + public static final String REGISTER_BUTTON = "k-ngp-finish-bt"; + public static final String SHORTNAME_FIELD = "k-ngp-short_name"; + public static final String TAGS_FIELD = "k-ngp-tags"; + public static final String TYPEOFGROUP_FIELD = "k-ngp-type_of_group"; - private Radio communityRadio; - private final BasicTopDialog dialog; - private final FormPanel form; + private Radio communityRadio; + private final BasicTopDialog dialog; + private final FormPanel form; - private final I18nTranslationService i18n; - private TextField<String> longNameField; - private final MaskWidgetView mask; - private final MessageToolbar messageErrorBar; - private Radio orgRadio; - private Radio projectRadio; - private TextArea publicDescField; - private TextField<String> shortNameField; + private final I18nTranslationService i18n; + private TextField<String> longNameField; + private final MaskWidgetView mask; + private final MessageToolbar messageErrorBar; + private Radio orgRadio; + private Radio projectRadio; + private TextArea publicDescField; + private TextField<String> shortNameField; - private TextField<String> tag1; - private TextField<String> tag2; - private TextField<String> tag3; + private TextField<String> tag1; + private TextField<String> tag2; + private TextField<String> tag3; - @Inject - public NewGroupPanel(final I18nTranslationService i18n, final NotifyLevelImages img, final MaskWidgetView mask) { - 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; - form = createNewGroupInitialDataForm(); + @Inject + public NewGroupPanel(final I18nTranslationService i18n, final NotifyLevelImages img, + final MaskWidgetView mask) { + final Builder builder = new BasicTopDialog.Builder(NEWGROUP_WIZARD, false, true).autoscroll(true).height( + "300px").title(i18n.t("Register a new group")); + 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; + form = createNewGroupInitialDataForm(); - messageErrorBar = new MessageToolbar(img, ERROR_MSG_BAR); - form.add(messageErrorBar); - dialog.getInnerPanel().add(form); - } + messageErrorBar = new MessageToolbar(img, ERROR_MSG_BAR); + form.add(messageErrorBar); + dialog.getInnerPanel().add(form); + } - @Override - public Widget asWidget() { - return null; - } + @Override + public Widget asWidget() { + return null; + } - @Override - public void clearData() { - form.reset(); - shortNameField.focus(); - messageErrorBar.hideErrorMessage(); - } + @Override + public void clearData() { + form.reset(); + shortNameField.focus(); + messageErrorBar.hideErrorMessage(); + } - private FormPanel createNewGroupInitialDataForm() { - final FormPanel form = new FormPanel(); - form.setFrame(true); - form.setPadding(10); - form.setBorders(false); - form.setWidth(360); - form.setLabelWidth(LABEL_WIDTH); - form.setLabelAlign(LabelAlign.RIGHT); - form.setButtonAlign(HorizontalAlignment.RIGHT); - form.setHeaderVisible(false); + private FormPanel createNewGroupInitialDataForm() { + final FormPanel form = new FormPanel(); + form.setFrame(true); + form.setPadding(10); + form.setBorders(false); + form.setWidth(360); + form.setLabelWidth(LABEL_WIDTH); + form.setLabelAlign(LabelAlign.RIGHT); + form.setButtonAlign(HorizontalAlignment.RIGHT); + form.setHeaderVisible(false); + // + // final Label intro = new Label(); + // intro.setText(i18n.t("Please fill this form to register a new group:")); + // intro.setStyleName("k-form-intro"); + // form.add(intro); - final Label intro = new Label(); - intro.setText(i18n.t("Please fill this form to register a new group:")); - intro.setStyleName("k-form-intro"); - form.add(intro); + shortNameField = new TextField<String>(); + shortNameField.setValidationDelay(1000); + shortNameField.setTabIndex(1); + shortNameField.setFieldLabel(i18n.t("Short name")); + shortNameField.setName(SHORTNAME_FIELD); + shortNameField.setWidth(175); + shortNameField.setMinLength(3); + shortNameField.setMaxLength(15); + shortNameField.setAllowBlank(false); + shortNameField.setRegex("^[a-z0-9]+$"); + shortNameField.getMessages().setMinLengthText(i18n.t(CoreMessages.FIELD_MUST_BE_BETWEEN_3_AND_15)); + shortNameField.getMessages().setMaxLengthText(i18n.t(CoreMessages.FIELD_MUST_BE_BETWEEN_3_AND_15)); + shortNameField.getMessages().setRegexText(i18n.t(CoreMessages.FIELD_MUST_BE_BETWEEN_3_AND_15)); + shortNameField.setValidationDelay(1000); - shortNameField = new TextField<String>(); - shortNameField.setValidationDelay(1000); - shortNameField.setTabIndex(1); - shortNameField.setFieldLabel(i18n.t("Short name")); - shortNameField.setName(SHORTNAME_FIELD); - shortNameField.setWidth(175); - shortNameField.setMinLength(3); - shortNameField.setMaxLength(15); - shortNameField.setAllowBlank(false); - shortNameField.setRegex("^[a-z0-9]+$"); - shortNameField.getMessages().setMinLengthText(i18n.t(CoreMessages.FIELD_MUST_BE_BETWEEN_3_AND_15)); - shortNameField.getMessages().setMaxLengthText(i18n.t(CoreMessages.FIELD_MUST_BE_BETWEEN_3_AND_15)); - shortNameField.getMessages().setRegexText(i18n.t(CoreMessages.FIELD_MUST_BE_BETWEEN_3_AND_15)); - shortNameField.setValidationDelay(1000); + form.add(shortNameField); - form.add(shortNameField); + longNameField = new TextField<String>(); + longNameField.setTabIndex(2); + longNameField.setFieldLabel(i18n.t("Long name")); + longNameField.setName(LONGNAME_FIELD); + longNameField.setWidth(BIG_FIELD_WIDTH); + longNameField.setAllowBlank(false); + longNameField.setMinLength(3); + longNameField.setMaxLength(50); + longNameField.setValidationDelay(1000); + form.add(longNameField); - longNameField = new TextField<String>(); - longNameField.setTabIndex(2); - longNameField.setFieldLabel(i18n.t("Long name")); - longNameField.setName(LONGNAME_FIELD); - longNameField.setWidth(BIG_FIELD_WIDTH); - longNameField.setAllowBlank(false); - longNameField.setMinLength(3); - longNameField.setMaxLength(50); - longNameField.setValidationDelay(1000); - form.add(longNameField); + publicDescField = new TextArea(); + publicDescField.setTabIndex(3); + publicDescField.setFieldLabel(i18n.t("Public description")); + publicDescField.setName(PUBLICDESC_FIELD); + publicDescField.setWidth(BIG_FIELD_WIDTH); + publicDescField.setAllowBlank(false); + publicDescField.setMinLength(10); + publicDescField.setMaxLength(255); + publicDescField.setValidationDelay(1000); + form.add(publicDescField); - publicDescField = new TextArea(); - publicDescField.setTabIndex(3); - publicDescField.setFieldLabel(i18n.t("Public description")); - publicDescField.setName(PUBLICDESC_FIELD); - publicDescField.setWidth(BIG_FIELD_WIDTH); - publicDescField.setAllowBlank(false); - publicDescField.setMinLength(10); - publicDescField.setMaxLength(255); - publicDescField.setValidationDelay(1000); - form.add(publicDescField); + tag1 = new TextField<String>(); + tag1.setTabIndex(4); + tag1.setFieldLabel(i18n.t("Group tags")); + tag1.setName(TAGS_FIELD); + tag1.setWidth(BIG_FIELD_WIDTH); + tag1.setAllowBlank(false); + tag1.setTitle(i18n.t("type some keyword that define your group")); + tag1.setValidationDelay(1000); + form.add(tag1); - tag1 = new TextField<String>(); - tag1.setTabIndex(4); - tag1.setFieldLabel(i18n.t("Group tags")); - tag1.setName(TAGS_FIELD); - tag1.setWidth(BIG_FIELD_WIDTH); - tag1.setAllowBlank(false); - tag1.setTitle(i18n.t("type some keyword that define your group")); - tag1.setValidationDelay(1000); - form.add(tag1); + final FieldSet groupTypeFieldSet = new FieldSet(); + groupTypeFieldSet.setHeading(i18n.t("Group type")); + groupTypeFieldSet.addStyleName("k-form-fieldset"); + groupTypeFieldSet.setCollapsible(true); + groupTypeFieldSet.setWidth("210px"); + groupTypeFieldSet.setAutoHeight(true); - final FieldSet groupTypeFieldSet = new FieldSet(); - groupTypeFieldSet.setHeading(i18n.t("Group type")); - groupTypeFieldSet.addStyleName("k-form-fieldset"); - groupTypeFieldSet.setCollapsible(true); - groupTypeFieldSet.setWidth("210px"); - groupTypeFieldSet.setAutoHeight(true); + form.add(groupTypeFieldSet); - form.add(groupTypeFieldSet); + projectRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Project"), TYPEOFGROUP_FIELD, + i18n.t("A project is a kind of group in which new members joining " + + "is moderated by the project administrators. " + + "An administrator is the person who creates the project " + + "and other people she/he chooses to be administrator as well."), PROJ_GROUP_TYPE_ID); + projectRadio.setTabIndex(6); + projectRadio.setValue(true); - projectRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Project"), TYPEOFGROUP_FIELD, - i18n.t("A project is a kind of group in which new members joining " - + "is moderated by the project administrators. " - + "An administrator is the person who creates the project " - + "and other people she/he chooses to be administrator as well."), PROJ_GROUP_TYPE_ID); - projectRadio.setTabIndex(6); - projectRadio.setValue(true); + orgRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Organization"), + TYPEOFGROUP_FIELD, i18n.t("An organization works as a project, " + + "but organizations must be a legal entity."), ORG_GROUP_TYPE_ID); + orgRadio.setTabIndex(7); - orgRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Organization"), TYPEOFGROUP_FIELD, - i18n.t("An organization works as a project, " + "but organizations must be a legal entity."), - ORG_GROUP_TYPE_ID); - orgRadio.setTabIndex(7); + communityRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Community"), + TYPEOFGROUP_FIELD, i18n.t("Communities are social groups of persons " + + "with shared interests, which are open to new members " + + "(for instance the environmental community or the LGBT community). " + + "They rarely are a legal entity."), COMM_GROUP_TYPE_ID); + communityRadio.setTabIndex(8); - communityRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Community"), TYPEOFGROUP_FIELD, - i18n.t("Communities are social groups of persons " - + "with shared interests, which are open to new members " - + "(for instance the environmental community or the LGBT community). " - + "They rarely are a legal entity."), COMM_GROUP_TYPE_ID); - communityRadio.setTabIndex(8); + return form; + } - return form; - } + @Override + public void focusOnShorName() { + shortNameField.focus(); + } - @Override - public void focusOnShorName() { - shortNameField.focus(); - } + @Override + public HasCloseHandlers<PopupPanel> getClose() { + return dialog.getClose(); + } - @Override - public HasCloseHandlers<PopupPanel> getClose() { - return dialog.getClose(); - } + @Override + public HasClickHandlers getFirstBtn() { + return dialog.getFirstBtn(); + } - @Override - public HasClickHandlers getFirstBtn() { - return dialog.getFirstBtn(); - } + @Override + public String getLongName() { + return longNameField.getValue(); + } - @Override - public String getLongName() { - return longNameField.getValue(); - } + @Override + public String getPublicDesc() { + return publicDescField.getValue(); + } - @Override - public String getPublicDesc() { - return publicDescField.getValue(); - } + @Override + public HasClickHandlers getSecondBtn() { + return dialog.getSecondBtn(); + } - @Override - public HasClickHandlers getSecondBtn() { - return dialog.getSecondBtn(); - } + @Override + public String getShortName() { + return shortNameField.getValue(); + } - @Override - public String getShortName() { - return shortNameField.getValue(); - } + @Override + public String getTags() { + return tag1.getRawValue(); + } - @Override - public String getTags() { - return tag1.getRawValue(); - } + @Override + public void hide() { + dialog.hide(); - @Override - public void hide() { - dialog.hide(); + } - } + @Override + public void hideMessage() { + messageErrorBar.hideErrorMessage(); + } - @Override - public void hideMessage() { - messageErrorBar.hideErrorMessage(); - } + @Override + public boolean isCommunity() { + return communityRadio.getValue(); + } - @Override - public boolean isCommunity() { - return communityRadio.getValue(); - } + @Override + public boolean isFormValid() { + return form.isValid(); + } - @Override - public boolean isFormValid() { - return form.isValid(); - } + @Override + public boolean isOrganization() { + return orgRadio.getValue(); + } - @Override - public boolean isOrganization() { - return orgRadio.getValue(); - } + @Override + public boolean isProject() { + return projectRadio.getValue(); + } - @Override - public boolean isProject() { - return projectRadio.getValue(); - } + public void mask(final String message) { + mask.mask(dialog); + } - public void mask(final String message) { - mask.mask(dialog); - } + @Override + public void maskProcessing() { + mask.mask(dialog, i18n.t("Processing")); + } - @Override - public void maskProcessing() { - mask.mask(dialog, i18n.t("Processing")); - } + @Override + public void setMessage(final String message, final NotifyLevel level) { + messageErrorBar.setErrorMessage(message, level); + } - @Override - public void setMessage(final String message, final NotifyLevel level) { - messageErrorBar.setErrorMessage(message, level); - } + @Override + public void show() { + dialog.showCentered(); + } - @Override - public void show() { - dialog.showCentered(); - } + @Override + public void unMask() { + mask.unMask(); + } - @Override - public void unMask() { - mask.unMask(); - } - } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-05-05 01:45:26 UTC (rev 1342) @@ -119,7 +119,7 @@ OPTIONS_MENU.putValue(Action.NAME, i18n.t("Options")); OPTIONS_MENU.putValue(Action.SMALL_ICON, res.arrowdownsitebar()); OPTIONS_MENU.setParent(RIGHT_TOOLBAR); - OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar, k-fl"); + OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar"); OPTIONS_MENU.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl); final ToolbarSeparatorDescriptor separator = new ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java 2011-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java 2011-05-05 01:45:26 UTC (rev 1342) @@ -23,6 +23,7 @@ import java.util.Map; import cc.kune.common.client.log.Log; +import cc.kune.core.client.sitebar.search.SitebarSearchPanel.OnExactMatch; import cc.kune.core.shared.SearcherConstants; import com.google.gwt.event.dom.client.KeyUpEvent; @@ -291,7 +292,8 @@ // if there were no suggestions, then it's an invalid value updateFormFeedback(FormFeedback.ERROR, "Invalid: " + m_query); - } else if (totSize == 1) { + } else if (false && totSize == 1) { + // Patch to show always the suggestions // it's an exact match, so do not bother with showing suggestions, final Option o = optResults.getOptions()[0]; final String displ = o.getName(); @@ -300,7 +302,7 @@ // mfield.setText(getFullReplaceText(displ, m_request.getQuery())); Log.info("RestSuggestCallback.success! exact match found for displ = " + displ); - + // onExactMatch.onExactMatch(o.getValue()); // it's valid! updateFormFeedback(FormFeedback.VALID, null); @@ -472,6 +474,8 @@ private final String mrestEndpointUrl; private final Map<String, String> mvalueMap; + // private final OnExactMatch onExactMatch; + /** * Constructor. * @@ -480,10 +484,13 @@ * (for query), indexFrom and indexTo * @param isMultivalued * - true for allowing multiple values + * @param onExactMatch */ - public MultivalueSuggestBox(final String restEndpointUrl, final boolean isMultivalued) { + public MultivalueSuggestBox(final String restEndpointUrl, final boolean isMultivalued, + final OnExactMatch onExactMatch) { mrestEndpointUrl = restEndpointUrl; misMultivalued = isMultivalued; + // this.onExactMatch = onExactMatch; final FlowPanel panel = new FlowPanel(); TextBoxBase textfield; @@ -550,6 +557,7 @@ putValue(option.getName(), option.getValue()); Log.info("extactMatchFound ! exact match found for displ = " + displayValue); + // onExactMatch.onExactMatch(option.getValue()); // and replace the text final String text = mfield.getText(); final String[] keys = text.split(DISPLAY_SEPARATOR.trim()); @@ -803,9 +811,8 @@ private void queryOptions(final String query, final int from, final int to, final OptionQueryCallback callback) { final RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, URL.encode(mrestEndpointUrl - // Falta limit + "?" + SearcherConstants.QUERY_PARAM + "=" + query + "&" + SearcherConstants.START_PARAM + "=" - + from + "&indexTo=" + to)); + + from + "&" + SearcherConstants.LIMIT_PARAM + "=" + PAGE_SIZE)); // Set our headers builder.setHeader("Accept", "application/json"); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-05-05 01:45:26 UTC (rev 1342) @@ -19,10 +19,13 @@ \*/ package cc.kune.core.client.sitebar.search; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.tooltip.Tooltip; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sitebar.search.SitebarSearchPresenter.SitebarSearchView; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.SearcherConstants; +import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.event.dom.client.HasAllFocusHandlers; @@ -38,23 +41,34 @@ import com.gwtplatform.mvp.client.ViewImpl; public class SitebarSearchPanel extends ViewImpl implements SitebarSearchView { + protected interface OnExactMatch { + void onExactMatch(String march); + } private static final int SEARCH_TEXT_HEIGHT = 13; private static final int SEARCH_TEXT_WIDTH_BIG = 160; private static final int SEARCH_TEXT_WIDTH_SMALL = 120; public static final String SITE_SEARCH_BUTTON = "kune-ssp-searchbt"; + public static final String SITE_SEARCH_TEXTBOX = "kune-ssp-tbox"; - private final PushButton searchButton; private final TextBoxBase searchTextBox; private final SuggestBox suggestBox; @Inject public SitebarSearchPanel(final GSpaceArmor gs, final CoreResources img, - final StateManager stateManager) { + final StateManager stateManager, final I18nTranslationService i18n) { searchButton = new PushButton(new Image(img.kuneSearchIco()), new Image(img.kuneSearchIcoPush())); searchButton.ensureDebugId(SITE_SEARCH_BUTTON); final MultivalueSuggestBox multivalueSBox = new MultivalueSuggestBox( - SearcherConstants.GROUP_DATA_PROXY_URL, false) { + SearcherConstants.GROUP_DATA_PROXY_URL, false, new OnExactMatch() { + + @Override + public void onExactMatch(final String match) { + NotifyUser.info(match); + NotifyUser.info("kk"); + } + }) { + @Override public void onSelection( final com.google.gwt.event.logical.shared.SelectionEvent<com.google.gwt.user.client.ui.SuggestOracle.Suggestion> event) { @@ -72,6 +86,7 @@ }; }; suggestBox = multivalueSBox.getSuggestBox(); + Tooltip.to(suggestBox, i18n.t("Type something to search users and groups in this site")); searchTextBox = suggestBox.getTextBox(); searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX); searchTextBox.addStyleName("k-fr"); Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-05-05 01:45:26 UTC (rev 1342) @@ -15,82 +15,92 @@ public class UserSNPanel extends AbstractSNPanel implements UserSNView { - @Inject - public UserSNPanel(final I18nTranslationService i18n, final GuiProvider guiProvider, final GSpaceArmor armor) { - super(i18n, guiProvider, armor); - 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")); - setTooltip(firstCategoryLabel, i18n.t("This user buddies")); - sndCategoryLabel.setText(i18n.t("Participates in")); - setTooltip(sndCategoryLabel, i18n.t("Groups in which this user participates")); - firstDeckLabel.setText(i18n.t(CoreMessages.BUDDIES_NOT_PUBLIC)); - trdCategoryLabel.setText("NOT USED"); - setTooltip(trdCategoryLabel, "NOT USED"); - super.setTrdCategoryVisible(false); - sndDeckLabel.setText("NOT USED"); - bottomActionsToolbar = new ActionFlowPanel(guiProvider); - bottomPanel.add(bottomActionsToolbar); - bottomActionsToolbar.setStyleName("k-sn-bottomPanel-actions"); - armor.getEntityToolsNorth().add(widget); - deck.showWidget(2); - } + private final I18nTranslationService i18n; - @Override - public void addBuddie(final UserSimpleDTO user, final String avatarUrl, final String tooltip, - final String tooltipTitle, final GuiActionDescCollection menu) { - firstCategoryFlow.add(createThumb(user.getShortName(), avatarUrl, tooltip, tooltipTitle, menu)); - } + @Inject + public UserSNPanel(final I18nTranslationService i18n, final GuiProvider guiProvider, + final GSpaceArmor armor) { + super(i18n, guiProvider, armor); + this.i18n = i18n; + 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")); + setTooltip(firstCategoryLabel, i18n.t("This user buddies")); + sndCategoryLabel.setText(i18n.t("Participates in")); + setTooltip(sndCategoryLabel, i18n.t("Groups in which this user participates")); + trdCategoryLabel.setText("NOT USED"); + setTooltip(trdCategoryLabel, "NOT USED"); + super.setTrdCategoryVisible(false); + sndDeckLabel.setText("NOT USED"); + bottomActionsToolbar = new ActionFlowPanel(guiProvider); + bottomPanel.add(bottomActionsToolbar); + bottomActionsToolbar.setStyleName("k-sn-bottomPanel-actions"); + armor.getEntityToolsNorth().add(widget); + deck.showWidget(2); + } - @Override - public void addParticipation(final GroupDTO group, final String avatarUrl, final String tooltip, - final String tooltipTitle, final GuiActionDescCollection menu) { - sndCategoryFlow.add(createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, menu)); - } + @Override + public void addBuddie(final UserSimpleDTO user, final String avatarUrl, final String tooltip, + final String tooltipTitle, final GuiActionDescCollection menu) { + firstCategoryFlow.add(createThumb(user.getShortName(), avatarUrl, tooltip, tooltipTitle, menu)); + } - @Override - public void addTextToBuddieList(final String text) { - firstCategoryFlow.add(new Label(text)); - } + @Override + public void addParticipation(final GroupDTO group, final String avatarUrl, final String tooltip, + final String tooltipTitle, final GuiActionDescCollection menu) { + sndCategoryFlow.add(createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, menu)); + } - @Override - public void setBuddiesCount(final int count) { - firstCategoryCount.setText(new StringBuffer("(").append(count).append(")").toString()); - } + @Override + public void addTextToBuddieList(final String text) { + firstCategoryFlow.add(new Label(text)); + } - @Override - public void setBuddiesVisible(final boolean visible) { - super.setFirstCategoryVisible(visible); - } + @Override + public void setBuddiesCount(final int count) { + firstCategoryCount.setText(new StringBuffer("(").append(count).append(")").toString()); + } - @Override - public void setParticipationCount(final int count) { - sndCategoryCount.setText(new StringBuffer("(").append(count).append(")").toString()); - } + @Override + public void setBuddiesVisible(final boolean visible) { + super.setFirstCategoryVisible(visible); + } - @Override - public void setParticipationVisible(final boolean visible) { - super.setSndCategoryVisible(visible); - } + @Override + public void setNoBuddies() { + firstDeckLabel.setText(i18n.t("This user has no buddies yet")); + deck.showWidget(0); + } - @Override - public void setVisible(final boolean visible) { - setVisibleImpl(visible); - } + @Override + public void setParticipationCount(final int count) { + sndCategoryCount.setText(new StringBuffer("(").append(count).append(")").toString()); + } - private void setVisibleImpl(final boolean visible) { - mainPanel.setVisible(visible); - } + @Override + public void setParticipationVisible(final boolean visible) { + super.setSndCategoryVisible(visible); + } - @Override - public void showBuddies() { - deck.showWidget(2); - } + @Override + public void setVisible(final boolean visible) { + setVisibleImpl(visible); + } - @Override - public void showBuddiesNotPublic() { - deck.showWidget(0); - } + private void setVisibleImpl(final boolean visible) { + mainPanel.setVisible(visible); + } + @Override + public void showBuddies() { + deck.showWidget(2); + } + + @Override + public void showBuddiesNotPublic() { + firstDeckLabel.setText(i18n.t(CoreMessages.BUDDIES_NOT_PUBLIC)); + deck.showWidget(0); + } + } Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java 2011-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java 2011-05-05 01:45:26 UTC (rev 1342) @@ -34,161 +34,169 @@ public class UserSNPresenter extends AbstractSNPresenter<UserSNView, UserSNProxy> { - @ProxyCodeSplit - public interface UserSNProxy extends Proxy<UserSNPresenter> { - } + @ProxyCodeSplit + public interface UserSNProxy extends Proxy<UserSNPresenter> { + } - public interface UserSNView extends View { + public interface UserSNView extends View { - void addBuddie(UserSimpleDTO user, String avatarUrl, String tooltip, String tooltipTitle, - GuiActionDescCollection menu); + void addBuddie(UserSimpleDTO user, String avatarUrl, String tooltip, String tooltipTitle, + GuiActionDescCollection menu); - void addParticipation(GroupDTO group, String avatarUrl, String tooltip, String tooltipTitle, - GuiActionDescCollection menu); + void addParticipation(GroupDTO group, String avatarUrl, String tooltip, String tooltipTitle, + GuiActionDescCollection menu); - void addTextToBuddieList(String text); + void addTextToBuddieList(String text); - void clear(); + void clear(); - IsActionExtensible getBottomToolbar(); + IsActionExtensible getBottomToolbar(); - void setBuddiesCount(int count); + void setBuddiesCount(int count); - void setBuddiesVisible(boolean visible); + void setBuddiesVisible(boolean visible); - void setParticipationCount(int count); + void setNoBuddies(); - void setParticipationVisible(boolean visible); + void setParticipationCount(int count); - void setVisible(boolean visible); + void setParticipationVisible(boolean visible); - void showBuddies(); + void setVisible(boolean visible); - void showBuddiesNotPublic(); - } + void showBuddies(); - private final UserSNConfActions confActionsRegistry; - private final I18nTranslationService i18n; - private final UserSNMenuItemsRegistry userMenuItemsRegistry; + void showBuddiesNotPublic(); + } - @Inject - public UserSNPresenter(final EventBus eventBus, final UserSNView view, final UserSNProxy proxy, - final I18nTranslationService i18n, final StateManager stateManager, final Session session, - final Provider<FileDownloadUtils> downloadProvider, final UserSNMenuItemsRegistry userMenuItemsRegistry, - final UserSNConfActions confActionsRegistry) { - super(eventBus, view, proxy, downloadProvider); - this.i18n = i18n; - this.userMenuItemsRegistry = userMenuItemsRegistry; - this.confActionsRegistry = confActionsRegistry; - stateManager.onStateChanged(true, new StateChangedEvent.StateChangedHandler() { - @Override - public void onStateChanged(final StateChangedEvent event) { - UserSNPresenter.this.onStateChanged(event.getState()); - } + private final UserSNConfActions confActionsRegistry; + private final I18nTranslationService i18n; + private final UserSNMenuItemsRegistry userMenuItemsRegistry; + + @Inject + public UserSNPresenter(final EventBus eventBus, final UserSNView view, final UserSNProxy proxy, + final I18nTranslationService i18n, final StateManager stateManager, final Session session, + final Provider<FileDownloadUtils> downloadProvider, + final UserSNMenuItemsRegistry userMenuItemsRegistry, final UserSNConfActions confActionsRegistry) { + super(eventBus, view, proxy, downloadProvider); + this.i18n = i18n; + this.userMenuItemsRegistry = userMenuItemsRegistry; + this.confActionsRegistry = confActionsRegistry; + stateManager.onStateChanged(true, new StateChangedEvent.StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + UserSNPresenter.this.onStateChanged(event.getState()); + } + }); + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + refreshOnSignInSignOut(session); + } + }); + session.onUserSignOut(true, new UserSignOutHandler() { + @Override + public void onUserSignOut(final UserSignOutEvent event) { + refreshOnSignInSignOut(session); + } + }); + stateManager.onSocialNetworkChanged(true, + new SocialNetworkChangedEvent.SocialNetworkChangedHandler() { + @Override + public void onSocialNetworkChanged(final SocialNetworkChangedEvent event) { + UserSNPresenter.this.onStateChanged(event.getState()); + } }); - session.onUserSignIn(true, new UserSignInHandler() { - @Override - public void onUserSignIn(final UserSignInEvent event) { - refreshOnSignInSignOut(session); - } - }); - session.onUserSignOut(true, new UserSignOutHandler() { - @Override - public void onUserSignOut(final UserSignOutEvent event) { - refreshOnSignInSignOut(session); - } - }); - stateManager.onSocialNetworkChanged(true, new SocialNetworkChangedEvent.SocialNetworkChangedHandler() { - @Override - public void onSocialNetworkChanged(final SocialNetworkChangedEvent event) { - UserSNPresenter.this.onStateChanged(event.getState()); - } - }); - createActions(); - } + createActions(); + } - private void createActions() { - getView().getBottomToolbar().addAll(confActionsRegistry); - } + private void createActions() { + getView().getBottomToolbar().addAll(confActionsRegistry); + } - @Override - public UserSNView getView() { - return (UserSNView) super.getView(); - } + @Override + public UserSNView getView() { + return (UserSNView) super.getView(); + } - private void onStateChanged(final StateAbstractDTO state) { - if (state.getGroup().isNotPersonal()) { - getView().setVisible(false); - } else { - getView().clear(); - if (state.getSocialNetworkData().isBuddiesVisible()) { - setBuddiesState(state); - setParticipationState(state); - } else { - getView().showBuddiesNotPublic(); - } - getView().setVisible(true); - } + private void onStateChanged(final StateAbstractDTO state) { + if (state.getGroup().isNotPersonal()) { + getView().setVisible(false); + } else { + getView().clear(); + if (state.getSocialNetworkData().isBuddiesVisible()) { + // In fact now we show the user network or not. + final int buddies = setBuddiesState(state); + final int participeIn = setParticipationState(state); + // getView().setVisible(buddies + participeIn > 0); + } else { + getView().showBuddiesNotPublic(); + } + getView().setVisible(true); } + } - private void refreshOnSignInSignOut(final Session session) { - final StateAbstractDTO currentState = session.getCurrentState(); - if (currentState != null) { - UserSNPresenter.this.onStateChanged(currentState); - } + private void refreshOnSignInSignOut(final Session session) { + final StateAbstractDTO currentState = session.getCurrentState(); + if (currentState != null) { + UserSNPresenter.this.onStateChanged(currentState); } + } - @Override - protected void revealInParent() { - RevealRootContentEvent.fire(this, this); - } + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } - private void setBuddiesState(final StateAbstractDTO state) { - final UserBuddiesDataDTO userBuddiesData = state.getUserBuddies(); - final List<UserSimpleDTO> buddies = userBuddiesData.getBuddies(); - for (final UserSimpleDTO user : buddies) { - final String avatarUrl = user.hasLogo() ? downloadProvider.get().getLogoImageUrl(user.getStateToken()) - : PERSON_NO_AVATAR_IMAGE; - getView().addBuddie(user, avatarUrl, user.getName(), "", - createMenuItems(user, userMenuItemsRegistry, user.getName())); - } - getView().setBuddiesVisible(buddies.size() > 0); - final boolean hasLocalBuddies = buddies.size() > 0; - final int numExtBuddies = userBuddiesData.getOtherExtBuddies(); - if (numExtBuddies > 0) { - if (hasLocalBuddies) { - // i18n: plural - getView().addTextToBuddieList( - i18n.t(numExtBuddies == 1 ? "and [%d] external user" : "and [%d] external users", numExtBuddies)); - } else { - getView().addTextToBuddieList( - i18n.t(numExtBuddies == 1 ? "[%d] external user" : "[%d] external users", numExtBuddies)); - } - } else { - // if (hasLocalBuddies) { - // view.clearOtherUsers(); - // } else { - // view.setNoBuddies(); - // } - } + private int setBuddiesState(final StateAbstractDTO state) { + final UserBuddiesDataDTO userBuddiesData = state.getUserBuddies(); + final List<UserSimpleDTO> buddies = userBuddiesData.getBuddies(); + for (final UserSimpleDTO user : buddies) { + final String avatarUrl = user.hasLogo() ? downloadProvider.get().getLogoImageUrl( + user.getStateToken()) : PERSON_NO_AVATAR_IMAGE; + getView().addBuddie(user, avatarUrl, user.getName(), "", + createMenuItems(user, userMenuItemsRegistry, user.getName())); } + getView().setBuddiesVisible(buddies.size() > 0); + final boolean hasLocalBuddies = buddies.size() > 0; + final int numExtBuddies = userBuddiesData.getOtherExtBuddies(); + if (numExtBuddies > 0) { + if (hasLocalBuddies) { + // i18n: plural + getView().addTextToBuddieList( + i18n.t(numExtBuddies == 1 ? "and [%d] external user" : "and [%d] external users", + numExtBuddies)); + } else { + getView().addTextToBuddieList( + i18n.t(numExtBuddies == 1 ? "[%d] external user" : "[%d] external users", numExtBuddies)); + } + } else { + if (hasLocalBuddies) { + // getView().clearOtherUsers(); + } else { + getView().setNoBuddies(); + } + } + return buddies.size() + numExtBuddies; + } - private void setParticipationState(final StateAbstractDTO state) { - final ParticipationDataDTO participation = state.getParticipation(); - final List<GroupDTO> groupsIsAdmin = participation.getGroupsIsAdmin(); - final List<GroupDTO> groupsIsCollab = participation.getGroupsIsCollab(); - final int numAdmins = groupsIsAdmin.size(); - final int numCollaborators = groupsIsCollab.size(); - for (final GroupDTO group : groupsIsAdmin) { - getView().addParticipation(group, getAvatar(group), group.getLongName(), "", - createMenuItems(group, userMenuItemsRegistry, group.getLongName())); - } - for (final GroupDTO group : groupsIsCollab) { - getView().addParticipation(group, getAvatar(group), group.getLongName(), "", - createMenuItems(group, userMenuItemsRegistry, group.getLongName())); - } - final int totalGroups = numAdmins + numCollaborators; - // getView().setParticipationCount(totalGroups); - getView().setParticipationVisible(totalGroups > 0); + private int setParticipationState(final StateAbstractDTO state) { + final ParticipationDataDTO participation = state.getParticipation(); + final List<GroupDTO> groupsIsAdmin = participation.getGroupsIsAdmin(); + final List<GroupDTO> groupsIsCollab = participation.getGroupsIsCollab(); + final int numAdmins = groupsIsAdmin.size(); + final int numCollaborators = groupsIsCollab.size(); + for (final GroupDTO group : groupsIsAdmin) { + getView().addParticipation(group, getAvatar(group), group.getLongName(), "", + createMenuItems(group, userMenuItemsRegistry, group.getLongName())); } + for (final GroupDTO group : groupsIsCollab) { + getView().addParticipation(group, getAvatar(group), group.getLongName(), "", + createMenuItems(group, userMenuItemsRegistry, group.getLongName())); + } + final int totalGroups = numAdmins + numCollaborators; + // getView().setParticipationCount(totalGroups); + getView().setParticipationVisible(totalGroups > 0); + return totalGroups; + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/public/about.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/about.html 2011-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/core/public/about.html 2011-05-05 01:45:26 UTC (rev 1342) @@ -13,7 +13,7 @@ </img> </a> </span> -<p>Version 0.0.7 (r1274+c5)</p> +<p>Version 0.0.7 (r1339+c18)</p> <h1><a name="section_1">CREDITS</a></h1> <h2><a name="section_1_1">Authors</a></h2> Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-05 01:45:26 UTC (rev 1342) @@ -381,11 +381,11 @@ font: inherit; } -.k-btn-sitebar span,.k-btn-sitebar button span,.k-sitebar button span { +k-btn-sitebar button spin,.k-sitebar button spin, .k-btn-sitebar div, .k-btn-sitebar span,.k-btn-sitebar button span,.k-sitebar button span { text-decoration: underline; } -.k-btn-sitebar,.k-btn-sitebar button,.k-sitebar button { +.k-btn-sitebar,.k-btn-sitebar button,.k-sitebar button, .k-btn-sitebar div,.k-btn-sitebar button div,.k-sitebar button div { font: 13px 'Ubuntu', arial; color: #B3B3B3; cursor: pointer; @@ -1167,6 +1167,7 @@ .gwt-SuggestBoxPopup .item-selected { background: #cdcdcd; + cursor: pointer; } .gwt-SuggestBoxPopup .suggestPopupContent { 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-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2011-05-05 01:45:26 UTC (rev 1342) @@ -211,7 +211,8 @@ if (index > 0) { // local user try { - final User buddie = finder.getByShortName(entry.getUser().substring(0, index)); + String username = entry.getUser().substring(0, index); + final User buddie = finder.getByShortName(username); buddiesData.getBuddies().add(buddie); } catch (final NoResultException e) { // No existent buddie, skip 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-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java 2011-05-05 01:45:26 UTC (rev 1342) @@ -37,49 +37,50 @@ 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")); - final VerticalPanel vp = new VerticalPanel(); - final Label intro = new Label(); - intro.setWordWrap(true); - intro.setText(i18n.t("This is the default license for all the contents of this group (you can also select another different license per content):")); - 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)); - } + public EntityOptionsDefLicensePanel(final I18nTranslationService i18n, final CoreResources res) { + tabTitle = new IconLabel(res.copyleft(), i18n.t("License")); + tabTitle.setHeight("22px"); + final VerticalPanel vp = new VerticalPanel(); + final Label intro = new Label(); + intro.setWordWrap(true); + intro.setText(i18n.t("This is the default license for all the contents of this group (you can also select another different license per content):")); + 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)); + } - @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/wave/client/WaveStatusIndicator.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java 2011-05-04 20:47:33 UTC (rev 1341) +++ trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java 2011-05-05 01:45:26 UTC (rev 1342) @@ -18,43 +18,43 @@ public class WaveStatusIndicator { - public static class WaveStatusAction extends SessionAction { + public static class WaveStatusAction extends SessionAction { - @Inject - public WaveStatusAction(final Session session, final I18nTranslationService i18n) { - super(session, true); - ClientEvents.get().addNetworkStatusEventHandler(new NetworkStatusEventHandler() { - @Override - public void onNetworkStatus(final NetworkStatusEvent event) { - switch (event.getStatus()) { - case CONNECTED: - case RECONNECTED: - putValue(Action.NAME, i18n.t("Online")); - putValue(AbstractAction.STYLES, "k-sitebar-wave-status, k-sitebar-wave-status-online"); - NotifyUser.hideProgress(); - break; - case DISCONNECTED: - NotifyUser.showProgress(i18n.t("Connecting")); - case RECONNECTING: - putValue(Action.NAME, i18n.t("Offline")); - putValue(AbstractAction.STYLES, "k-sitebar-wave-status, k-sitebar-wave-status-offline"); - break; - } - } - }); - } - + @Inject + public WaveStatusAction(final Session session, final I18nTranslationService i18n) { + super(session, true); + ClientEvents.get().addNetworkStatusEventHandler(new NetworkStatusEventHandler() { @Override - public void actionPerformed(final ActionEvent event) { - // Do nothing + public void onNetworkStatus(final NetworkStatusEvent event) { + switch (event.getStatus()) { + case CONNECTED: + case RECONNECTED: + putValue(Action.NAME, i18n.t("Online")); + putValue(AbstractAction.STYLES, "k-sitebar-wave-status, k-sitebar-wave-status-online"); + NotifyUser.hideProgress(); + break; + case DISCONNECTED: + NotifyUser.showProgress(i18n.t("Connecting")); + case RECONNECTING: + putValue(Action.NAME, i18n.t("Offline")); + putValue(AbstractAction.STYLES, "k-sitebar-wave-status, k-sitebar-wave-status-offline"); + break; + } } + }); + } + @Override + public void actionPerformed(final ActionEvent event) { + // Do nothing } - @Inject - public WaveStatusIndicator(final SitebarActionsPresenter sitebar, final WaveStatusAction action) { - final IconLabelDescriptor status = new IconLabelDescriptor(action); - status.setPosition(0); - sitebar.getRightToolbar().add(status); - } + } + + @Inject + public WaveStatusIndicator(final SitebarActionsPresenter sitebar, final WaveStatusAction action) { + final IconLabelDescriptor status = new IconLabelDescriptor(action); + status.setPosition(1); + sitebar.getRightToolbar().add(status); + } }

1 0

r1341 - trunk/src/main/java/cc/kune/domain
by Vicente J. Ruiz Jurado 04 May '11

04 May '11

Author: vjrj_ Date: 2011-05-04 22:47:33 +0200 (Wed, 04 May 2011) New Revision: 1341 Modified: trunk/src/main/java/cc/kune/domain/Content.java Log: Fixing some tests Modified: trunk/src/main/java/cc/kune/domain/Content.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Content.java 2011-05-04 20:29:42 UTC (rev 1340) +++ trunk/src/main/java/cc/kune/domain/Content.java 2011-05-04 20:47:33 UTC (rev 1341) @@ -74,7 +74,6 @@ @OneToOne(cascade = CascadeType.ALL) private AccessLists accessLists; - @Fetch(FetchMode.JOIN) @IndexedEmbedded @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) private List<User> authors;

1 0

r1340 - in trunk/src/main/java: cc/kune/chat/client/actions cc/kune/common/client/actions/gwtui cc/kune/common/client/actions/ui cc/kune/common/client/actions/ui/descrip cc/kune/common/client/ui cc/kune/common/public cc/kune/core/client/resources cc/kune/core/client/resources/icons cc/kune/core/client/sitebar cc/kune/core/client/sitebar/search cc/kune/core/public cc/kune/core/public/images cc/kune/core/server/manager/impl cc/kune/core/shared cc/kune/gspace/client cc/kune/gspace/client/options
by Vicente J. Ruiz Jurado 04 May '11

04 May '11

Author: vjrj_ Date: 2011-05-04 22:29:42 +0200 (Wed, 04 May 2011) New Revision: 1340 Added: trunk/src/main/java/cc/kune/core/client/resources/IconConstants.java trunk/src/main/java/cc/kune/core/client/resources/bug.png trunk/src/main/java/cc/kune/core/client/resources/checked.png trunk/src/main/java/cc/kune/core/client/resources/del-green.png trunk/src/main/java/cc/kune/core/client/resources/radiochecked.png trunk/src/main/java/cc/kune/core/client/resources/radiounchecked.png trunk/src/main/java/cc/kune/core/client/resources/unchecked.png trunk/src/main/java/cc/kune/core/client/sitebar/search/FormFeedback.java trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPresenter.java trunk/src/main/java/cc/kune/core/public/images/vborder.png trunk/src/main/java/cc/kune/core/public/images/vborder_ie6.png Removed: trunk/src/main/java/cc/kune/core/client/resources/icons/IconConstants.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearch.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchView.java Modified: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java trunk/src/main/java/cc/kune/core/client/resources/core.css trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java trunk/src/main/java/cc/kune/core/shared/SearcherConstants.java trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java trunk/src/main/java/cc/kune/gspace/client/GSpaceGinjector.java trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java trunk/src/main/java/cc/kune/pspace/client/PSpaceGinModule.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java Log: search of users & groups Modified: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -28,7 +28,7 @@ import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.notify.NotifyUser; -import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateChangedEvent; import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; @@ -45,76 +45,76 @@ public class AddAsBuddieHeaderButton { - public static class AddAsBuddieAction extends AbstractExtendedAction { - private final ChatClient chatEngine; - private final Session session; + public static class AddAsBuddieAction extends AbstractExtendedAction { + private final ChatClient chatEngine; + private final Session session; - @Inject - public AddAsBuddieAction(final ChatClient chatEngine, final Session session, final StateManager stateManager, - final I18nTranslationService i18n, final IconResources img) { - super(); - this.chatEngine = chatEngine; - this.session = session; - stateManager.onStateChanged(true, new StateChangedHandler() { - @Override - public void onStateChanged(final StateChangedEvent event) { - setState(event.getState()); - } - }); - Suco.get(XmppRoster.class).addRosterGroupChangedHandler(new RosterGroupChangedHandler() { - - @Override - public void onGroupChanged(final RosterGroupChangedEvent event) { - final StateAbstractDTO currentState = session.getCurrentState(); - if (currentState != null) { - setState(currentState); - } - } - }); - putValue(Action.NAME, i18n.t("Add as a buddie")); - putValue(Action.SMALL_ICON, img.addGreen()); + @Inject + public AddAsBuddieAction(final ChatClient chatEngine, final Session session, + final StateManager stateManager, final I18nTranslationService i18n, final CoreResources img) { + super(); + this.chatEngine = chatEngine; + this.session = session; + stateManager.onStateChanged(true, new StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + setState(event.getState()); } + }); + Suco.get(XmppRoster.class).addRosterGroupChangedHandler(new RosterGroupChangedHandler() { @Override - public void actionPerformed(final ActionEvent event) { - chatEngine.addNewBuddie(session.getCurrentState().getGroup().getShortName()); - NotifyUser.info("Added as buddie. Waiting buddie response"); - setEnabled(false); + public void onGroupChanged(final RosterGroupChangedEvent event) { + final StateAbstractDTO currentState = session.getCurrentState(); + if (currentState != null) { + setState(currentState); + } } + }); + putValue(Action.NAME, i18n.t("Add as a buddie")); + putValue(Action.SMALL_ICON, img.addGreen()); + } - private boolean currentGroupsIsAsPerson(final StateAbstractDTO state) { - return state.getGroup().isPersonal(); - } + @Override + public void actionPerformed(final ActionEvent event) { + chatEngine.addNewBuddie(session.getCurrentState().getGroup().getShortName()); + NotifyUser.info("Added as buddie. Waiting buddie response"); + setEnabled(false); + } - private boolean isNotMe(final String groupName) { - return !session.getCurrentUser().getShortName().equals(groupName); - } + private boolean currentGroupsIsAsPerson(final StateAbstractDTO state) { + return state.getGroup().isPersonal(); + } - private void setState(final StateAbstractDTO state) { - final String groupName = state.getGroup().getShortName(); - final boolean imLogged = session.isLogged(); - final boolean isNotBuddie = !chatEngine.isBuddie(groupName); - if (imLogged && currentGroupsIsAsPerson(state) && isNotBuddie && isNotMe(groupName)) { - setEnabled(true); - } else { - setEnabled(false); - } - } + private boolean isNotMe(final String groupName) { + return !session.getCurrentUser().getShortName().equals(groupName); } - @Inject - public AddAsBuddieHeaderButton(final AddAsBuddieAction buddieAction, final EntityHeader entityHeader) { - final ButtonDescriptor button = new ButtonDescriptor(buddieAction); - button.setVisible(false); - button.setStyles("k-chat-add-as-buddie"); - buddieAction.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(final PropertyChangeEvent event) { - if (event.getPropertyName().equals(AbstractAction.ENABLED)) { - button.setVisible((Boolean) event.getNewValue()); - } - } - }); - entityHeader.addAction(button); + private void setState(final StateAbstractDTO state) { + final String groupName = state.getGroup().getShortName(); + final boolean imLogged = session.isLogged(); + final boolean isNotBuddie = !chatEngine.isBuddie(groupName); + if (imLogged && currentGroupsIsAsPerson(state) && isNotBuddie && isNotMe(groupName)) { + setEnabled(true); + } else { + setEnabled(false); + } } + } + + @Inject + public AddAsBuddieHeaderButton(final AddAsBuddieAction buddieAction, final EntityHeader entityHeader) { + final ButtonDescriptor button = new ButtonDescriptor(buddieAction); + button.setVisible(false); + button.setStyles("k-chat-add-as-buddie"); + buddieAction.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(final PropertyChangeEvent event) { + if (event.getPropertyName().equals(AbstractAction.ENABLED)) { + button.setVisible((Boolean) event.getNewValue()); + } + } + }); + entityHeader.addAction(button); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -45,186 +45,189 @@ public abstract class AbstractGwtMenuItemGui extends AbstractGuiItem { - private IconLabel iconLabel; - private GwtBaseMenuItem item; - private final CommonIconResources res = CommonIconResources.INSTANCE; + private IconLabel iconLabel; + private GwtBaseMenuItem item; + private final CommonIconResources res = CommonIconResources.INSTANCE; - private void confCheckListener(final MenuCheckItemDescriptor descriptor, final GwtCheckItem checkItem) { - descriptor.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(final PropertyChangeEvent event) { - if (event.getPropertyName().equals(MenuCheckItemDescriptor.CHECKED)) { - final Boolean checked = (Boolean) event.getNewValue(); - setCheckedIcon(checked); - layout(); - } - } - }); - setCheckedIcon(descriptor.isChecked()); - iconLabel.setWidth("100%"); - } - - private void confRadioCheckListener(final MenuRadioItemDescriptor descriptor, final GwtCheckItem checkItem) { - descriptor.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(final PropertyChangeEvent event) { - - if (event.getPropertyName().equals(MenuCheckItemDescriptor.CHECKED)) { - final Boolean checked = (Boolean) event.getNewValue(); - setRadioChecked(checked); - layout(); - } - } - }); - setRadioChecked(descriptor.isChecked()); - iconLabel.setWidth("100%"); - } - - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.descriptor = descriptor; - iconLabel = new IconLabel(""); - if (descriptor instanceof MenuRadioItemDescriptor) { - final GwtCheckItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); - final MenuRadioItemDescriptor radioDescrip = (MenuRadioItemDescriptor) descriptor; - confRadioCheckListener(radioDescrip, checkItem); - item = checkItem; - } else if (descriptor instanceof MenuCheckItemDescriptor) { - final GwtCheckItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); - confCheckListener((MenuCheckItemDescriptor) descriptor, checkItem); - item = checkItem; - } else if (descriptor instanceof MenuTitleItemDescriptor) { - item = new GwtBaseMenuItem("", true); - item.setStyleName("k-menuimtem-title"); - } else { - item = new GwtBaseMenuItem("", true); + private void confCheckListener(final MenuCheckItemDescriptor descriptor, final GwtCheckItem checkItem) { + descriptor.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(final PropertyChangeEvent event) { + if (event.getPropertyName().equals(MenuCheckItemDescriptor.CHECKED)) { + final Boolean checked = (Boolean) event.getNewValue(); + setCheckedIcon(checked); + layout(); } + } + }); + setCheckedIcon(descriptor.isChecked()); + iconLabel.setWidth("100%"); + } - final String id = descriptor.getId(); - if (id != null) { - item.ensureDebugId(id); - } - // initWidget(item); - item.setCommand(new Command() { - @Override - public void execute() { - getParentMenu(descriptor).hide(); - final AbstractAction action = descriptor.getAction(); - if (action != null) { - if (descriptor instanceof MenuRadioItemDescriptor) { - final MenuRadioItemDescriptor checkItem = (MenuRadioItemDescriptor) descriptor; - if (!checkItem.isChecked()) { - checkItem.setChecked(true); - } - } else if (descriptor instanceof MenuCheckItemDescriptor) { - final MenuCheckItemDescriptor checkItem = (MenuCheckItemDescriptor) descriptor; - final boolean currentValue = checkItem.isChecked(); - checkItem.setChecked(!currentValue); - } - descriptor.getAction().actionPerformed( - new ActionEvent(item, getTargetObjectOfAction(descriptor), Event.getCurrentEvent())); - } - } - }); - configureItemFromProperties(); + private void confRadioCheckListener(final MenuRadioItemDescriptor descriptor, + final GwtCheckItem checkItem) { + descriptor.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(final PropertyChangeEvent event) { - final int position = descriptor.getPosition(); - final AbstractGwtMenuGui menu = getParentMenu(descriptor); - if (menu == null) { - throw new UIException("Warning: To add a menu item you need to add the menu before. Item: " + descriptor); + if (event.getPropertyName().equals(MenuCheckItemDescriptor.CHECKED)) { + final Boolean checked = (Boolean) event.getNewValue(); + setRadioChecked(checked); + layout(); } - if (position == GuiActionDescrip.NO_POSITION) { - menu.add(item); - } else { - menu.insert(position, item); - } - return this; - } + } + }); + setRadioChecked(descriptor.isChecked()); + iconLabel.setWidth("100%"); + } - private GwtCheckItem createCheckItem(final MenuItemDescriptor descriptor) { - final GwtCheckItem checkItem = new GwtCheckItem(); - checkItem.setChecked(((MenuCheckItemDescriptor) descriptor).isChecked()); - return checkItem; + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + iconLabel = new IconLabel(""); + if (descriptor instanceof MenuRadioItemDescriptor) { + final GwtCheckItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); + final MenuRadioItemDescriptor radioDescrip = (MenuRadioItemDescriptor) descriptor; + confRadioCheckListener(radioDescrip, checkItem); + item = checkItem; + } else if (descriptor instanceof MenuCheckItemDescriptor) { + final GwtCheckItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); + confCheckListener((MenuCheckItemDescriptor) descriptor, checkItem); + item = checkItem; + } else if (descriptor instanceof MenuTitleItemDescriptor) { + item = new GwtBaseMenuItem("", true); + item.setStyleName("k-menuimtem-title"); + } else { + item = new GwtBaseMenuItem("", true); } - private String createShortCut(final KeyStroke key, final String style) { - // See: https://yui-ext.com/forum/showthread.php?t=5762 - final Element keyLabel = DOM.createSpan(); - keyLabel.setId(style); - keyLabel.setInnerText(key.toString()); - return keyLabel.getString(); + final String id = descriptor.getId(); + if (id != null) { + item.ensureDebugId(id); } + // initWidget(item); + item.setCommand(new Command() { + @Override + public void execute() { + getParentMenu(descriptor).hide(); + final AbstractAction action = descriptor.getAction(); + if (action != null) { + if (descriptor instanceof MenuRadioItemDescriptor) { + final MenuRadioItemDescriptor checkItem = (MenuRadioItemDescriptor) descriptor; + if (!checkItem.isChecked()) { + checkItem.setChecked(true); + } + } else if (descriptor instanceof MenuCheckItemDescriptor) { + final MenuCheckItemDescriptor checkItem = (MenuCheckItemDescriptor) descriptor; + final boolean currentValue = checkItem.isChecked(); + checkItem.setChecked(!currentValue); + } + descriptor.getAction().actionPerformed( + new ActionEvent(item, getTargetObjectOfAction(descriptor), Event.getCurrentEvent())); + } + } + }); + configureItemFromProperties(); - public GwtBaseMenuItem getItem() { - return item; + final int position = descriptor.getPosition(); + final AbstractGwtMenuGui menu = getParentMenu(descriptor); + if (menu == null) { + throw new UIException("Warning: To add a menu item you need to add the menu before. Item: " + + descriptor); } - - private AbstractGwtMenuGui getParentMenu(final GuiActionDescrip descriptor) { - return ((AbstractGwtMenuGui) descriptor.getParent().getValue(ParentWidget.PARENT_UI)); + if (position == GuiActionDescrip.NO_POSITION) { + menu.add(item); + } else { + menu.insert(position, item); } + return this; + } - private void layout() { - item.setHTML(iconLabel.toString()); - } + private GwtCheckItem createCheckItem(final MenuItemDescriptor descriptor) { + final GwtCheckItem checkItem = new GwtCheckItem(); + checkItem.setChecked(((MenuCheckItemDescriptor) descriptor).isChecked()); + return checkItem; + } - private void setCheckedIcon(final Boolean checked) { - iconLabel.setLeftIconResource(checked ? res.checked() : res.unChecked()); - } + private String createShortCut(final KeyStroke key, final String style) { + // See: https://yui-ext.com/forum/showthread.php?t=5762 + final Element keyLabel = DOM.createSpan(); + keyLabel.setId(style); + keyLabel.setInnerText(key.toString()); + return keyLabel.getString(); + } - @Override - protected void setEnabled(final boolean enabled) { - item.setEnabled(enabled); - setVisible(enabled); - } + public GwtBaseMenuItem getItem() { + return item; + } - @Override - public void setIconResource(final ImageResource icon) { - iconLabel.setRightIconResource(icon); - layout(); - } + private AbstractGwtMenuGui getParentMenu(final GuiActionDescrip descriptor) { + return ((AbstractGwtMenuGui) descriptor.getParent().getValue(ParentWidget.PARENT_UI)); + } - @Override - protected void setIconStyle(final String style) { - iconLabel.setRightIcon(style); - layout(); - } + private void layout() { + item.setHTML(iconLabel.toString()); + } - private void setRadioChecked(final Boolean checked) { - iconLabel.setLeftIconResource(checked ? res.radioChecked() : res.radioUnChecked()); - } + private void setCheckedIcon(final Boolean checked) { + iconLabel.setLeftIconResource(checked ? res.checked() : res.unChecked()); + } - @Override - protected void setText(final String text) { - if (text != null) { - final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); - if (key == null) { - iconLabel.setText(text); - } else { - iconLabel.setLabelText(text + createShortCut(key, "oc-mshortcut-hidden") - + createShortCut(key, "oc-mshortcut")); - } - } - layout(); - } + @Override + protected void setEnabled(final boolean enabled) { + item.setEnabled(enabled); + setVisible(enabled); + } - @Override - protected void setToolTipText(final String text) { - if (text != null) { - final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); - Tooltip.to(iconLabel, key == null ? text : text + key.toString()); - layout(); - } + @Override + public void setIconResource(final ImageResource icon) { + iconLabel.setRightIconResource(icon); + iconLabel.addRightIconStyle("k-fl"); + layout(); + } + + @Override + protected void setIconStyle(final String style) { + iconLabel.setRightIcon(style); + layout(); + } + + private void setRadioChecked(final Boolean checked) { + iconLabel.setLeftIconResource(checked ? res.radioChecked() : res.radioUnChecked()); + } + + @Override + protected void setText(final String text) { + if (text != null) { + final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); + if (key == null) { + iconLabel.setText(text); + } else { + iconLabel.setLabelText(text + createShortCut(key, "oc-mshortcut-hidden") + + createShortCut(key, "oc-mshortcut")); + } } + layout(); + } - @Override - public void setVisible(final boolean visible) { - item.setVisible(visible); - iconLabel.setVisible(visible); - layout(); + @Override + protected void setToolTipText(final String text) { + if (text != null) { + final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); + Tooltip.to(iconLabel, key == null ? text : text + key.toString()); + layout(); } + } - @Override - public boolean shouldBeAdded() { // NOPMD by vjrj on 18/01/11 0:48 - return false; - } + @Override + public void setVisible(final boolean visible) { + item.setVisible(visible); + iconLabel.setVisible(visible); + layout(); + } + + @Override + public boolean shouldBeAdded() { // NOPMD by vjrj on 18/01/11 0:48 + return false; + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * opyright (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 @@ -34,102 +34,107 @@ public class GwtMenuGui extends AbstractGwtMenuGui { - private Button button; - private IconLabel iconLabel; - private boolean notStandAlone; + private Button button; + private IconLabel iconLabel; + private boolean notStandAlone; - @Override - protected void addStyle(final String style) { - if (notStandAlone) { - iconLabel.addStyleName(style); - button.addStyleName(style); - layout(); - } + @Override + protected void addStyle(final String style) { + if (notStandAlone) { + iconLabel.addStyleName(style); + button.addStyleName(style); + layout(); } + } - @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - super.descriptor = descriptor; - descriptor.putValue(ParentWidget.PARENT_UI, this); - // Standalone menus are menus without and associated button in a toolbar - // (sometimes, a menu showed in a grid, or other special widgets) - notStandAlone = !((MenuDescriptor) descriptor).isStandalone(); - if (notStandAlone) { - button = new Button(); - button.setStylePrimaryName("oc-button"); - iconLabel = new IconLabel(""); - button.addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - show(button); - } - }); - final String id = descriptor.getId(); - if (id != null) { - button.ensureDebugId(id); - } - if (!descriptor.isChild()) { - initWidget(button); - } else { - child = button; - } - } else { - initWidget(new Label()); + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + descriptor.putValue(ParentWidget.PARENT_UI, this); + // Standalone menus are menus without and associated button in a toolbar + // (sometimes, a menu showed in a grid, or other special widgets) + notStandAlone = !((MenuDescriptor) descriptor).isStandalone(); + if (notStandAlone) { + button = new Button(); + button.setStylePrimaryName("oc-button"); + iconLabel = new IconLabel(""); + final ImageResource rightIcon = ((MenuDescriptor) descriptor).getRightIcon(); + if (rightIcon != null) { + iconLabel.setRightIconResource(rightIcon); + iconLabel.addRightIconStyle("k-fr"); + } + button.addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + show(button); } - super.create(descriptor); - configureItemFromProperties(); - return this; + }); + final String id = descriptor.getId(); + if (id != null) { + button.ensureDebugId(id); + } + if (!descriptor.isChild()) { + initWidget(button); + } else { + child = button; + } + } else { + initWidget(new Label()); } + super.create(descriptor); + configureItemFromProperties(); + return this; + } - private void layout() { - button.setHTML(iconLabel.getElement().getInnerHTML()); - } + private void layout() { + button.setHTML(iconLabel.getElement().getInnerHTML()); + } - @Override - public void setEnabled(final boolean enabled) { - if (notStandAlone) { - button.setVisible(enabled); - } + @Override + public void setEnabled(final boolean enabled) { + if (notStandAlone) { + button.setVisible(enabled); } + } - @Override - public void setIconResource(final ImageResource resource) { - if (notStandAlone) { - iconLabel.setLeftIconResource(resource); - layout(); - } + @Override + public void setIconResource(final ImageResource resource) { + if (notStandAlone) { + iconLabel.setLeftIconResource(resource); + layout(); } + } - @Override - public void setIconStyle(final String style) { - if (notStandAlone) { - iconLabel.setRightIcon(style); - layout(); - } + @Override + public void setIconStyle(final String style) { + if (notStandAlone) { + iconLabel.setRightIcon(style); + layout(); } + } - @Override - public void setText(final String text) { - if (notStandAlone) { - iconLabel.setText(text); - layout(); - } + @Override + public void setText(final String text) { + if (notStandAlone) { + iconLabel.setText(text); + layout(); } + } - @Override - public void setToolTipText(final String tooltip) { - if (notStandAlone) { - Tooltip.to(button, tooltip); - } + @Override + public void setToolTipText(final String tooltip) { + if (notStandAlone) { + Tooltip.to(button, tooltip); } + } - @Override - public void setVisible(final boolean visible) { - if (notStandAlone) { - button.setVisible(visible); - } else { - // button.setVisible(visible); - } + @Override + public void setVisible(final boolean visible) { + if (notStandAlone) { + button.setVisible(visible); + } else { + // button.setVisible(visible); } + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -28,7 +28,7 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.errors.NotImplementedException; import cc.kune.common.client.utils.TextUtils; -import cc.kune.core.client.resources.icons.IconConstants; +import cc.kune.core.client.resources.IconConstants; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.Composite; Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -27,115 +27,124 @@ public class MenuDescriptor extends AbstractGuiActionDescrip { - public static final String MENU_CLEAR = "menuclear"; - public static final String MENU_HIDE = "hidemenu"; - public static final String MENU_ONHIDE = "menuonhide"; - public static final String MENU_ONSHOW = "menuonshow"; - public static final String MENU_SHOW = "showmenu"; - public static final String MENU_SHOW_NEAR_TO = "showmenunearto"; - protected static final String MENU_STANDALONE = "menustandalone"; + public static final String MENU_CLEAR = "menuclear"; + public static final String MENU_HIDE = "hidemenu"; + public static final String MENU_ONHIDE = "menuonhide"; + public static final String MENU_ONSHOW = "menuonshow"; + protected static final String MENU_RIGHTICON = "menurighicon"; + public static final String MENU_SHOW = "showmenu"; + public static final String MENU_SHOW_NEAR_TO = "showmenunearto"; + protected static final String MENU_STANDALONE = "menustandalone"; - public MenuDescriptor() { - this(new BaseAction(null, null)); - } + public MenuDescriptor() { + this(new BaseAction(null, null)); + } - public MenuDescriptor(final AbstractAction action) { - this(NO_PARENT, action); - } + public MenuDescriptor(final AbstractAction action) { + this(NO_PARENT, action); + } - public MenuDescriptor(final GuiActionDescrip parent, final AbstractAction action) { - super(action); - setParent(parent); - putValue(MENU_HIDE, false); - putValue(MENU_SHOW, false); - putValue(MENU_CLEAR, false); - putValue(MENU_STANDALONE, false); - } + public MenuDescriptor(final GuiActionDescrip parent, final AbstractAction action) { + super(action); + setParent(parent); + putValue(MENU_HIDE, false); + putValue(MENU_SHOW, false); + putValue(MENU_CLEAR, false); + putValue(MENU_STANDALONE, false); + } - public MenuDescriptor(final String text) { - this(new BaseAction(text, null)); - } + public MenuDescriptor(final String text) { + this(new BaseAction(text, null)); + } - public MenuDescriptor(final String text, final ImageResource icon) { - this(new BaseAction(text, null, icon)); - } + public MenuDescriptor(final String text, final ImageResource icon) { + this(new BaseAction(text, null, icon)); + } - public MenuDescriptor(final String text, final String tooltip) { - this(new BaseAction(text, tooltip)); - } + public MenuDescriptor(final String text, final String tooltip) { + this(new BaseAction(text, tooltip)); + } - public MenuDescriptor(final String text, final String tooltip, final ImageResource icon) { - this(new BaseAction(text, tooltip, icon)); - } + public MenuDescriptor(final String text, final String tooltip, final ImageResource icon) { + this(new BaseAction(text, tooltip, icon)); + } - public MenuDescriptor(final String text, final String tooltip, final String icon) { - this(new BaseAction(text, tooltip, icon)); - } + public MenuDescriptor(final String text, final String tooltip, final String icon) { + this(new BaseAction(text, tooltip, icon)); + } - public void clear() { - // Action detects changes in values, then we fire a change (whatever) to - // fire this method in the UI - putValue(MENU_CLEAR, !((Boolean) getValue(MENU_CLEAR))); - } + public void clear() { + // Action detects changes in values, then we fire a change (whatever) to + // fire this method in the UI + putValue(MENU_CLEAR, !((Boolean) getValue(MENU_CLEAR))); + } - @Override - public Class<?> getType() { - return MenuDescriptor.class; - } + public ImageResource getRightIcon() { + return (ImageResource) super.getValue(MENU_RIGHTICON); + } - public void hide() { - putValue(MENU_HIDE, !((Boolean) getValue(MENU_HIDE))); - } + @Override + public Class<?> getType() { + return MenuDescriptor.class; + } - public boolean isStandalone() { - return (Boolean) super.getValue(MENU_STANDALONE); - } + public void hide() { + putValue(MENU_HIDE, !((Boolean) getValue(MENU_HIDE))); + } - /** - * Sets the standalone property (if the menu should have button (for a - * toolbar) or is a menu independent. - * - * @param standalone - * the new standalone - */ - public void setStandalone(final boolean standalone) { - putValue(MENU_STANDALONE, standalone); - } + public boolean isStandalone() { + return (Boolean) super.getValue(MENU_STANDALONE); + } - public void setText(final String text) { - putValue(Action.NAME, text); - } + public void setRightIcon(final ImageResource icon) { + putValue(MENU_RIGHTICON, icon); + } - /** - * Show the menu near the Element object specified - * - * @param object - * the element to show menu near of it - */ - public void show(final Object object) { - putValue(MENU_SHOW_NEAR_TO, object); - putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); - } + /** + * Sets the standalone property (if the menu should have button (for a + * toolbar) or is a menu independent. + * + * @param standalone + * the new standalone + */ + public void setStandalone(final boolean standalone) { + putValue(MENU_STANDALONE, standalone); + } - /** - * Show the menu near the position specified - * - * @param position - * the position to show menu near of it - */ - public void show(final Position position) { - putValue(MENU_SHOW_NEAR_TO, position); - putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); - } + public void setText(final String text) { + putValue(Action.NAME, text); + } - /** - * Show the menu near the Element id specified - * - * @param id - * the element id to show menu near of it - */ - public void show(final String id) { - putValue(MENU_SHOW_NEAR_TO, id); - putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); - } + /** + * Show the menu near the Element object specified + * + * @param object + * the element to show menu near of it + */ + public void show(final Object object) { + putValue(MENU_SHOW_NEAR_TO, object); + putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); + } + + /** + * Show the menu near the position specified + * + * @param position + * the position to show menu near of it + */ + public void show(final Position position) { + putValue(MENU_SHOW_NEAR_TO, position); + putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); + } + + /** + * Show the menu near the Element id specified + * + * @param id + * the element id to show menu near of it + */ + public void show(final String id) { + putValue(MENU_SHOW_NEAR_TO, id); + putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); + } } Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -40,131 +40,135 @@ 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); - if (imgRes != null) { - 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); - } + public void addRightIconStyle(final String style) { + iconRight.addStyleName(style); + } - public void addTextStyleName(final String style) { - label.addStyleName(style); - } + @Override + public void addStyleName(final String style) { + flow.addStyleName(style); + } - @Override - public void clear() { - flow.clear(); - } + public void addTextStyleName(final String style) { + label.addStyleName(style); + } - public HasClickHandlers getFocus() { - return self; - } + @Override + public void clear() { + flow.clear(); + } - @Override - public String getText() { - return label.getText(); - } + public HasClickHandlers getFocus() { + return self; + } - @Override - public Direction getTextDirection() { - return label.getTextDirection(); - } + @Override + public String getText() { + return label.getText(); + } - @Override - public Iterator<Widget> iterator() { - return flow.iterator(); - } + @Override + public Direction getTextDirection() { + return label.getTextDirection(); + } - @Override - public boolean remove(final Widget w) { - return flow.remove(w); - } + @Override + public Iterator<Widget> iterator() { + return flow.iterator(); + } - public void setLabelText(final String text) { - label.setText(text); - } + @Override + public boolean remove(final Widget w) { + return flow.remove(w); + } - 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 setLabelText(final String text) { + label.setText(text); + } - public void setLeftIconResource(final ImageResource res) { - iconLeft.setResource(res); - iconLeft.addStyleName("k-iconlabel-left"); - } + 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 setRightIcon(final String imgCss) { - iconRight.setUrl("images/clear.gif"); - iconRight.setStyleName(imgCss); - iconRight.addStyleName("oc-ico-pad"); - iconRight.addStyleName("k-iconlabel-right"); - } + public void setLeftIconResource(final ImageResource res) { + iconLeft.setResource(res); + iconLeft.addStyleName("k-iconlabel-left"); + } - public void setRightIconResource(final ImageResource res) { - iconRight.setResource(res); - 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"); + } - @Override - public void setStyleName(final String style) { - flow.setStyleName(style); - } + public void setRightIconResource(final ImageResource res) { + iconRight.setResource(res); + iconRight.addStyleName("k-iconlabel-right"); + } - @Override - public void setText(final String text) { - label.setText(text); - } + @Override + public void setStyleName(final String style) { + flow.setStyleName(style); + } - @Override - public void setText(final String text, final Direction dir) { - label.setText(text, dir); - } + @Override + public void setText(final String text) { + label.setText(text); + } - public void setTooltip(final String text) { - Tooltip.to(label, text); - } + @Override + public void setText(final String text, final Direction dir) { + label.setText(text, dir); + } - public void setWordWrap(final boolean wordWrap) { - label.setWordWrap(wordWrap); - } + public void setTooltip(final String text) { + Tooltip.to(label, text); + } + + public void setWordWrap(final boolean wordWrap) { + label.setWordWrap(wordWrap); + } } Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-05-04 20:29:42 UTC (rev 1340) @@ -470,7 +470,7 @@ } .k-iconlabel-right { - float: left; + /* float: left; */ /* margin-left: 5px; */ } Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -24,467 +24,491 @@ import com.google.gwt.resources.client.ImageResource; public interface CoreResources extends ClientBundle { - public interface Style extends CssResource { - String loadingSpiner(); - } + public interface Style extends CssResource { + String loadingSpiner(); + } - @Source("accept.png") - ImageResource accept(); + @Source("accept.png") + ImageResource accept(); - @Source("add.png") - ImageResource add(); + @Source("add.png") + ImageResource add(); - @Source("add-green.png") - ImageResource addGreen(); + @Source("add-green.png") + ImageResource addGreen(); - @Source("alert.png") - ImageResource alert(); + @Source("alert.png") + ImageResource alert(); - @Source("anybody.png") - ImageResource anybody(); + @Source("anybody.png") + ImageResource anybody(); - @Source("arrowdown.png") - ImageResource arrowdown(); + @Source("arrowdown.png") + ImageResource arrowdown(); - @Source("arrow-down-black.gif") - ImageResource arrowDownBlack(); + @Source("arrow-down-black.gif") + ImageResource arrowDownBlack(); - @Source("arrow-down-green.png") - ImageResource arrowDownGreen(); + @Source("arrow-down-green.png") + ImageResource arrowDownGreen(); - @Source("arrowdownsitebar.gif") - ImageResource arrowdownsitebar(); + @Source("arrowdownsitebar.gif") + ImageResource arrowdownsitebar(); - @Source("arrowdownsquarewhite.gif") - ImageResource arrowdownsquarewhite(); + @Source("arrowdownsquarewhite.gif") + ImageResource arrowdownsquarewhite(); - @Source("arrow-down-white.gif") - ImageResource arrowDownWhite(); + @Source("arrow-down-white.gif") + ImageResource arrowDownWhite(); - @Source("arrow_in.png") - ImageResource arrowIn(); + @Source("arrow_in.png") + ImageResource arrowIn(); - @Source("arrow-left-green.png") - ImageResource arrowLeftGreen(); + @Source("arrow-left-green.png") + ImageResource arrowLeftGreen(); - @Source("arrow_out.png") - ImageResource arrowOut(); + @Source("arrow_out.png") + ImageResource arrowOut(); - @Source("arrow-right-black.gif") - ImageResource arrowRightBlack(); + @Source("arrow-right-black.gif") + ImageResource arrowRightBlack(); - @Source("arrow-right-green.png") - ImageResource arrowRightGreen(); + @Source("arrow-right-green.png") + ImageResource arrowRightGreen(); - @Source("arrow-right-white.gif") - ImageResource arrowRightWhite(); + @Source("arrow-right-white.gif") + ImageResource arrowRightWhite(); - @Source("arrow-up-green.png") - ImageResource arrowUpGreen(); + @Source("arrow-up-green.png") + ImageResource arrowUpGreen(); - @Source("browser-32.png") - ImageResource browser32(); + @Source("browser-32.png") + ImageResource browser32(); - @Source("bullet_add.png") - ImageResource bulletAdd(); + @Source("bug.png") + ImageResource bug(); - @Source("bullet_black.png") - ImageResource bulletBlack(); + @Source("bullet_add.png") + ImageResource bulletAdd(); - @Source("bullet_blue.png") - ImageResource bulletBlue(); + @Source("bullet_black.png") + ImageResource bulletBlack(); - @Source("bullet_delete.png") - ImageResource bulletDelete(); + @Source("bullet_blue.png") + ImageResource bulletBlue(); - @Source("bullet_green.png") - ImageResource bulletGreen(); + @Source("bullet_delete.png") + ImageResource bulletDelete(); - @Source("bullet_pink.png") - ImageResource bulletPink(); + @Source("bullet_green.png") + ImageResource bulletGreen(); - @Source("bullet_purple.png") - ImageResource bulletPurple(); + @Source("bullet_pink.png") + ImageResource bulletPink(); - @Source("bullet_red.png") - ImageResource bulletRed(); + @Source("bullet_purple.png") + ImageResource bulletPurple(); - @Source("bullet_star.png") - ImageResource bulletStar(); + @Source("bullet_red.png") + ImageResource bulletRed(); - @Source("bullet_toggle_minus.png") - ImageResource bulletToggleMinus(); + @Source("bullet_star.png") + ImageResource bulletStar(); - @Source("bullet_toggle_plus.png") - ImageResource bulletTogglePlus(); + @Source("bullet_toggle_minus.png") + ImageResource bulletToggleMinus(); - @Source("bullet_yellow.png") - ImageResource bulletYellow(); + @Source("bullet_toggle_plus.png") + ImageResource bulletTogglePlus(); - @Source("button15cblue.png") - ImageResource button15cblue(); + @Source("bullet_yellow.png") + ImageResource bulletYellow(); - @Source("button15cdark.png") - ImageResource button15cdark(); + @Source("button15cblue.png") + ImageResource button15cblue(); - @Source("button15clight.png") - ImageResource button15clight(); + @Source("button15cdark.png") + ImageResource button15cdark(); - @Source("button15cxlight.png") - ImageResource button15cxlight(); + @Source("button15clight.png") + ImageResource button15clight(); - @Source("button15lblue.png") - ImageResource button15lblue(); + @Source("button15cxlight.png") + ImageResource button15cxlight(); - @Source("button15ldark.png") - ImageResource button15ldark(); + @Source("button15lblue.png") + ImageResource button15lblue(); - @Source("button15llight.png") - ImageResource button15llight(); + @Source("button15ldark.png") + ImageResource button15ldark(); - @Source("button15lxlight.png") - ImageResource button15lxlight(); + @Source("button15llight.png") + ImageResource button15llight(); - @Source("button15rblue.png") - ImageResource button15rblue(); + @Source("button15lxlight.png") + ImageResource button15lxlight(); - @Source("button15rdark.png") - ImageResource button15rdark(); + @Source("button15rblue.png") + ImageResource button15rblue(); - @Source("button15rlight.png") - ImageResource button15rlight(); + @Source("button15rdark.png") + ImageResource button15rdark(); - @Source("button15rxlight.png") - ImageResource button15rxlight(); + @Source("button15rlight.png") + ImageResource button15rlight(); - @Source("button17cblue.png") - ImageResource button17cblue(); + @Source("button15rxlight.png") + ImageResource button15rxlight(); - @Source("button17cdark.png") - ImageResource button17cdark(); + @Source("button17cblue.png") + ImageResource button17cblue(); - @Source("button17clight.png") - ImageResource button17clight(); + @Source("button17cdark.png") + ImageResource button17cdark(); - @Source("button17cxlight.png") - ImageResource button17cxlight(); + @Source("button17clight.png") + ImageResource button17clight(); - @Source("button17lblue.png") - ImageResource button17lblue(); + @Source("button17cxlight.png") + ImageResource button17cxlight(); - @Source("button17ldark.png") - ImageResource button17ldark(); + @Source("button17lblue.png") + ImageResource button17lblue(); - @Source("button17llight.png") - ImageResource button17llight(); + @Source("button17ldark.png") + ImageResource button17ldark(); - @Source("button17lxlight.png") - ImageResource button17lxlight(); + @Source("button17llight.png") + ImageResource button17llight(); - @Source("button17rblue.png") - ImageResource button17rblue(); + @Source("button17lxlight.png") + ImageResource button17lxlight(); - @Source("button17rdark.png") - ImageResource button17rdark(); + @Source("button17rblue.png") + ImageResource button17rblue(); - @Source("button17rlight.png") - ImageResource button17rlight(); + @Source("button17rdark.png") + ImageResource button17rdark(); - @Source("button17rxlight.png") - ImageResource button17rxlight(); + @Source("button17rlight.png") + ImageResource button17rlight(); - @Source("button20cblue.png") - ImageResource button20cblue(); + @Source("button17rxlight.png") + ImageResource button17rxlight(); - @Source("button20cdark.png") - ImageResource button20cdark(); + @Source("button20cblue.png") + ImageResource button20cblue(); - @Source("button20clight.png") - ImageResource button20clight(); + @Source("button20cdark.png") + ImageResource button20cdark(); - @Source("button20cxlight.png") - ImageResource button20cxlight(); + @Source("button20clight.png") + ImageResource button20clight(); - @Source("button20lblue.png") - ImageResource button20lblue(); + @Source("button20cxlight.png") + ImageResource button20cxlight(); - @Source("button20ldark.png") - ImageResource button20ldark(); + @Source("button20lblue.png") + ImageResource button20lblue(); - @Source("button20llight.png") - ImageResource button20llight(); + @Source("button20ldark.png") + ImageResource button20ldark(); - @Source("button20lxlight.png") - ImageResource button20lxlight(); + @Source("button20llight.png") + ImageResource button20llight(); - @Source("button20rblue.png") - ImageResource button20rblue(); + @Source("button20lxlight.png") + ImageResource button20lxlight(); - @Source("button20rdark.png") - ImageResource button20rdark(); + @Source("button20rblue.png") + ImageResource button20rblue(); - @Source("button20rlight.png") - ImageResource button20rlight(); + @Source("button20rdark.png") + ImageResource button20rdark(); - @Source("button20rxlight.png") - ImageResource button20rxlight(); + @Source("button20rlight.png") + ImageResource button20rlight(); - @Source("button-arrow-down.png") - ImageResource buttonArrowDown(); + @Source("button20rxlight.png") + ImageResource button20rxlight(); - @Source("button-help-blue.png") - ImageResource buttonHelpBlue(); + @Source("button-arrow-down.png") + ImageResource buttonArrowDown(); - @Source("button-help-dark.png") - ImageResource buttonHelpDark(); + @Source("button-help-blue.png") + ImageResource buttonHelpBlue(); - @Source("button-help-light.png") - ImageResource buttonHelpLight(); + @Source("button-help-dark.png") + ImageResource buttonHelpDark(); - @Source("by80x15.png") - ImageResource by80x15(); + @Source("button-help-light.png") + ImageResource buttonHelpLight(); - @Source("bync80x15.png") - ImageResource bync80x15(); + @Source("by80x15.png") + ImageResource by80x15(); - @Source("byncnd80x15.png") - ImageResource byncnd80x15(); + @Source("bync80x15.png") + ImageResource bync80x15(); - @Source("byncsa80x15.png") - ImageResource byncsa80x15(); + @Source("byncnd80x15.png") + ImageResource byncnd80x15(); - @Source("bynd80x15.png") - ImageResource bynd80x15(); + @Source("byncsa80x15.png") + ImageResource byncsa80x15(); - @Source("bysa80x15.png") - ImageResource bysa80x15(); + @Source("bynd80x15.png") + ImageResource bynd80x15(); - @Source("cancel.png") - ImageResource cancel(); + @Source("bysa80x15.png") + ImageResource bysa80x15(); - @Source("cancel-32.png") - ImageResource cancel32(); + @Source("cancel.png") + ImageResource cancel(); - @Source("charfontname.png") - ImageResource charfontname(); + @Source("cancel-32.png") + ImageResource cancel32(); - @Source("clear.png") - ImageResource clear(); + @Source("charfontname.png") + ImageResource charfontname(); - @Source("content_edit.png") - ImageResource contentEdit(); + @Source("checked.png") + ImageResource checked(); - @Source("copyleft.png") - ImageResource copyleft(); + @Source("clear.png") + ImageResource clear(); - @Source("cross.png") - ImageResource cross(); + @Source("content_edit.png") + ImageResource contentEdit(); - @Source("cross-dark.png") - ImageResource crossDark(); + @Source("copyleft.png") + ImageResource copyleft(); - @Source("core.css") - Style css(); + @Source("cross.png") + ImageResource cross(); - @Source("del.png") - ImageResource del(); + @Source("cross-dark.png") + ImageResource crossDark(); - @Source("emblem-important.png") - ImageResource emblemImportant(); + @Source("core.css") + Style css(); - @Source("emblem-system.png") - ImageResource emblemSystem(); + @Source("del.png") + ImageResource del(); - @Source("emite-room.png") - ImageResource emiteRoom(); + @Source("del-green.png") + ImageResource delGreen(); - @Source("error.png") - ImageResource error(); + @Source("emblem-important.png") + ImageResource emblemImportant(); - @Source("everybody.png") - ImageResource everybody(); + @Source("emblem-system.png") + ImageResource emblemSystem(); - @Source("folder-go-up.gif") - ImageResource folderGoUp(); + @Source("emite-room.png") + ImageResource emiteRoom(); - @Source("folderpathmenu.gif") - ImageResource folderpathmenu(); + @Source("error.png") + ImageResource error(); - @Source("fontheight.png") - ImageResource fontheight(); + @Source("everybody.png") + ImageResource everybody(); - @Source("fullscreen.png") - ImageResource fullscreen(); + @Source("folder-go-up.gif") + ImageResource folderGoUp(); - @Source("gnu-fdl.gif") - ImageResource gnuFdl(); + @Source("folderpathmenu.gif") + ImageResource folderpathmenu(); - @Source("group-def-icon.png") - ImageResource groupDefIcon(); + @Source("fontheight.png") + ImageResource fontheight(); - @Source("group-home.png") - ImageResource groupHome(); + @Source("fullscreen.png") + ImageResource fullscreen(); - @Source("important.png") - ImageResource important(); + @Source("gnu-fdl.gif") + ImageResource gnuFdl(); - @Source("important-32.png") - ImageResource important32(); + @Source("group-def-icon.png") + ImageResource groupDefIcon(); - @Source("info.png") - ImageResource info(); + @Source("group-home.png") + ImageResource groupHome(); - @Source("info-light.png") - ImageResource infoLight(); + @Source("important.png") + ImageResource important(); - @Source("kune-anim.gif") - ImageResource kuneAnim(); + @Source("important-32.png") + ImageResource important32(); - @Source("kune-anim-g.gif") - ImageResource kuneAnimG(); + @Source("info.png") + ImageResource info(); - @Source("kune-close.png") - ImageResource kuneClose(); + @Source("info-light.png") + ImageResource infoLight(); - @Source("kune-external-window.png") - ImageResource kuneExternalWindow(); + @Source("kune-anim.gif") + ImageResource kuneAnim(); - @Source("kune-help-translation-icon.png") - ImageResource kuneHelpTranslationIcon(); + @Source("kune-anim-g.gif") + ImageResource kuneAnimG(); - @Source("kuneicon16.gif") - ImageResource kuneicon16(); + @Source("kune-close.png") + ImageResource kuneClose(); - @Source("kune-icon16.png") - ImageResource kuneIcon16(); + @Source("kune-external-window.png") + ImageResource kuneExternalWindow(); - @Source("kune-logo-16px.png") - ImageResource kuneLogo16px(); + @Source("kune-help-translation-icon.png") + ImageResource kuneHelpTranslationIcon(); - @Source("kune-preferences.png") - ImageResource kunePreferences(); + @Source("kuneicon16.gif") + ImageResource kuneicon16(); - @Source("kune-search-ico.png") - ImageResource kuneSearchIco(); + @Source("kune-icon16.png") + ImageResource kuneIcon16(); - @Source("kune-search-ico-push.png") - ImageResource kuneSearchIcoPush(); + @Source("kune-logo-16px.png") + ImageResource kuneLogo16px(); - @Source("language.png") - ImageResource language(); + @Source("kune-preferences.png") + ImageResource kunePreferences(); - @Source("loading_gadget.gif") - ImageResource loadingGadget(); + @Source("kune-search-ico.png") + ImageResource kuneSearchIco(); - @Source("loading_gadget_small.gif") - ImageResource loadingGadgetSmall(); + @Source("kune-search-ico-push.png") + ImageResource kuneSearchIcoPush(); - @Source("loading-spiner.gif") - ImageResource loadingSpiner(); + @Source("language.png") + ImageResource language(); - @Source("new-chat.gif") - ImageResource newChat(); + @Source("loading_gadget.gif") + ImageResource loadingGadget(); - @Source("nobody.png") - ImageResource nobody(); + @Source("loading_gadget_small.gif") + ImageResource loadingGadgetSmall(); - @Source("no-copyleft.png") - ImageResource noCopyleft(); + @Source("loading-spiner.gif") + ImageResource loadingSpiner(); - @Source("nt.png") - ImageResource nt(); + @Source("arrow_out.png") + ImageResource maximize(); - @Source("opentriangle.gif") - ImageResource opentriangle(); + @Source("arrow_in.png") + ImageResource minimize(); - @Source("person2-60.png") - ImageResource person260(); + @Source("new-chat.gif") + ImageResource newChat(); - @Source("person-def.png") - ImageResource personDef(); + @Source("nobody.png") + ImageResource nobody(); - @Source("prefs.png") - ImageResource prefs(); + @Source("no-copyleft.png") + ImageResource noCopyleft(); - @Source("remove.png") - ImageResource remove(); + @Source("nt.png") + ImageResource nt(); - @Source("rss-icon.png") - ImageResource rssIcon(); + @Source("opentriangle.gif") + ImageResource opentriangle(); - @Source("search-ico.png") - ImageResource searchIco(); + @Source("person2-60.png") + ImageResource person260(); - @Source("spin-kune-thund-green.gif") - ImageResource spinKuneThundGreen(); + @Source("person-def.png") + ImageResource personDef(); - @Source("splitter-vert-bar.gif") - ImageResource splitterVertBar(); + @Source("prefs.png") + ImageResource prefs(); - @Source("star-10.png") - ImageResource star10(); + @Source("radiochecked.png") + ImageResource radiochecked(); - @Source("star-20.png") - ImageResource star20(); + @Source("radiounchecked.png") + ImageResource radioUnChecked(); - @Source("star-30.png") - ImageResource star30(); + @Source("remove.png") + ImageResource remove(); - @Source("star-40.png") - ImageResource star40(); + @Source("rss-icon.png") + ImageResource rssIcon(); - @Source("star-50.png") - ImageResource star50(); + @Source("search-ico.png") + ImageResource searchIco(); - @Source("star-60.png") - ImageResource star60(); + @Source("spin-kune-thund-green.gif") + ImageResource spinKuneThundGreen(); - @Source("star-70.png") - ImageResource star70(); + @Source("splitter-vert-bar.gif") + ImageResource splitterVertBar(); - @Source("star-80.png") - ImageResource star80(); + @Source("star-10.png") + ImageResource star10(); - @Source("star-90.png") - ImageResource star90(); + @Source("star-20.png") + ImageResource star20(); - @Source("star-grey.png") - ImageResource starGrey(); + @Source("star-30.png") + ImageResource star30(); - @Source("star-small-yellow.png") - ImageResource starSmallYellow(); + @Source("star-40.png") + ImageResource star40(); - @Source("star-vsmall-yellow.png") - ImageResource starVsmallYellow(); + @Source("star-50.png") + ImageResource star50(); - @Source("star-yellow.png") - ImageResource starYellow(); + @Source("star-60.png") + ImageResource star60(); - @Source("step1.png") - ImageResource step1(); + @Source("star-70.png") + ImageResource star70(); - @Source("step2.png") - ImageResource step2(); + @Source("star-80.png") + ImageResource star80(); - @Source("step3.png") - ImageResource step3(); + @Source("star-90.png") + ImageResource star90(); - @Source("step4.png") - ImageResource step4(); + @Source("star-grey.png") + ImageResource starGrey(); - @Source("step5.png") - ImageResource step5(); + @Source("star-small-yellow.png") + ImageResource starSmallYellow(); - @Source("theme-choose.png") - ImageResource themeChoose(); + @Source("star-vsmall-yellow.png") + ImageResource starVsmallYellow(); - @Source("triangle.gif") - ImageResource triangle(); + @Source("star-yellow.png") + ImageResource starYellow(); - @Source("unknown-60.png") - ImageResource unknown60(); + @Source("step1.png") + ImageResource step1(); - @Source("wave-icon.png") - ImageResource waveIcon(); + @Source("step2.png") + ImageResource step2(); + @Source("step3.png") + ImageResource step3(); + + @Source("step4.png") + ImageResource step4(); + + @Source("step5.png") + ImageResource step5(); + + @Source("theme-choose.png") + ImageResource themeChoose(); + + @Source("triangle.gif") + ImageResource triangle(); + + @Source("unchecked.png") + ImageResource unChecked(); + + @Source("unknown-60.png") + ImageResource unknown60(); + + @Source("wave-icon.png") + ImageResource waveIcon(); + } Copied: trunk/src/main/java/cc/kune/core/client/resources/IconConstants.java (from rev 1339, trunk/src/main/java/cc/kune/core/client/resources/icons/IconConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/IconConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/resources/IconConstants.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -0,0 +1,39 @@ +/* + * + * 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.core.client.resources; + +import com.google.gwt.resources.client.ImageResource; + +@Deprecated +public final class IconConstants { + + @Deprecated + public static final String CSS_SUFFIX = "k-icon-"; + + private static final String PATH_PREFIX = "images/"; + + @Deprecated + public static String toPath(final ImageResource img) { + return PATH_PREFIX + img.getName() + ".png"; + } + + private IconConstants() { + } +} Added: trunk/src/main/java/cc/kune/core/client/resources/bug.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/bug.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/checked.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/checked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/client/resources/core.css =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/core.css 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/core/client/resources/core.css 2011-05-04 20:29:42 UTC (rev 1340) @@ -1,9 +1,46 @@ @CHARSET "UTF-8"; +@external k-icon-info,k-icon-language,k-icon-kuneIcon16,k-icon-bug,k-icon-prefs,k-icon-groupHome,k-icon-addGreen,k-icon-maximize,k-icon-minimize,k-*; -/* @sprite */ +/* @sprite */ .loadingSpiner { - /* Unused - gwt-image: 'loadingSpiner'; - */ - margin-top: 2px; + /* Unused + gwt-image: 'loadingSpiner'; + */ + margin-top: 2px; } + +@sprite div .k-icon-info { + gwt-image: "info"; +} + +@sprite div .k-icon-language { + gwt-image: "language"; +} + +@sprite div .k-icon-kuneIcon16 { + gwt-image: "kuneIcon16"; +} + +@sprite div .k-icon-bug { + gwt-image: "bug"; +} + +@sprite div .k-icon-prefs { + gwt-image: "prefs"; +} + +@sprite div .k-icon-groupHome { + gwt-image: "groupHome"; +} + +@sprite div .k-icon-addGreen { + gwt-image: "addGreen"; +} + +@sprite div .k-icon-maximize { + gwt-image: "maximize"; +} + +@sprite div .k-icon-minimize { + gwt-image: "minimize"; +} \ No newline at end of file Added: trunk/src/main/java/cc/kune/core/client/resources/del-green.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/del-green.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/src/main/java/cc/kune/core/client/resources/icons/IconConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/icons/IconConstants.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/core/client/resources/icons/IconConstants.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -1,39 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.client.resources.icons; - -import com.google.gwt.resources.client.ImageResource; - -@Deprecated -public final class IconConstants { - - @Deprecated - public static final String CSS_SUFFIX = "k-icon-"; - - private static final String PATH_PREFIX = "images/"; - - @Deprecated - public static String toPath(final ImageResource img) { - return PATH_PREFIX + img.getName() + ".png"; - } - - private IconConstants() { - } -} Modified: trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/core/client/resources/icons/IconResources.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -22,50 +22,51 @@ import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; +@Deprecated public interface IconResources extends ClientBundle { - @Source("add-green.png") - ImageResource addGreen(); + @Source("add-green.png") + ImageResource addGreen(); - @Source("bug.png") - ImageResource bug(); + @Source("bug.png") + ImageResource bug(); - @Source("checked.png") - ImageResource checked(); + @Source("checked.png") + ImageResource checked(); - @Source("kicon.css") - IconCssResource css(); + @Source("kicon.css") + IconCssResource css(); - @Source("del-green.png") - ImageResource delGreen(); + @Source("del-green.png") + ImageResource delGreen(); - @Source("group-home.png") - ImageResource groupHome(); + @Source("group-home.png") + ImageResource groupHome(); - @Source("info.png") - ImageResource info(); + @Source("info.png") + ImageResource info(); - @Source("kune-icon16.png") - ImageResource kuneIcon16(); + @Source("kune-icon16.png") + ImageResource kuneIcon16(); - @Source("language.png") - ImageResource language(); + @Source("language.png") + ImageResource language(); - @Source("arrow_out.png") - ImageResource maximize(); + @Source("arrow_out.png") + ImageResource maximize(); - @Source("arrow_in.png") - ImageResource minimize(); + @Source("arrow_in.png") + ImageResource minimize(); - @Source("prefs.png") - ImageResource prefs(); + @Source("prefs.png") + ImageResource prefs(); - @Source("radiochecked.png") - ImageResource radiochecked(); + @Source("radiochecked.png") + ImageResource radiochecked(); - @Source("radiounchecked.png") - ImageResource radioUnChecked(); + @Source("radiounchecked.png") + ImageResource radioUnChecked(); - @Source("unchecked.png") - ImageResource unChecked(); + @Source("unchecked.png") + ImageResource unChecked(); } Added: trunk/src/main/java/cc/kune/core/client/resources/radiochecked.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/radiochecked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/radiounchecked.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/radiounchecked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/unchecked.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/unchecked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -31,7 +31,7 @@ import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.core.client.resources.CoreMessages; -import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.sn.actions.GotoGroupAction; import cc.kune.core.client.state.Session; @@ -49,115 +49,117 @@ public class SiteUserOptionsPresenter implements SiteUserOptions { - public static final MenuDescriptor LOGGED_USER_MENU = new MenuDescriptor(); - public static final String LOGGED_USER_MENU_ID = "kune-sump-lum"; - private final Provider<FileDownloadUtils> downloadProvider; - private final GotoGroupAction gotoGroupAction; - private final I18nTranslationService i18n; - private final IconResources img; - private SubMenuDescriptor partiMenu; - private ToolbarSeparatorDescriptor separator; - private final Session session; - private final SitebarActionsPresenter siteOptions; - private final StateManager stateManager; + public static final MenuDescriptor LOGGED_USER_MENU = new MenuDescriptor(); + public static final String LOGGED_USER_MENU_ID = "kune-sump-lum"; + private final Provider<FileDownloadUtils> downloadProvider; + private final GotoGroupAction gotoGroupAction; + private final I18nTranslationService i18n; + private SubMenuDescriptor partiMenu; + private final CoreResources res; + private ToolbarSeparatorDescriptor separator; + private final Session session; + private final SitebarActionsPresenter siteOptions; + private final StateManager stateManager; - @Inject - public SiteUserOptionsPresenter(final Session session, final StateManager stateManager, - final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n, - final IconResources img, final SitebarActionsPresenter siteOptions, final GotoGroupAction gotoGroupAction) { - super(); - this.session = session; - this.stateManager = stateManager; - this.downloadProvider = downloadProvider; - this.i18n = i18n; - this.img = img; - this.siteOptions = siteOptions; - this.gotoGroupAction = gotoGroupAction; - createActions(); + @Inject + public SiteUserOptionsPresenter(final Session session, final StateManager stateManager, + final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n, + final CoreResources img, final SitebarActionsPresenter siteOptions, + final GotoGroupAction gotoGroupAction) { + super(); + this.session = session; + this.stateManager = stateManager; + this.downloadProvider = downloadProvider; + this.i18n = i18n; + this.res = img; + this.siteOptions = siteOptions; + this.gotoGroupAction = gotoGroupAction; + createActions(); + separator.setVisible(false); + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + SiteUserOptionsPresenter.this.onUserSignIn(event.getUserInfo()); + separator.setVisible(true); + } + }); + session.onUserSignOut(true, new UserSignOutHandler() { + @Override + public void onUserSignOut(final UserSignOutEvent event) { + LOGGED_USER_MENU.setVisible(false); separator.setVisible(false); - session.onUserSignIn(true, new UserSignInHandler() { - @Override - public void onUserSignIn(final UserSignInEvent event) { - SiteUserOptionsPresenter.this.onUserSignIn(event.getUserInfo()); - separator.setVisible(true); - } - }); - session.onUserSignOut(true, new UserSignOutHandler() { - @Override - public void onUserSignOut(final UserSignOutEvent event) { - LOGGED_USER_MENU.setVisible(false); - separator.setVisible(false); - SiteUserOptionsPresenter.this.setLoggedUserName(""); - } - }); - } + SiteUserOptionsPresenter.this.setLoggedUserName(""); + } + }); + } - @Override - public void addAction(final GuiActionDescrip descriptor) { - addActionImpl(descriptor); - } + @Override + public void addAction(final GuiActionDescrip descriptor) { + addActionImpl(descriptor); + } - private void addActionImpl(final GuiActionDescrip descriptor) { - descriptor.setParent(LOGGED_USER_MENU); - siteOptions.getRightToolbar().add(descriptor); - } + private void addActionImpl(final GuiActionDescrip descriptor) { + descriptor.setParent(LOGGED_USER_MENU); + siteOptions.getRightToolbar().add(descriptor); + } - private void addPartipation(final GroupDTO group) { - final String logoImageUrl = group.hasLogo() ? downloadProvider.get().getLogoImageUrl(group.getStateToken()) - : "images/group-def-icon.gif"; - final MenuItemDescriptor participant = new MenuItemDescriptor(gotoGroupAction); - participant.setTarget(group); - participant.putValue(Action.NAME, group.getLongName()); - participant.putValue(Action.SMALL_ICON, logoImageUrl); - participant.setParent(partiMenu); - siteOptions.getRightToolbar().add(participant); - } + private void addPartipation(final GroupDTO group) { + final String logoImageUrl = group.hasLogo() ? downloadProvider.get().getLogoImageUrl( + group.getStateToken()) : "images/group-def-icon.gif"; + final MenuItemDescriptor participant = new MenuItemDescriptor(gotoGroupAction); + participant.setTarget(group); + participant.putValue(Action.NAME, group.getLongName()); + participant.putValue(Action.SMALL_ICON, logoImageUrl); + participant.setParent(partiMenu); + siteOptions.getRightToolbar().add(participant); + } - private void createActions() { - LOGGED_USER_MENU.setId(LOGGED_USER_MENU_ID); - LOGGED_USER_MENU.setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); - LOGGED_USER_MENU.setStyles("k-no-backimage, k-btn-sitebar, k-fl"); - siteOptions.getRightToolbar().add(LOGGED_USER_MENU); - separator = new ToolbarSeparatorDescriptor(Type.separator, SitebarActionsPresenter.RIGHT_TOOLBAR); - siteOptions.getRightToolbar().add(separator); - partiMenu = new SubMenuDescriptor(i18n.t("Your groups")); - addActionImpl(partiMenu); + private void createActions() { + LOGGED_USER_MENU.setId(LOGGED_USER_MENU_ID); + LOGGED_USER_MENU.setParent(SitebarActionsPresenter.RIGHT_TOOLBAR); + LOGGED_USER_MENU.setStyles("k-no-backimage, k-btn-sitebar, k-fl"); + LOGGED_USER_MENU.setRightIcon(res.arrowdownsitebar()); + siteOptions.getRightToolbar().add(LOGGED_USER_MENU); + separator = new ToolbarSeparatorDescriptor(Type.separator, SitebarActionsPresenter.RIGHT_TOOLBAR); + siteOptions.getRightToolbar().add(separator); + partiMenu = new SubMenuDescriptor(i18n.t("Your groups")); + addActionImpl(partiMenu); - final AbstractExtendedAction userHomeAction = new AbstractExtendedAction() { - @Override - public void actionPerformed(final ActionEvent event) { - goUserHome(); - } - }; - userHomeAction.putValue(Action.NAME, i18n.t(CoreMessages.YOUR_HOMEPAGE)); - userHomeAction.putValue(Action.SMALL_ICON, img.groupHome()); - final MenuItemDescriptor item = new MenuItemDescriptor(userHomeAction); - item.setPosition(0); - addActionImpl(item); - } + final AbstractExtendedAction userHomeAction = new AbstractExtendedAction() { + @Override + public void actionPerformed(final ActionEvent event) { + goUserHome(); + } + }; + userHomeAction.putValue(Action.NAME, i18n.t(CoreMessages.YOUR_HOMEPAGE)); + userHomeAction.putValue(Action.SMALL_ICON, res.groupHome()); + final MenuItemDescriptor item = new MenuItemDescriptor(userHomeAction); + item.setPosition(0); + addActionImpl(item); + } - private void goUserHome() { - stateManager.gotoHistoryToken(session.getCurrentUserInfo().getShortName()); - } + private void goUserHome() { + stateManager.gotoHistoryToken(session.getCurrentUserInfo().getShortName()); + } - private void onUserSignIn(final UserInfoDTO userInfoDTO) { - LOGGED_USER_MENU.setVisible(true); - LOGGED_USER_MENU.setEnabled(true); - setLoggedUserName(userInfoDTO.getShortName()); - partiMenu.clear(); - final List<GroupDTO> groupsIsAdmin = userInfoDTO.getGroupsIsAdmin(); - final List<GroupDTO> groupsIsCollab = userInfoDTO.getGroupsIsCollab(); - for (final GroupDTO group : groupsIsAdmin) { - addPartipation(group); - } - for (final GroupDTO group : groupsIsCollab) { - addPartipation(group); - } - partiMenu.setEnabled((groupsIsAdmin.size() + groupsIsCollab.size()) > 0); + private void onUserSignIn(final UserInfoDTO userInfoDTO) { + LOGGED_USER_MENU.setVisible(true); + LOGGED_USER_MENU.setEnabled(true); + setLoggedUserName(userInfoDTO.getShortName()); + partiMenu.clear(); + final List<GroupDTO> groupsIsAdmin = userInfoDTO.getGroupsIsAdmin(); + final List<GroupDTO> groupsIsCollab = userInfoDTO.getGroupsIsCollab(); + for (final GroupDTO group : groupsIsAdmin) { + addPartipation(group); } - - private void setLoggedUserName(final String shortName) { - LOGGED_USER_MENU.putValue(Action.NAME, shortName); + for (final GroupDTO group : groupsIsCollab) { + addPartipation(group); } + partiMenu.setEnabled((groupsIsAdmin.size() + groupsIsCollab.size()) > 0); + } + private void setLoggedUserName(final String shortName) { + LOGGED_USER_MENU.putValue(Action.NAME, shortName); + } + } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -34,7 +34,6 @@ import cc.kune.common.client.ui.KuneWindowUtils; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.shared.EventBus; @@ -48,149 +47,152 @@ import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; public class SitebarActionsPresenter extends - Presenter<SitebarActionsPresenter.SitebarActionsView, SitebarActionsPresenter.SitebarActionsProxy> implements - SitebarActions { + Presenter<SitebarActionsPresenter.SitebarActionsView, SitebarActionsPresenter.SitebarActionsProxy> + implements SitebarActions { - @ProxyCodeSplit - public interface SitebarActionsProxy extends Proxy<SitebarActionsPresenter> { - } + @ProxyCodeSplit + public interface SitebarActionsProxy extends Proxy<SitebarActionsPresenter> { + } - public interface SitebarActionsView extends View { + public interface SitebarActionsView extends View { - IsActionExtensible getLeftBar(); + IsActionExtensible getLeftBar(); - IsActionExtensible getRightBar(); + IsActionExtensible getRightBar(); - void showAboutDialog(); + void showAboutDialog(); - void showErrorDialog(); - } - public static final ToolbarDescriptor LEFT_TOOLBAR = new ToolbarDescriptor(); + void showErrorDialog(); + } + public static final ToolbarDescriptor LEFT_TOOLBAR = new ToolbarDescriptor(); - public static final MenuDescriptor OPTIONS_MENU = new MenuDescriptor(); - public static final ToolbarDescriptor RIGHT_TOOLBAR = new ToolbarDescriptor(); - public static final String SITE_OPTIONS_MENU = "kune-sop-om"; + public static final MenuDescriptor OPTIONS_MENU = new MenuDescriptor(); + public static final ToolbarDescriptor RIGHT_TOOLBAR = new ToolbarDescriptor(); + public static final String SITE_OPTIONS_MENU = "kune-sop-om"; - private final I18nTranslationService i18n; - private final IconResources icons; - private final Provider<SitebarNewGroupLink> newGroupLink; + private final I18nTranslationService i18n; + private final CoreResources icons; + private final Provider<SitebarNewGroupLink> newGroupLink; - private final CoreResources res; - private final Provider<SitebarSignInLink> signInLink; - private final Provider<SitebarSignOutLink> signOutLink; + private final CoreResources res; + private final Provider<SitebarSignInLink> signInLink; + private final Provider<SitebarSignOutLink> signOutLink; - @Inject - public SitebarActionsPresenter(final EventBus eventBus, final SitebarActionsView view, - final SitebarActionsProxy proxy, final I18nTranslationService i18n, - final Provider<SitebarNewGroupLink> newGroupLink, final Provider<SitebarSignOutLink> signOutLink, - final Provider<SitebarSignInLink> signInLink, final CoreResources res, final IconResources icons) { - super(eventBus, view, proxy); - this.i18n = i18n; - this.newGroupLink = newGroupLink; - this.signOutLink = signOutLink; - this.signInLink = signInLink; - this.res = res; - this.icons = icons; - init(); - } + @Inject + public SitebarActionsPresenter(final EventBus eventBus, final SitebarActionsView view, + final SitebarActionsProxy proxy, final I18nTranslationService i18n, + final Provider<SitebarNewGroupLink> newGroupLink, final Provider<SitebarSignOutLink> signOutLink, + final Provider<SitebarSignInLink> signInLink, final CoreResources res, final CoreResources icons) { + super(eventBus, view, proxy); + this.i18n = i18n; + this.newGroupLink = newGroupLink; + this.signOutLink = signOutLink; + this.signInLink = signInLink; + this.res = res; + this.icons = icons; + init(); + } - @Override - public IsActionExtensible getLeftToolbar() { - return getView().getLeftBar(); - } + @Override + public IsActionExtensible getLeftToolbar() { + return getView().getLeftBar(); + } - public MenuDescriptor getOptionsMenu() { - return OPTIONS_MENU; - } + public MenuDescriptor getOptionsMenu() { + return OPTIONS_MENU; + } - @Override - public IsActionExtensible getRightToolbar() { - return getView().getRightBar(); - } + @Override + public IsActionExtensible getRightToolbar() { + return getView().getRightBar(); + } - private void init() { - OPTIONS_MENU.withId(SITE_OPTIONS_MENU); - getView().getLeftBar().add(LEFT_TOOLBAR); - getView().getRightBar().add(RIGHT_TOOLBAR); - } + private void init() { + OPTIONS_MENU.withId(SITE_OPTIONS_MENU); + getView().getLeftBar().add(LEFT_TOOLBAR); + getView().getRightBar().add(RIGHT_TOOLBAR); + } - @ProxyEvent - public void onAppStart(final AppStartEvent event) { - final IsActionExtensible right = getView().getRightBar(); - OPTIONS_MENU.putValue(Action.NAME, i18n.t("Options")); - OPTIONS_MENU.putValue(Action.SMALL_ICON, res.arrowdownsitebar()); - OPTIONS_MENU.setParent(RIGHT_TOOLBAR); - OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar, k-fl"); - OPTIONS_MENU.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl); - final ToolbarSeparatorDescriptor separator = new ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); - final ToolbarSeparatorDescriptor separator2 = new ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); + @ProxyEvent + public void onAppStart(final AppStartEvent event) { + final IsActionExtensible right = getView().getRightBar(); + OPTIONS_MENU.putValue(Action.NAME, i18n.t("Options")); + OPTIONS_MENU.putValue(Action.SMALL_ICON, res.arrowdownsitebar()); + OPTIONS_MENU.setParent(RIGHT_TOOLBAR); + OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar, k-fl"); + OPTIONS_MENU.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl); + final ToolbarSeparatorDescriptor separator = new ToolbarSeparatorDescriptor(Type.separator, + RIGHT_TOOLBAR); + final ToolbarSeparatorDescriptor separator2 = new ToolbarSeparatorDescriptor(Type.separator, + RIGHT_TOOLBAR); - final MenuSeparatorDescriptor menuSeparator = new MenuSeparatorDescriptor(OPTIONS_MENU); - final AbstractExtendedAction bugsAction = new AbstractExtendedAction() { - @Override - public void actionPerformed(final ActionEvent event) { - KuneWindowUtils.open("http://kune.ourproject.org/issues/"); - } - }; - bugsAction.putValue(Action.NAME, i18n.t("Report Kune issues/problems")); - bugsAction.putValue(Action.SMALL_ICON, icons.bug()); - final MenuItemDescriptor reportBugs = new MenuItemDescriptor(OPTIONS_MENU, bugsAction); + final MenuSeparatorDescriptor menuSeparator = new MenuSeparatorDescriptor(OPTIONS_MENU); + final AbstractExtendedAction bugsAction = new AbstractExtendedAction() { + @Override + public void actionPerformed(final ActionEvent event) { + KuneWindowUtils.open("http://kune.ourproject.org/issues/"); + } + }; + bugsAction.putValue(Action.NAME, i18n.t("Report Kune issues/problems")); + bugsAction.putValue(Action.SMALL_ICON, icons.bug()); + final MenuItemDescriptor reportBugs = new MenuItemDescriptor(OPTIONS_MENU, bugsAction); - final AbstractExtendedAction errorAction = new AbstractExtendedAction() { - @Override - public void actionPerformed(final ActionEvent event) { - getView().showErrorDialog(); - } - }; + final AbstractExtendedAction errorAction = new AbstractExtendedAction() { + @Override + public void actionPerformed(final ActionEvent event) { + getView().showErrorDialog(); + } + }; - final AbstractExtendedAction aboutAction = new AbstractExtendedAction() { - @Override - public void actionPerformed(final ActionEvent event) { - getView().showAboutDialog(); - } - }; + final AbstractExtendedAction aboutAction = new AbstractExtendedAction() { + @Override + public void actionPerformed(final ActionEvent event) { + getView().showAboutDialog(); + } + }; - final AbstractExtendedAction wavePowered = new AbstractExtendedAction() { - @Override - public void actionPerformed(final ActionEvent event) { - KuneWindowUtils.open("http://incubator.apache.org/wave/"); - } - }; - final MenuItemDescriptor gotoKuneDevSite = new MenuItemDescriptor(OPTIONS_MENU, new AbstractAction() { - @Override - public void actionPerformed(final ActionEvent event) { - KuneWindowUtils.open("http://kune.ourproject.org/"); - } + final AbstractExtendedAction wavePowered = new AbstractExtendedAction() { + @Override + public void actionPerformed(final ActionEvent event) { + KuneWindowUtils.open("http://incubator.apache.org/wave/"); + } + }; + final MenuItemDescriptor gotoKuneDevSite = new MenuItemDescriptor(OPTIONS_MENU, + new AbstractAction() { + @Override + public void actionPerformed(final ActionEvent event) { + KuneWindowUtils.open("http://kune.ourproject.org/"); + } }); - gotoKuneDevSite.putValue(Action.NAME, i18n.t("kune development site")); - gotoKuneDevSite.putValue(Action.SMALL_ICON, icons.kuneIcon16()); + gotoKuneDevSite.putValue(Action.NAME, i18n.t("kune development site")); + gotoKuneDevSite.putValue(Action.SMALL_ICON, icons.kuneIcon16()); - wavePowered.putValue(Action.NAME, i18n.t("Apache Wave powered")); - wavePowered.putValue(Action.SMALL_ICON, res.waveIcon()); - aboutAction.putValue(Action.NAME, i18n.t("About kune")); - aboutAction.putValue(Action.SMALL_ICON, res.info()); - errorAction.putValue(Action.NAME, i18n.t("Errors info")); - errorAction.putValue(Action.SMALL_ICON, res.important()); - // aboutAction.setShortcut(shortcut); - // shortcutReg.put(shortcut, aboutAction); + wavePowered.putValue(Action.NAME, i18n.t("Apache Wave powered")); + wavePowered.putValue(Action.SMALL_ICON, res.waveIcon()); + aboutAction.putValue(Action.NAME, i18n.t("About kune")); + aboutAction.putValue(Action.SMALL_ICON, res.info()); + errorAction.putValue(Action.NAME, i18n.t("Errors info")); + errorAction.putValue(Action.SMALL_ICON, res.important()); + // aboutAction.setShortcut(shortcut); + // shortcutReg.put(shortcut, aboutAction); - right.add(signInLink.get()); - right.add(signOutLink.get()); - right.add(separator2); - right.add(newGroupLink.get()); - right.add(separator); - right.add(OPTIONS_MENU); - right.add(gotoKuneDevSite); - right.add(reportBugs); - right.add(new MenuItemDescriptor(OPTIONS_MENU, errorAction)); - right.add(new MenuItemDescriptor(OPTIONS_MENU, aboutAction)); - right.add(menuSeparator); - right.add(new MenuItemDescriptor(OPTIONS_MENU, wavePowered)); - } + right.add(signInLink.get()); + right.add(signOutLink.get()); + right.add(separator2); + right.add(newGroupLink.get()); + right.add(separator); + right.add(OPTIONS_MENU); + right.add(gotoKuneDevSite); + right.add(reportBugs); + right.add(new MenuItemDescriptor(OPTIONS_MENU, errorAction)); + right.add(new MenuItemDescriptor(OPTIONS_MENU, aboutAction)); + right.add(menuSeparator); + right.add(new MenuItemDescriptor(OPTIONS_MENU, wavePowered)); + } - @Override - protected void revealInParent() { - RevealRootContentEvent.fire(this, this); - } + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } } Added: trunk/src/main/java/cc/kune/core/client/sitebar/search/FormFeedback.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/FormFeedback.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/FormFeedback.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -0,0 +1,126 @@ +/******************************************************************************* + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + ******************************************************************************/ +package cc.kune.core.client.sitebar.search; + +import com.google.gwt.user.client.ui.Label; + +/** + * This widget shows an icon to give feedback on form fields + */ +public class FormFeedback extends Label { + /** + * Feedback status error + */ + public static final int ERROR = 2; + + private static final String ERROR_STYLE = "error"; + + /** + * Feedback status loading + */ + public static final int LOADING = 4; + + private static final String LOADING_STYLE = "loading"; + + /** + * Feedback status none + */ + public static final int NONE = 5; + + /** + * Feedback status valid + */ + public static final int VALID = 3; + private static final String VALID_STYLE = "valid"; + /** + * Feedback status warning + */ + public static final int WARNING = 1; + private static final String WARNING_STYLE = "warning"; + + private int mstatus = NONE; + + /** + * Creates a new FormFeedback widget + */ + public FormFeedback() { + this(true); + } + + /** + * Creates a new FormFeedback widget + * + * @param inform + * true if this feedback widget needs our standard for styles and + * false otherwise + */ + public FormFeedback(final boolean inform) { + getElement().addClassName("rpt-formfeedback"); + if (inform) { + getElement().addClassName("rpt-formfeedback-inform"); + } + } + + /** + * Gets the status of this FormFeedback + * + * @return the form feedback + */ + public int getStatus() { + return mstatus; + } + + private void removeStyles() { + getElement().removeClassName(WARNING_STYLE); + getElement().removeClassName(ERROR_STYLE); + getElement().removeClassName(LOADING_STYLE); + getElement().removeClassName(VALID_STYLE); + } + + /** + * Sets the status for this FormFeedback + * + * @param status + * the status + */ + public void setStatus(final int status) { + mstatus = status; + removeStyles(); + + switch (status) { + case WARNING: + getElement().addClassName(WARNING_STYLE); + setTitle("Warning"); + return; + case ERROR: + getElement().addClassName(ERROR_STYLE); + setTitle("Error"); + return; + case LOADING: + getElement().addClassName(LOADING_STYLE); + setTitle("Loading"); + return; + case VALID: + getElement().addClassName(VALID_STYLE); + setTitle("Valid"); + return; + default: + setTitle(""); + removeStyles(); + return; + } + } +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sitebar/search/FormFeedback.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -0,0 +1,906 @@ +/******************************************************************************* + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Source: http://www.zackgrossbart.com/hackito/gwt-rest-auto/ + * + ******************************************************************************/ +package cc.kune.core.client.sitebar.search; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import cc.kune.common.client.log.Log; +import cc.kune.core.shared.SearcherConstants; + +import com.google.gwt.event.dom.client.KeyUpEvent; +import com.google.gwt.event.dom.client.KeyUpHandler; +import com.google.gwt.event.logical.shared.SelectionEvent; +import com.google.gwt.event.logical.shared.SelectionHandler; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.RequestCallback; +import com.google.gwt.http.client.RequestException; +import com.google.gwt.http.client.Response; +import com.google.gwt.http.client.URL; +import com.google.gwt.json.client.JSONArray; +import com.google.gwt.json.client.JSONObject; +import com.google.gwt.json.client.JSONParser; +import com.google.gwt.json.client.JSONValue; +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.Focusable; +import com.google.gwt.user.client.ui.SuggestBox; +import com.google.gwt.user.client.ui.SuggestOracle; +import com.google.gwt.user.client.ui.SuggestOracle.Callback; +import com.google.gwt.user.client.ui.SuggestOracle.Request; +import com.google.gwt.user.client.ui.SuggestOracle.Suggestion; +import com.google.gwt.user.client.ui.TextArea; +import com.google.gwt.user.client.ui.TextBox; +import com.google.gwt.user.client.ui.TextBoxBase; + +/** + * A SuggestBox that uses REST and allows for multiple values, autocomplete and + * browsing + * + * @author Bess Siegal <bsiegal(a)novell.com> + */ +public class MultivalueSuggestBox extends Composite implements SelectionHandler<Suggestion>, Focusable, + KeyUpHandler { + /** + * Bean for name-value pairs + */ + private class Option { + + private String mname; + private String mvalue; + + /** + * No argument constructor + */ + public Option() { + } + + /** + * @return Returns the name. + */ + public String getName() { + return mname; + } + + /** + * @return Returns the value. + */ + public String getValue() { + return mvalue; + } + + /** + * @param name + * The name to set. + */ + public void setName(final String name) { + mname = name; + } + + /** + * @param value + * The value to set. + */ + public void setValue(final String value) { + mvalue = value; + } + + } + /** + * An abstract class that handles success and error conditions from the REST + * call + */ + private abstract class OptionQueryCallback { + abstract void error(Throwable exception); + + abstract void success(OptionResultSet optResults); + } + /** + * Bean for total size and options + */ + protected class OptionResultSet { + /** JSON key for DisplayName */ + public static final String DISPLAY_NAME = "longName"; + /** JSON key for Options */ + public static final String OPTIONS = "list"; + /** JSON key for the size of the Results */ + public static final String TOTAL_SIZE = "size"; + + /** JSON key for Value */ + public static final String VALUE = "shortName"; + + private final List<Option> m_options = new ArrayList<Option>(); + private int mtotalSize; + + /** + * Constructor. Must pass in the total size. + * + * @param totalSize + * the total size of the template + */ + public OptionResultSet(final int totalSize) { + setTotalSize(totalSize); // NOPMD by vjrj on 4/05/11 19:45 + } + + /** + * Add an option + * + * @param option + * - the Option to add + */ + public void addOption(final Option option) { + m_options.add(option); + } + + /** + * @return an array of Options + */ + public Option[] getOptions() { + return m_options.toArray(new Option[m_options.size()]); + } + + /** + * @return Returns the totalSize. + */ + public int getTotalSize() { + return mtotalSize; + } + + /** + * @param totalSize + * The totalSize to set. + */ + public void setTotalSize(final int totalSize) { + mtotalSize = totalSize; + } + } + /** + * A bean to serve as a custom suggestion so that the value is available and + * the replace will look like it is supporting multivalues + */ + class OptionSuggestion implements SuggestOracle.Suggestion { + static final String NEXT_VALUE = "NEXT"; + static final String PREVIOUS_VALUE = "PREVIOUS"; + private String mdisplay; + private String mname; + private final String mreplace; + private final String mvalue; + + /** + * Constructor for navigation options + * + * @param nav + * - next or previous value + * @param currentTextValue + * - the current contents of the text box + */ + OptionSuggestion(final String nav, final String currentTextValue) { + if (NEXT_VALUE.equals(nav)) { + mdisplay = "<div class=\"autocompleterNext\" title=\"Next\"></div>"; + } else { + mdisplay = "<div class=\"autocompleterPrev\" title=\"Previous\"></div>"; + } + mreplace = currentTextValue; + mvalue = nav; + } + + /** + * Constructor for regular options + * + * @param displ + * - the name of the option + * @param val + * - the value of the option + * @param replacePre + * - the current contents of the text box + * @param query + * - the query + */ + OptionSuggestion(final String displ, final String val, final String replacePre, final String query) { + mname = displ; + final int begin = displ.toLowerCase().indexOf(query.toLowerCase()); + if (begin >= 0) { + final int end = begin + query.length(); + final String match = displ.substring(begin, end); + mdisplay = displ.replaceFirst(match, "<b>" + match + "</b>"); + } else { + // may not necessarily be a part of the query, for example if "*" was + // typed. + mdisplay = displ; + } + mreplace = getFullReplaceText(displ, replacePre); + mvalue = val; + } + + @Override + public String getDisplayString() { + return mdisplay; + } + + /** + * Get the name of the option. (when not multivalued, this will be the same + * as getReplacementString) + * + * @return name + */ + public String getName() { + return mname; + } + + @Override + public String getReplacementString() { + return mreplace; + } + + /** + * Get the value of the option + * + * @return value + */ + public String getValue() { + return mvalue; + } + } + /** + * A custom callback that has the original SuggestOracle.Request and + * SuggestOracle.Callback + */ + private class RestSuggestCallback extends OptionQueryCallback { + private final SuggestOracle.Callback m_callback; + private final String m_query; // this may be different from + // m_request.getQuery when multivalued it's + // only the substring after the last delimiter + private final SuggestOracle.Request m_request; + + RestSuggestCallback(final Request request, final Callback callback, final String query) { + m_request = request; + m_callback = callback; + m_query = query; + } + + @Override + public void error(final Throwable exception) { + updateFormFeedback(FormFeedback.ERROR, "Invalid: " + m_query); + } + + @Override + public void success(final OptionResultSet optResults) { + final SuggestOracle.Response resp = new SuggestOracle.Response(); + final List<OptionSuggestion> suggs = new ArrayList<OptionSuggestion>(); + final int totSize = optResults.getTotalSize(); + + if (totSize < 1) { + // if there were no suggestions, then it's an invalid value + updateFormFeedback(FormFeedback.ERROR, "Invalid: " + m_query); + + } else if (totSize == 1) { + // it's an exact match, so do not bother with showing suggestions, + final Option o = optResults.getOptions()[0]; + final String displ = o.getName(); + + // remove the last bit up to separator + // mfield.setText(getFullReplaceText(displ, m_request.getQuery())); + + Log.info("RestSuggestCallback.success! exact match found for displ = " + displ); + + // it's valid! + updateFormFeedback(FormFeedback.VALID, null); + + // set the value into the valueMap + putValue(displ, o.getValue()); + + } else { + // more than 1 so show the suggestions + + // if not at the first page, show PREVIOUS + if (mindexFrom > 0) { + final OptionSuggestion prev = new OptionSuggestion(OptionSuggestion.PREVIOUS_VALUE, + m_request.getQuery()); + suggs.add(prev); + } + + // show the suggestions + for (final Option o : optResults.getOptions()) { + final OptionSuggestion sugg = new OptionSuggestion(o.getName(), o.getValue(), + m_request.getQuery(), m_query); + suggs.add(sugg); + } + + // if there are more pages, show NEXT + if (mindexTo < totSize) { + final OptionSuggestion next = new OptionSuggestion(OptionSuggestion.NEXT_VALUE, + m_request.getQuery()); + suggs.add(next); + } + + // nothing has been picked yet, so let the feedback show an error + // (unsaveable) + updateFormFeedback(FormFeedback.ERROR, "Invalid: " + m_query); + } + + // it's ok (and good) to pass an empty suggestion list back to the suggest + // box's callback method + // the list is not shown at all if the list is empty. + resp.setSuggestions(suggs); + m_callback.onSuggestionsReady(m_request, resp); + } + + } + /* + * Some custom inner classes for our SuggestOracle + */ + /** + * A custom Suggest Oracle + */ + private class RestSuggestOracle extends SuggestOracle { + private SuggestOracle.Callback mcallback; + private SuggestOracle.Request mrequest; + private final Timer mtimer; + + RestSuggestOracle() { + mtimer = new Timer() { + + @Override + public void run() { + /* + * The reason we check for empty string is found at + * http://development.lombardi.com/?p=39 -- paraphrased, if you + * backspace quickly the contents of the field are emptied but a query + * for a single character is still executed. Workaround for this is to + * check for an empty string field here. + */ + + if (!mfield.getText().trim().isEmpty()) { + if (misMultivalued) { + // calling this here in case a user is trying to correct the "kev" + // value of Allison Andrews, Kev, Josh Nolan or pasted in multiple + // values + findExactMatches(); + } + getSuggestions(); + } + } + }; + } + + private void getSuggestions() { + String query = mrequest.getQuery(); + + // find the last thing entered up to the last separator + // and use that as the query + if (misMultivalued) { + final int sep = query.lastIndexOf(DISPLAY_SEPARATOR); + if (sep > 0) { + query = query.substring(sep + DISPLAY_SEPARATOR.length()); + } + } + query = query.trim(); + + // do not query if it's just an empty String + // also do not get suggestions you've already got an exact match for this + // string in the m_valueMap + if (query.length() > 0 && mvalueMap.get(query) == null) { + // JSUtil.println("getting Suggestions for: " + query); + updateFormFeedback(FormFeedback.LOADING, null); + + queryOptions(query, mindexFrom, mindexTo, new RestSuggestCallback(mrequest, mcallback, query)); + } + } + + @Override + public boolean isDisplayStringHTML() { + return true; + } + + @Override + public void requestSuggestions(final SuggestOracle.Request request, + final SuggestOracle.Callback callback) { + // This is the method that gets called by the SuggestBox whenever some + // types into the text field + mrequest = request; + mcallback = callback; + + // reset the indexes (b/c NEXT and PREV call getSuggestions directly) + resetPageIndices(); + + // If the user keeps triggering this event (e.g., keeps typing), cancel + // and restart the timer + mtimer.cancel(); + mtimer.schedule(DELAY); + } + } + private static final int DELAY = 1000; + + private static final String DISPLAY_SEPARATOR = ", "; + private static final int FIND_EXACT_MATCH_QUERY_LIMIT = 20; + private static final int PAGE_SIZE = 15; + private static final String VALUE_DELIM = ";"; + + /** + * Returns a String without the last delimiter + * + * @param str + * - String to trim + * @param delim + * - the delimiter + * @return the String without the last delimter + */ + private static String trimLastDelimiter(String str, final String delim) { // NOPMD + // by + // vjrj + // on + // 4/05/11 + // 19:46 + if (str.length() > 0) { + str = str.substring(0, str.length() - delim.length()); + } + return str; + } + + private final FormFeedback mfeedback; + private final SuggestBox mfield; + private int mfindExactMatchesFound = 0; + + private final ArrayList<String> mfindExactMatchesNot = new ArrayList<String>(); + + private int mfindExactMatchesTotal = 0; + + private int mindexFrom = 0; + + private int mindexTo = 0; + + private boolean misMultivalued = false; + + private final String mrestEndpointUrl; + private final Map<String, String> mvalueMap; + + /** + * Constructor. + * + * @param the + * URL for the REST endpoint. This URL should accept the parameters q + * (for query), indexFrom and indexTo + * @param isMultivalued + * - true for allowing multiple values + */ + public MultivalueSuggestBox(final String restEndpointUrl, final boolean isMultivalued) { + mrestEndpointUrl = restEndpointUrl; + misMultivalued = isMultivalued; + + final FlowPanel panel = new FlowPanel(); + TextBoxBase textfield; + if (isMultivalued) { + panel.addStyleName("textarearow"); + textfield = new TextArea(); + } else { + panel.addStyleName("textfieldrow"); + textfield = new TextBox(); + } + + // Create our own SuggestOracle that queries REST endpoint + final SuggestOracle oracle = new RestSuggestOracle(); + // intialize the SuggestBox + mfield = new SuggestBox(oracle, textfield); + if (isMultivalued) { + // have to do this here b/c gwt suggest box wipes + // style name if added in previous if + textfield.addStyleName("multivalue"); + } + mfield.addStyleName("wideTextField"); + mfield.addSelectionHandler(this); + mfield.addKeyUpHandler(this); + + panel.add(mfield); + mfeedback = new FormFeedback(); + // panel.add(mfeedback); + + initWidget(panel); + + /* + * Create a Map that holds the values that should be stored. It will be + * keyed on "display value", so that any time a "display value" is added or + * removed the valueMap can be updated. + */ + mvalueMap = new HashMap<String, String>(); + + resetPageIndices(); + } + + private void findExactMatch(final String displayValue, final int position) { + updateFormFeedback(FormFeedback.LOADING, null); + + queryOptions(displayValue, 0, FIND_EXACT_MATCH_QUERY_LIMIT, // return a + // relatively + // small amount + // in case + // wanted "Red" + // and + // "Brick Red" + // is the first + // thing + // returned + new OptionQueryCallback() { + + @Override + public void error(final Throwable exception) { + // an exact match couldn't be found, just increment not found + mfindExactMatchesNot.add(displayValue); + finalizeFindExactMatches(); + } + + private void extactMatchFound(final int position, final Option option) { + putValue(option.getName(), option.getValue()); + Log.info("extactMatchFound ! exact match found for displ = " + displayValue); + + // and replace the text + final String text = mfield.getText(); + final String[] keys = text.split(DISPLAY_SEPARATOR.trim()); + keys[position] = option.getName(); + String join = ""; + for (final String n : keys) { + join += n.trim() + DISPLAY_SEPARATOR; + } + join = trimLastDelimiter(join, DISPLAY_SEPARATOR); + // Commented mfield.setText(join); + + mfindExactMatchesFound++; + } + + private void finalizeFindExactMatches() { + if (mfindExactMatchesFound + mfindExactMatchesNot.size() == mfindExactMatchesTotal) { + // when the found + not = total, we're done + if (mfindExactMatchesNot.size() > 0) { + String join = ""; + for (final String val : mfindExactMatchesNot) { + join += val.trim() + DISPLAY_SEPARATOR; + } + join = trimLastDelimiter(join, DISPLAY_SEPARATOR); + updateFormFeedback(FormFeedback.ERROR, "Invalid:" + join); + } else { + updateFormFeedback(FormFeedback.VALID, null); + } + } + } + + @Override + public void success(final OptionResultSet optResults) { + final int totSize = optResults.getTotalSize(); + if (totSize == 1) { + // an exact match was found, so place it in the value map + final Option option = optResults.getOptions()[0]; + extactMatchFound(position, option); + } else { + // try to find the exact matches within the results + boolean found = false; + for (final Option option : optResults.getOptions()) { + if (displayValue.equalsIgnoreCase(option.getName())) { + extactMatchFound(position, option); + found = true; + break; + } + } + if (!found) { + mfindExactMatchesNot.add(displayValue); + Log.info("RestExactMatchCallback -- exact match not found for displ = " + displayValue); + } + } + finalizeFindExactMatches(); + } + }); + } + + /** + * If there is more than one key in the text field, check that every key has a + * value in the map. For any that do not, try to find its exact match. + */ + private void findExactMatches() { + final String text = mfield.getText(); + final String[] keys = text.split(DISPLAY_SEPARATOR.trim()); + final int len = keys.length; + if (len < 2) { + // do not continue. if there's 1, it is the last one, and getSuggestions + // can handle it + return; + } + + mfindExactMatchesTotal = 0; + mfindExactMatchesFound = 0; + mfindExactMatchesNot.clear(); + for (int pos = 0; pos < len; pos++) { + final String key = keys[pos].trim(); + + if (!key.isEmpty()) { + final String v = mvalueMap.get(key); + if (null == v) { + mfindExactMatchesTotal++; + } + } + } + // then loop through again and try to find them + /* + * We may have invalid values due to a multi-value copy-n-paste, or going + * back and messing with a middle or first key; so for each invalid value, + * try to find an exact match. * + */ + for (int pos = 0; pos < len; pos++) { + final String key = keys[pos].trim(); + if (!key.isEmpty()) { + final String v = mvalueMap.get(key); + if (null == v) { + findExactMatch(key, pos); + } + } + } + } + + private String getFullReplaceText(final String displ, String replacePre) { // NOPMD + // by + // vjrj + // on + // 4/05/11 + // 19:45 + // replace the last bit after the last comma + if (replacePre.lastIndexOf(DISPLAY_SEPARATOR) > 0) { + replacePre = replacePre.substring(0, replacePre.lastIndexOf(DISPLAY_SEPARATOR)) + + DISPLAY_SEPARATOR; + } else { + replacePre = ""; + } + // then add a comma + if (misMultivalued) { + return replacePre + displ + DISPLAY_SEPARATOR; + } else { + return displ; + } + } + + public SuggestBox getSuggestBox() { + return mfield; + } + + @Override + public int getTabIndex() { + return mfield.getTabIndex(); + } + + /** + * Get the value(s) as a String. If allowing multivalues, separated by the + * VALUE_DELIM + * + * @return value(s) as a String + */ + public String getValue() { + // String together all the values in the valueMap + // based on the display values shown in the field + final String text = mfield.getText(); + + String values = ""; + String invalids = ""; + String newKeys = ""; + if (misMultivalued) { + final String[] keys = text.split(DISPLAY_SEPARATOR); + for (String key : keys) { + key = key.trim(); + if (!key.isEmpty()) { + final String v = mvalueMap.get(key); + Log.info("getValue for key = " + key + " is v = " + v); + if (null != v) { + values += v + VALUE_DELIM; + // rebuild newKeys removing invalids and dups + newKeys += key + DISPLAY_SEPARATOR; + } else { + invalids += key + DISPLAY_SEPARATOR; + } + } + } + values = trimLastDelimiter(values, VALUE_DELIM); + // set the new display values + mfield.setText(newKeys); + } else { + values = mvalueMap.get(text); + } + + // if there were any invalid show warning + if (!invalids.isEmpty()) { + // trim last separator + invalids = trimLastDelimiter(invalids, DISPLAY_SEPARATOR); + updateFormFeedback(FormFeedback.ERROR, "Invalids: " + invalids); + } + return values; + } + + /** + * Get the value map + * + * @return value map + */ + public Map<String, String> getValueMap() { + return mvalueMap; + } + + @Override + public void onKeyUp(final KeyUpEvent event) { + /* + * Because SuggestOracle.requestSuggestions does not get called when the + * text field is empty this key up handler is necessary for handling the + * case when there is an empty text field... Here, the FormFeedback is + * reset. + */ + updateFormFeedback(FormFeedback.NONE, null); + } + + @Override + public void onSelection(final SelectionEvent<Suggestion> event) { + final Suggestion suggestion = event.getSelectedItem(); + if (suggestion instanceof OptionSuggestion) { + final OptionSuggestion osugg = (OptionSuggestion) suggestion; + // if NEXT or PREVIOUS were selected, requery but bypass the timer + final String value = osugg.getValue(); + if (OptionSuggestion.NEXT_VALUE.equals(value)) { + mindexFrom += PAGE_SIZE; + mindexTo += PAGE_SIZE; + + final RestSuggestOracle oracle = (RestSuggestOracle) mfield.getSuggestOracle(); + oracle.getSuggestions(); + + } else if (OptionSuggestion.PREVIOUS_VALUE.equals(value)) { + mindexFrom -= PAGE_SIZE; + mindexTo -= PAGE_SIZE; + + final RestSuggestOracle oracle = (RestSuggestOracle) mfield.getSuggestOracle(); + oracle.getSuggestions(); + + } else { + // made a valid selection + updateFormFeedback(FormFeedback.VALID, null); + + // add the option's value to the value map + putValue(osugg.getName(), value); + + // put the focus back into the textfield so user + // can enter more + // Commented mfield.setFocus(true); + } + } + } + + private void putValue(final String key, final String value) { + Log.info("putting key = " + key + "; value = " + value); + mvalueMap.put(key, value); + } + + /** + * Retrieve Options (name-value pairs) that are suggested from the REST + * endpoint + * + * @param query + * - the String search term + * @param from + * - the 0-based begin index int + * @param to + * - the end index inclusive int + * @param callback + * - the OptionQueryCallback to handle the response + */ + private void queryOptions(final String query, final int from, final int to, + final OptionQueryCallback callback) { + final RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, URL.encode(mrestEndpointUrl + // Falta limit + + "?" + SearcherConstants.QUERY_PARAM + "=" + query + "&" + SearcherConstants.START_PARAM + "=" + + from + "&indexTo=" + to)); + + // Set our headers + builder.setHeader("Accept", "application/json"); + builder.setHeader("Accept-Charset", "UTF-8"); + + builder.setCallback(new RequestCallback() { + + @Override + public void onError(final com.google.gwt.http.client.Request request, final Throwable exception) { + callback.error(exception); + } + + @Override + public void onResponseReceived(final com.google.gwt.http.client.Request request, + final Response response) { + final JSONValue val = JSONParser.parse(response.getText()); + final JSONObject obj = val.isObject(); + final int totSize = (int) obj.get(OptionResultSet.TOTAL_SIZE).isNumber().doubleValue(); + final OptionResultSet options = new OptionResultSet(totSize); + final JSONArray optionsArray = obj.get(OptionResultSet.OPTIONS).isArray(); + + if (options.getTotalSize() > 0 && optionsArray != null) { + + for (int i = 0; i < optionsArray.size(); i++) { + if (optionsArray.get(i) == null) { + /* + * This happens when a JSON array has an invalid trailing comma + */ + continue; + } + + final JSONObject jsonOpt = optionsArray.get(i).isObject(); + final Option option = new Option(); + option.setName(jsonOpt.get(OptionResultSet.DISPLAY_NAME).isString().stringValue() + " (" + + jsonOpt.get(OptionResultSet.VALUE).isString().stringValue() + ")"); + option.setValue(jsonOpt.get(OptionResultSet.VALUE).isString().stringValue()); + options.addOption(option); + } + } + callback.success(options); + } + }); + + try { + builder.send(); + } catch (final RequestException e) { + updateFormFeedback(FormFeedback.ERROR, "Error: " + e.getMessage()); + } + } + + private void resetPageIndices() { + mindexFrom = 0; + mindexTo = mindexFrom + PAGE_SIZE - 1; + } + + @Override + public void setAccessKey(final char key) { + mfield.setAccessKey(key); + } + + @Override + public void setFocus(final boolean focused) { + mfield.setFocus(focused); + } + + @Override + public void setTabIndex(final int index) { + mfield.setTabIndex(index); + } + + /** + * Convenience method to set the status and tooltip of the FormFeedback + * + * @param status + * - a FormFeedback status + * @param tooltip + * - a String tooltip + */ + public void updateFormFeedback(final int status, final String tooltip) { + mfeedback.setStatus(status); + if (tooltip != null) { + mfeedback.setTitle(tooltip); + } + + final TextBoxBase textBox = mfield.getTextBox(); + if (FormFeedback.LOADING == status) { + // textBox.setEnabled(false); + } else { + // textBox.setEnabled(true); + textBox.setFocus(false); // Blur then focus b/c of a strange problem with + // the cursor or selection highlights no longer + // visible within the textfield (this is a + // workaround) + textBox.setFocus(true); + } + } + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearch.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearch.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearch.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package cc.kune.core.client.sitebar.search; - -public interface SiteSearch { - -} Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPanel.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPanel.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -1,125 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package cc.kune.core.client.sitebar.search; - -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.core.client.resources.CoreResources; -import cc.kune.gspace.client.GSpaceArmor; - -import com.google.gwt.event.dom.client.BlurEvent; -import com.google.gwt.event.dom.client.BlurHandler; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.dom.client.FocusEvent; -import com.google.gwt.event.dom.client.FocusHandler; -import com.google.gwt.event.dom.client.KeyCodes; -import com.google.gwt.event.dom.client.KeyUpEvent; -import com.google.gwt.event.dom.client.KeyUpHandler; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.PushButton; -import com.google.gwt.user.client.ui.TextBox; -import com.google.inject.Inject; - -public class SiteSearchPanel implements SiteSearchView { - private static final int SEARCH_TEXT_HEIGHT = 15; - private static final int SEARCH_TEXT_WIDTH_BIG = 180; - private static final int SEARCH_TEXT_WIDTH_SMALL = 120; - public static final String SITE_SEARCH_BUTTON = "kune-ssp-searchbt"; - public static final String SITE_SEARCH_TEXTBOX = "kune-ssp-tbox"; - - private final PushButton searchButton; - private final TextBox searchTextBox; - - @Inject - public SiteSearchPanel(final SiteSearchPresenter presenter, final GSpaceArmor gs, final CoreResources img) { - searchButton = new PushButton(new Image(img.kuneSearchIco()), new Image(img.kuneSearchIcoPush())); - searchButton.ensureDebugId(SITE_SEARCH_BUTTON); - searchTextBox = new TextBox(); - searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX); - - gs.getSitebar().add(searchButton); - gs.getSitebar().add(searchTextBox); - - setTextSearchSmallImpl(); - searchTextBox.addBlurHandler(new BlurHandler() { - @Override - public void onBlur(final BlurEvent event) { - presenter.onSearchLostFocus(searchTextBox.getText()); - } - }); - searchTextBox.addFocusHandler(new FocusHandler() { - @Override - public void onFocus(final FocusEvent event) { - presenter.onSearchFocus(); - } - }); - searchButton.addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - NotifyUser.showProgressProcessing(); - presenter.doSearch(searchTextBox.getText()); - } - }); - searchTextBox.addKeyUpHandler(new KeyUpHandler() { - @Override - public void onKeyUp(final KeyUpEvent event) { - if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) { - if (searchTextBox.getText().length() > 0) { - NotifyUser.showProgressProcessing(); - presenter.doSearch(searchTextBox.getText()); - } - } - } - }); - } - - @Override - public void clearSearchText() { - searchTextBox.setText(""); - } - - @Override - public void selectSearchText() { - searchTextBox.selectAll(); - } - - public void setSearchText(final String text) { - searchTextBox.setText(text); - } - - @Override - public void setTextSearch(final String text) { - searchTextBox.setText(text); - } - - @Override - public void setTextSearchBig() { - searchTextBox.setPixelSize(SEARCH_TEXT_WIDTH_BIG, 15); - } - - @Override - public void setTextSearchSmall() { - setTextSearchSmallImpl(); - } - - private void setTextSearchSmallImpl() { - searchTextBox.setPixelSize(SEARCH_TEXT_WIDTH_SMALL, SEARCH_TEXT_HEIGHT); - } -} Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPresenter.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPresenter.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -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 cc.kune.core.client.sitebar.search; - -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.inject.Inject; - -public class SiteSearchPresenter implements SiteSearch { - - private final String defaultSearchText; - private SiteSearchView view; - - @Inject - public SiteSearchPresenter(final I18nTranslationService i18n) { - defaultSearchText = i18n.t("Search"); - } - - public void doSearch(final String termToSearch) { - // provider.get().doSearch(termToSearch); - view.setTextSearchSmall(); - } - - public void init(final SiteSearchView view) { - this.view = view; - setDefText(); - } - - public void onSearchFocus() { - view.setTextSearchBig(); - view.selectSearchText(); - } - - public void onSearchLostFocus(final String search) { - if (search.length() == 0 || search.equals(defaultSearchText)) { - view.setTextSearchSmall(); - } - if (search.length() == 0) { - setDefText(); - } - } - - private void setDefText() { - view.setTextSearch(defaultSearchText); - } -} Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchView.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchView.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -1,33 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package cc.kune.core.client.sitebar.search; - -public interface SiteSearchView { - - void clearSearchText(); - - void selectSearchText(); - - void setTextSearch(String text); - - void setTextSearchBig(); - - void setTextSearchSmall(); -} Copied: trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java (from rev 1339, trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -0,0 +1,135 @@ +/* + * + * 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.core.client.sitebar.search; + +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.sitebar.search.SitebarSearchPresenter.SitebarSearchView; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.SearcherConstants; +import cc.kune.gspace.client.GSpaceArmor; + +import com.google.gwt.event.dom.client.HasAllFocusHandlers; +import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.user.client.ui.HasText; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.PushButton; +import com.google.gwt.user.client.ui.SuggestBox; +import com.google.gwt.user.client.ui.SuggestOracle.Suggestion; +import com.google.gwt.user.client.ui.TextBoxBase; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.ViewImpl; + +public class SitebarSearchPanel extends ViewImpl implements SitebarSearchView { + private static final int SEARCH_TEXT_HEIGHT = 13; + private static final int SEARCH_TEXT_WIDTH_BIG = 160; + private static final int SEARCH_TEXT_WIDTH_SMALL = 120; + public static final String SITE_SEARCH_BUTTON = "kune-ssp-searchbt"; + public static final String SITE_SEARCH_TEXTBOX = "kune-ssp-tbox"; + + private final PushButton searchButton; + private final TextBoxBase searchTextBox; + private final SuggestBox suggestBox; + + @Inject + public SitebarSearchPanel(final GSpaceArmor gs, final CoreResources img, + final StateManager stateManager) { + searchButton = new PushButton(new Image(img.kuneSearchIco()), new Image(img.kuneSearchIcoPush())); + searchButton.ensureDebugId(SITE_SEARCH_BUTTON); + final MultivalueSuggestBox multivalueSBox = new MultivalueSuggestBox( + SearcherConstants.GROUP_DATA_PROXY_URL, false) { + @Override + public void onSelection( + final com.google.gwt.event.logical.shared.SelectionEvent<com.google.gwt.user.client.ui.SuggestOracle.Suggestion> event) { + super.onSelection(event); + final Suggestion suggestion = event.getSelectedItem(); + if (suggestion instanceof OptionSuggestion) { + final OptionSuggestion osugg = (OptionSuggestion) suggestion; + final String value = osugg.getValue(); + if (!OptionSuggestion.NEXT_VALUE.equals(value) + && !OptionSuggestion.PREVIOUS_VALUE.equals(value)) { + stateManager.gotoHistoryToken(value); + setTextSearch(""); + } + } + }; + }; + suggestBox = multivalueSBox.getSuggestBox(); + searchTextBox = suggestBox.getTextBox(); + searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX); + searchTextBox.addStyleName("k-fr"); + searchTextBox.addStyleName("k-sitebarsearch"); + searchTextBox.addStyleName("k-fr"); + searchButton.addStyleName("k-sitebarsearch-img"); + searchButton.addStyleName("k-fr"); + gs.getSitebar().add(multivalueSBox); + gs.getSitebar().add(searchButton); + setTextSearchSmallImpl(); + } + + @Override + public Widget asWidget() { + return null; + } + + @Override + public void clearSearchText() { + searchTextBox.setValue(""); + } + + @Override + public HasClickHandlers getButton() { + return searchButton; + } + + @Override + public HasAllFocusHandlers getFocus() { + return searchTextBox; + } + + @Override + public HasText getTextBox() { + return searchTextBox; + } + + @Override + public void selectSearchText() { + searchTextBox.selectAll(); + } + + @Override + public void setTextSearch(final String text) { + suggestBox.setValue(text, false); + } + + @Override + public void setTextSearchBig() { + searchTextBox.setPixelSize(SEARCH_TEXT_WIDTH_BIG, SEARCH_TEXT_HEIGHT); + } + + @Override + public void setTextSearchSmall() { + setTextSearchSmallImpl(); + } + + private void setTextSearchSmallImpl() { + searchTextBox.setPixelSize(SEARCH_TEXT_WIDTH_SMALL, SEARCH_TEXT_HEIGHT); + } +} Copied: trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPresenter.java (from rev 1339, trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPresenter.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -0,0 +1,145 @@ +/* + * + * 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.core.client.sitebar.search; + +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.event.dom.client.BlurEvent; +import com.google.gwt.event.dom.client.BlurHandler; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.FocusEvent; +import com.google.gwt.event.dom.client.FocusHandler; +import com.google.gwt.event.dom.client.HasAllFocusHandlers; +import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.HasText; +import com.google.inject.Inject; +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 SitebarSearchPresenter extends + Presenter<SitebarSearchPresenter.SitebarSearchView, SitebarSearchPresenter.SitebarSearchProxy> { + + @ProxyCodeSplit + public interface SitebarSearchProxy extends Proxy<SitebarSearchPresenter> { + } + + public interface SitebarSearchView extends View { + + void clearSearchText(); + + HasClickHandlers getButton(); + + HasAllFocusHandlers getFocus(); + + HasText getTextBox(); + + void selectSearchText(); + + void setTextSearch(String text); + + void setTextSearchBig(); + + void setTextSearchSmall(); + } + + private final String defaultSearchText; + + @Inject + public SitebarSearchPresenter(final EventBus eventBus, final SitebarSearchView view, + final SitebarSearchProxy proxy, final I18nTranslationService i18n) { + super(eventBus, view, proxy); + defaultSearchText = i18n.t("Search"); + setDefText(); + getView().setTextSearchSmall(); + } + + private void doSearch() { + doSearch(getView().getTextBox().getText()); + } + + public void doSearch(final String termToSearch) { + getView().setTextSearchSmall(); + } + + @Override + protected void onBind() { + super.onBind(); + getView().getFocus().addBlurHandler(new BlurHandler() { + @Override + public void onBlur(final BlurEvent event) { + onSearchLostFocus(getView().getTextBox().getText()); + } + }); + getView().getFocus().addFocusHandler(new FocusHandler() { + @Override + public void onFocus(final FocusEvent event) { + onSearchFocus(); + } + }); + getView().getButton().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + doSearch(); + } + + }); + // getView().getKeyUp().addKeyUpHandler(new KeyUpHandler() { + // @Override + // public void onKeyUp(final KeyUpEvent event) { + // if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) { + // if (getView().getTextBox().getText().length() > 0) { + // NotifyUser.showProgressProcessing(); + // doSearch(); + // } + // } + // } + // }); + } + + public void onSearchFocus() { + if (getView().getTextBox().getText().equals(defaultSearchText)) { + getView().setTextSearchBig(); + getView().selectSearchText(); + } + } + + public void onSearchLostFocus(final String search) { + if (search.length() == 0 || search.equals(defaultSearchText)) { + getView().setTextSearchSmall(); + } + if (search.length() == 0) { + setDefText(); + } + } + + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } + + private void setDefText() { + getView().setTextSearch(defaultSearchText); + } +} Added: trunk/src/main/java/cc/kune/core/public/images/vborder.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/vborder.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/public/images/vborder_ie6.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/vborder_ie6.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-04 20:29:42 UTC (rev 1340) @@ -1,4 +1,4 @@ -@CHARSET "UTF-8"; +CHARSET "UTF-8 "; body { background-color: white; @@ -305,19 +305,6 @@ cursor: move; } -.gwt-SuggestBoxPopup { - border: 2px solid #C3D9FF; -} - -.gwt-SuggestBoxPopup .item { - padding: 2px; -} - -.gwt-SuggestBoxPopup .item-selected { - background-color: #C3D9FF; - padding: 2px; -} - .gwt-DisclosurePanel { border: 2px solid #C3D9FF; } @@ -1148,3 +1135,57 @@ border: 5px solid #FFF; border-collapse: separate; } + +/* Suggest box */ +.gwt-SuggestBox { + padding: 2px; +} + +.gwt-SuggestBoxPopup { + background-color: #FFF; + border: 2px solid #552200; + padding: 3px; + color: white; + -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; + margin-left: 3px; +} + +.gwt-SuggestBoxPopup .item { + padding: 2px 6px; + color: #424242; + cursor: default; +} + +.gwt-SuggestBoxPopup .item-selected { + background: #cdcdcd; +} + +.gwt-SuggestBoxPopup .suggestPopupContent { + background: white; +} + +.k-sitebarsearch { + border: 1px solid #E4A374; + margin: 1px 6px 0 3px; + padding-left: 1px; + color: #B3B3B3; + background: transparent; +} + +.k-sitebarsearch-img { + cursor: pointer; + background: none; + border: 0px; + padding: 2px 0 0 0 !important; +} + +/* end of suggestbox */ \ No newline at end of file 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-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -43,6 +43,7 @@ import cc.kune.core.server.properties.KuneProperties; import cc.kune.core.server.tool.ServerTool; import cc.kune.core.server.tool.ServerToolRegistry; +import cc.kune.core.shared.SearcherConstants; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.dto.GroupType; @@ -65,223 +66,229 @@ @Singleton 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; - private final DatabaseProperties properties; - private final ServerToolRegistry registry; - private final ServerToolRegistry serverToolRegistry; - private final UserFinder userFinder; + private final GroupFinder finder; + private final I18nTranslationService i18n; + private final KuneProperties kuneProperties; + private final LicenseFinder licenseFinder; + private final LicenseManager licenseManager; + private final DatabaseProperties properties; + private final ServerToolRegistry registry; + private final ServerToolRegistry serverToolRegistry; + private final UserFinder userFinder; - @Inject - 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 I18nTranslationService i18n) { - super(provider, Group.class); - this.finder = finder; - this.userFinder = userFinder; - this.kuneProperties = kuneProperties; - this.properties = properties; - this.registry = registry; - this.licenseManager = licenseManager; - this.licenseFinder = licenseFinder; - this.serverToolRegistry = serverToolRegistry; - this.i18n = i18n; - } + @Inject + 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 I18nTranslationService i18n) { + super(provider, Group.class); + this.finder = finder; + this.userFinder = userFinder; + this.kuneProperties = kuneProperties; + this.properties = properties; + this.registry = registry; + this.licenseManager = licenseManager; + this.licenseFinder = licenseFinder; + this.serverToolRegistry = serverToolRegistry; + this.i18n = i18n; + } - @Override - public void changeDefLicense(final User user, final Group group, final String licName) { - final License license = licenseFinder.findByShortName(licName); - if (license == null) { - throw new ServerManagerException("Unknown license"); - } - group.setDefaultLicense(license); + @Override + public void changeDefLicense(final User user, final Group group, final String licName) { + final License license = licenseFinder.findByShortName(licName); + if (license == null) { + throw new ServerManagerException("Unknown license"); } + group.setDefaultLicense(license); + } - @Override - public void changeWsTheme(final User user, final Group group, final String theme) throws AccessViolationException { - // TODO: check theme - group.setWorkspaceTheme(theme); - } + @Override + public void changeWsTheme(final User user, final Group group, final String theme) + throws AccessViolationException { + // TODO: check theme + group.setWorkspaceTheme(theme); + } - @Override - public void clearGroupBackImage(final Group group) { - group.setGroupBackImage(null); + @Override + public void clearGroupBackImage(final Group group) { + group.setGroupBackImage(null); + } + + @Override + 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)) { + group.setAdmissionType(AdmissionType.Open); + } else if (group.getGroupType().equals(GroupType.ORGANIZATION)) { + group.setAdmissionType(AdmissionType.Moderated); + } else if (group.getGroupType().equals(GroupType.PROJECT)) { + group.setAdmissionType(AdmissionType.Moderated); + } else if (group.getGroupType().equals(GroupType.ORPHANED_PROJECT)) { + group.setAdmissionType(AdmissionType.Open); + } + final String licName = group.getDefaultLicense().getShortName(); + final License license = licenseFinder.findByShortName(licName); + group.setDefaultLicense(license); + group.setWorkspaceTheme(defaultSiteWorkspaceTheme); + initSocialNetwork(group, user.getUserGroup()); + final String title = i18n.t("About [%s]", group.getLongName()); + initGroup(user, group, serverToolRegistry.getToolsForGroupsKeys(), title, publicDescrip); + return group; + } else { + throw new UserMustBeLoggedException(); } + } - @Override - 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)) { - group.setAdmissionType(AdmissionType.Open); - } else if (group.getGroupType().equals(GroupType.ORGANIZATION)) { - group.setAdmissionType(AdmissionType.Moderated); - } else if (group.getGroupType().equals(GroupType.PROJECT)) { - group.setAdmissionType(AdmissionType.Moderated); - } else if (group.getGroupType().equals(GroupType.ORPHANED_PROJECT)) { - group.setAdmissionType(AdmissionType.Open); - } - final String licName = group.getDefaultLicense().getShortName(); - final License license = licenseFinder.findByShortName(licName); - group.setDefaultLicense(license); - group.setWorkspaceTheme(defaultSiteWorkspaceTheme); - initSocialNetwork(group, user.getUserGroup()); - final String title = i18n.t("About [%s]", group.getLongName()); - initGroup(user, group, serverToolRegistry.getToolsForGroupsKeys(), title, publicDescrip); - return group; - } else { - throw new UserMustBeLoggedException(); - } + @Override + public Group createUserGroup(final User user) throws GroupNameInUseException, + EmailAddressInUseException { + return createUserGroup(user, true); + } + + @Override + public Group createUserGroup(final User user, final boolean wantPersonalHomepage) + throws GroupNameInUseException, EmailAddressInUseException { + final String defaultSiteWorkspaceTheme = kuneProperties.get(KuneProperties.WS_THEMES_DEF); + final License licenseDef = licenseManager.getDefLicense(); + final Group userGroup = new Group(user.getShortName(), user.getName(), licenseDef, + GroupType.PERSONAL); + User userSameEmail = null; + try { + userSameEmail = userFinder.getByEmail(user.getEmail()); + } catch (final NoResultException e) { + // Ok, no more with this email } + if (userSameEmail != null) { + throw new EmailAddressInUseException(); + } + userGroup.setAdmissionType(AdmissionType.Closed); + userGroup.setWorkspaceTheme(defaultSiteWorkspaceTheme); + userGroup.setDefaultContent(null); + user.setUserGroup(userGroup); + initSocialNetwork(userGroup, userGroup); - @Override - public Group createUserGroup(final User user) throws GroupNameInUseException, EmailAddressInUseException { - return createUserGroup(user, true); + 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, title, body); + super.persist(user, User.class); + } catch (final PersistenceException e) { + if (e.getCause() instanceof ConstraintViolationException) { + throw new GroupNameInUseException(); + } + throw e; } + return userGroup; + } - @Override - public Group createUserGroup(final User user, final boolean wantPersonalHomepage) throws GroupNameInUseException, - EmailAddressInUseException { - final String defaultSiteWorkspaceTheme = kuneProperties.get(KuneProperties.WS_THEMES_DEF); - final License licenseDef = licenseManager.getDefLicense(); - final Group userGroup = new Group(user.getShortName(), user.getName(), licenseDef, GroupType.PERSONAL); - User userSameEmail = null; - try { - userSameEmail = userFinder.getByEmail(user.getEmail()); - } catch (final NoResultException e) { - // Ok, no more with this email - } - if (userSameEmail != null) { - throw new EmailAddressInUseException(); - } - userGroup.setAdmissionType(AdmissionType.Closed); - userGroup.setWorkspaceTheme(defaultSiteWorkspaceTheme); - userGroup.setDefaultContent(null); - user.setUserGroup(userGroup); - initSocialNetwork(userGroup, userGroup); + @Override + public List<Group> findAdminInGroups(final Long groupId) { + return finder.findAdminInGroups(groupId); + } - 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, title, body); - super.persist(user, User.class); - } catch (final PersistenceException e) { - if (e.getCause() instanceof ConstraintViolationException) { - throw new GroupNameInUseException(); - } - throw e; - } - return userGroup; - } + @Override + public Group findByShortName(final String shortName) { + return finder.findByShortName(shortName); + } - @Override - public List<Group> findAdminInGroups(final Long groupId) { - return finder.findAdminInGroups(groupId); - } + @Override + public List<Group> findCollabInGroups(final Long groupId) { + return finder.findCollabInGroups(groupId); + } - @Override - public Group findByShortName(final String shortName) { - return finder.findByShortName(shortName); - } + @Override + public List<String> findEnabledTools(final Long id) { + return finder.findEnabledTools(id); + } - @Override - public List<Group> findCollabInGroups(final Long groupId) { - return finder.findCollabInGroups(groupId); - } + @Override + public Group getGroupOfUserWithId(final Long userId) { + return userId != null ? find(User.class, userId).getUserGroup() : null; + } - @Override - public List<String> findEnabledTools(final Long id) { - return finder.findEnabledTools(id); - } + @Override + public Group getSiteDefaultGroup() { + final String shortName = properties.getDefaultSiteShortName(); + return findByShortName(shortName); + } - @Override - public Group getGroupOfUserWithId(final Long userId) { - return userId != null ? find(User.class, userId).getUserGroup() : null; + 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) { + e.printStackTrace(); + } catch (final PersistenceException e) { + if (e.getCause() instanceof ConstraintViolationException) { + throw new GroupNameInUseException(); + } + throw e; } - - @Override - public Group getSiteDefaultGroup() { - final String shortName = properties.getDefaultSiteShortName(); - return findByShortName(shortName); + for (final ServerTool tool : registry.all()) { + if (toolsToEnable.contains(tool.getName())) { + tool.initGroup(user, group, vars); + } } + } - 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) { - e.printStackTrace(); - } catch (final PersistenceException e) { - if (e.getCause() instanceof ConstraintViolationException) { - throw new GroupNameInUseException(); - } - throw e; - } - for (final ServerTool tool : registry.all()) { - if (toolsToEnable.contains(tool.getName())) { - tool.initGroup(user, group, vars); - } - } + private void initSocialNetwork(final Group group, final Group userGroup) { + final SocialNetwork network = group.getSocialNetwork(); + final AccessLists lists = network.getAccessLists(); + lists.getEditors().setMode(GroupListMode.NOBODY); + lists.getViewers().setMode(GroupListMode.EVERYONE); + if (!group.getGroupType().equals(GroupType.ORPHANED_PROJECT)) { + network.addAdmin(userGroup); } + } - private void initSocialNetwork(final Group group, final Group userGroup) { - final SocialNetwork network = group.getSocialNetwork(); - final AccessLists lists = network.getAccessLists(); - lists.getEditors().setMode(GroupListMode.NOBODY); - lists.getViewers().setMode(GroupListMode.EVERYONE); - if (!group.getGroupType().equals(GroupType.ORPHANED_PROJECT)) { - network.addAdmin(userGroup); - } - } + @Override + public SearchResult<Group> search(final String search) { + return this.search(search, null, null); + } - @Override - public SearchResult<Group> search(final String search) { - return this.search(search, null, null); + @Override + public SearchResult<Group> search(final String search, final Integer firstResult, + final Integer maxResults) { + final MultiFieldQueryParser parser = new MultiFieldQueryParser(new String[] { "longName", + "shortName", "publicDesc" }, new StandardAnalyzer()); + Query query; + try { + query = parser.parse(search + SearcherConstants.WILDCARD); + } catch (final ParseException e) { + throw new ServerManagerException("Error parsing search"); } + return super.search(query, firstResult, maxResults); + } - @Override - public SearchResult<Group> search(final String search, final Integer firstResult, final Integer maxResults) { - final MultiFieldQueryParser parser = new MultiFieldQueryParser(new String[] { "longName", "shortName", - "publicDesc" }, new StandardAnalyzer()); - Query query; - try { - query = parser.parse(search); - } catch (final ParseException e) { - throw new ServerManagerException("Error parsing search"); - } - return super.search(query, firstResult, maxResults); - } + @Override + public void setDefaultContent(final String groupShortName, final Content content) { + final Group group = findByShortName(groupShortName); + group.setDefaultContent(content); + } - @Override - public void setDefaultContent(final String groupShortName, final Content content) { - final Group group = findByShortName(groupShortName); - group.setDefaultContent(content); + @Override + public void setGroupBackImage(final Group group, final Content content) { + if (content.getMimeType().isImage()) { + group.setGroupBackImage(content); + } else { + throw new DefaultException("Trying to set not a image as group logo"); } + } - @Override - public void setGroupBackImage(final Group group, final Content content) { - if (content.getMimeType().isImage()) { - group.setGroupBackImage(content); - } else { - throw new DefaultException("Trying to set not a image as group logo"); - } + @Override + public void setToolEnabled(final User userLogged, final String groupShortName, final String tool, + final boolean enabled) { + final Group group = findByShortName(groupShortName); + ToolConfiguration toolConfiguration = group.getToolConfiguration(tool); + if (toolConfiguration == null) { + toolConfiguration = serverToolRegistry.get(tool).initGroup(userLogged, group).getToolConfiguration( + tool); } + toolConfiguration.setEnabled(enabled); + } - @Override - public void setToolEnabled(final User userLogged, final String groupShortName, final String tool, - final boolean enabled) { - final Group group = findByShortName(groupShortName); - ToolConfiguration toolConfiguration = group.getToolConfiguration(tool); - if (toolConfiguration == null) { - toolConfiguration = serverToolRegistry.get(tool).initGroup(userLogged, group).getToolConfiguration(tool); - } - toolConfiguration.setEnabled(enabled); - } - } Modified: trunk/src/main/java/cc/kune/core/shared/SearcherConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/SearcherConstants.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/core/shared/SearcherConstants.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -21,22 +21,23 @@ public final class SearcherConstants { - public final static String START_PARAM = "start"; - public final static String LIMIT_PARAM = "limit"; - public final static String QUERY_PARAM = "query"; - public final static String MIMETYPE_PARAM = "mimetype"; - public final static String MIMETYPE2_PARAM = "mimetype2"; - public final static String GROUP_PARAM = "group"; + public final static String CONTENT_DATA_PROXY_URL = "/ws/json/ContentJSONService/search"; + public final static String CONTENT_TEMPLATE_TEXT_PREFIX = "<div class=\"search-item\"><span class=\"kune-IconHyperlink\"><img src=\""; + public final static String CONTENT_TEMPLATE_TEXT_SUFFIX = "\" style=\"height: 16px; width: 16px;\" />{shortName}: {longName}</span></div>"; + public final static String GROUP_DATA_PROXY_URL = "/ws/json/GroupJSONService/search"; + public final static String GROUP_PARAM = "group"; + public final static String I18N_JSON_SERVICE = "/ws/json/I18nTranslationJSONService/search"; - public final static String GROUP_DATA_PROXY_URL = "/ws/json/GroupJSONService/search"; - public final static String USER_DATA_PROXY_URL = "/ws/json/UserJSONService/search"; - public final static String CONTENT_DATA_PROXY_URL = "/ws/json/ContentJSONService/search"; - public final static String I18N_JSON_SERVICE = "/ws/json/I18nTranslationJSONService/search"; - public final static String I18N_JSON_SERVICE_TRANSLATED = "/ws/json/I18nTranslationJSONService/searchtranslated"; + public final static String I18N_JSON_SERVICE_TRANSLATED = "/ws/json/I18nTranslationJSONService/searchtranslated"; + public final static String LIMIT_PARAM = "limit"; + public final static String MIMETYPE_PARAM = "mimetype"; + public final static String MIMETYPE2_PARAM = "mimetype2"; + public final static String QUERY_PARAM = "query"; - public final static String CONTENT_TEMPLATE_TEXT_PREFIX = "<div class=\"search-item\"><span class=\"kune-IconHyperlink\"><img src=\""; - public final static String CONTENT_TEMPLATE_TEXT_SUFFIX = "\" style=\"height: 16px; width: 16px;\" />{shortName}: {longName}</span></div>"; + public final static String START_PARAM = "start"; + public final static String USER_DATA_PROXY_URL = "/ws/json/UserJSONService/search"; + public static final String WILDCARD = "*"; - private SearcherConstants() { - } + private SearcherConstants() { + } } Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-05-04 20:29:42 UTC (rev 1340) @@ -12,8 +12,8 @@ </ui:style> <g:DockLayoutPanel ui:field="mainpanel" styleName='{res.style.mainPanel}' unit="PX"> - <g:north size="22"> - <g:FlowPanel ui:field="sitebar" height="22px" + <g:north size="23"> + <g:FlowPanel ui:field="sitebar" height="23px" styleName='{res.style.siteBar}'> </g:FlowPanel> </g:north> Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -21,6 +21,8 @@ import cc.kune.blogs.client.actions.ContentViewerOptionsMenu; import cc.kune.client.ExtendedGinModule; +import cc.kune.core.client.sitebar.search.SitebarSearchPanel; +import cc.kune.core.client.sitebar.search.SitebarSearchPresenter; import cc.kune.gspace.client.actions.RenameAction; import cc.kune.gspace.client.options.GroupOptions; import cc.kune.gspace.client.options.GroupOptionsCollection; @@ -82,58 +84,60 @@ 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); + bindPresenter(SitebarSearchPresenter.class, SitebarSearchPresenter.SitebarSearchView.class, + SitebarSearchPanel.class, SitebarSearchPresenter.SitebarSearchProxy.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); - // Actions - s(ContentViewerOptionsMenu.class); - s(RenameAction.class); - } + // Actions + s(ContentViewerOptionsMenu.class); + s(RenameAction.class); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceGinjector.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceGinjector.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -1,5 +1,6 @@ package cc.kune.gspace.client; +import cc.kune.core.client.sitebar.search.SitebarSearchPresenter; import cc.kune.gspace.client.tags.TagsSummaryPresenter; import cc.kune.gspace.client.tool.ContentViewerSelector; import cc.kune.gspace.client.tool.selector.ToolSelectorPresenter; @@ -12,17 +13,19 @@ public interface GSpaceGinjector extends Ginjector { - ContentViewerSelector getContentViewerSelector(); + ContentViewerSelector getContentViewerSelector(); - AsyncProvider<DocViewerPresenter> getDocsViewerPresenter(); + AsyncProvider<DocViewerPresenter> getDocsViewerPresenter(); - AsyncProvider<EntityLicensePresenter> getEntityLicensePresenter(); + AsyncProvider<EntityLicensePresenter> getEntityLicensePresenter(); - AsyncProvider<FolderViewerPresenter> getFolderViewerPresenter(); + AsyncProvider<FolderViewerPresenter> getFolderViewerPresenter(); - GSpaceParts getGSpaceParts(); + GSpaceParts getGSpaceParts(); - AsyncProvider<TagsSummaryPresenter> getTagsSummaryPresenter(); + AsyncProvider<SitebarSearchPresenter> getSitebarSearchPresenter(); - AsyncProvider<ToolSelectorPresenter> getToolSelectorPresenter(); + AsyncProvider<TagsSummaryPresenter> getTagsSummaryPresenter(); + + AsyncProvider<ToolSelectorPresenter> getToolSelectorPresenter(); } Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -2,6 +2,7 @@ import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; +import cc.kune.core.client.sitebar.search.SitebarSearchPresenter; import cc.kune.core.client.state.Session; import cc.kune.gspace.client.options.GroupOptions; import cc.kune.gspace.client.options.GroupOptionsCollection; @@ -26,50 +27,52 @@ public class GSpaceParts { - @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<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 + @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<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<SitebarSearchPresenter> siteSearch) { + // , 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) { - licenseFooter.get(); - tagsPresenter.get(); - toolSelector.get(); - docsViewer.get(); - folderViewer.get(); + session.onAppStart(true, new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + licenseFooter.get(); + tagsPresenter.get(); + toolSelector.get(); + docsViewer.get(); + folderViewer.get(); + siteSearch.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); + // 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(); - } - }); - } + // Init + go.get(); + uo.get(); + } + }); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -24,7 +24,7 @@ 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.resources.CoreResources; import cc.kune.core.client.state.StateChangedEvent; import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; import cc.kune.core.client.state.StateManager; @@ -34,51 +34,51 @@ 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; + public static final String GROUP_OPTIONS_ICON = "k-eop-icon"; + private final I18nTranslationService i18n; + private final CoreResources 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); - } + @Inject + public GroupOptionsPresenter(final StateManager stateManager, final I18nTranslationService i18n, + final CoreResources 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 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(); - } + private void init(final GroupOptionsView view) { + super.init(view); + this.view = view; + createActions(); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -24,7 +24,7 @@ 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.resources.CoreResources; import cc.kune.core.client.sitebar.SiteUserOptions; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; @@ -36,52 +36,52 @@ 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; + private final I18nTranslationService i18n; + private final CoreResources res; + 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); - } + @Inject + public UserOptionsPresenter(final Session session, final StateManager stateManager, + final I18nTranslationService i18n, final CoreResources res, final SiteUserOptions userOptions, + final UserOptionsView view) { + this.session = session; + this.stateManager = stateManager; + this.i18n = i18n; + this.res = res; + 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() { + 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); - } + @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, res.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(); - } + private void init(final UserOptionsView view) { + super.init(view); + this.view = view; + createActions(); + } } Modified: trunk/src/main/java/cc/kune/pspace/client/PSpaceGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpaceGinModule.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/cc/kune/pspace/client/PSpaceGinModule.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -23,16 +23,16 @@ public class PSpaceGinModule extends AbstractPresenterModule { - /* - * (non-Javadoc) - * - * @see com.google.gwt.inject.client.AbstractGinModule#configure() - */ - @Override - protected void configure() { - bindPresenter(PSpacePresenter.class, PSpacePresenter.PSpaceView.class, PSpacePanel.class, - PSpacePresenter.PSpaceProxy.class); - bind(PSpaceParts.class).asEagerSingleton(); - } + /* + * (non-Javadoc) + * + * @see com.google.gwt.inject.client.AbstractGinModule#configure() + */ + @Override + protected void configure() { + bindPresenter(PSpacePresenter.class, PSpacePresenter.PSpaceView.class, PSpacePanel.class, + PSpacePresenter.PSpaceProxy.class); + bind(PSpaceParts.class).asEagerSingleton(); + } } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -25,7 +25,7 @@ import org.ourproject.kune.platf.client.actions.PropertyChangeEvent; import org.ourproject.kune.platf.client.actions.PropertyChangeListener; -import cc.kune.core.client.resources.icons.IconConstants; +import cc.kune.core.client.resources.IconConstants; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.Composite; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -61,7 +61,7 @@ import org.ourproject.kune.platf.client.ui.rte.inserttable.InsertTableDialog; import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.resources.icons.IconConstants; +import cc.kune.core.client.resources.IconConstants; import cc.kune.core.client.state.Session; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java 2011-05-04 15:18:43 UTC (rev 1339) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java 2011-05-04 20:29:42 UTC (rev 1340) @@ -30,7 +30,7 @@ import org.ourproject.kune.platf.client.ui.noti.OldNotifyUser; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import cc.kune.core.client.resources.icons.IconConstants; +import cc.kune.core.client.resources.IconConstants; import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager;

1 0

r1339 - in trunk/src/main/java: cc/kune/core/client/sitebar cc/kune/core/client/sitebar/search org/ourproject/kune/workspace/client/sitebar/sitesearch
by Vicente J. Ruiz Jurado 04 May '11

04 May '11

Author: vjrj_ Date: 2011-05-04 17:18:43 +0200 (Wed, 04 May 2011) New Revision: 1339 Added: trunk/src/main/java/cc/kune/core/client/sitebar/search/ trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearch.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchView.java Removed: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearch.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchView.java Log: site search work in progress Copied: trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearch.java (from rev 1333, trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearch.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearch.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearch.java 2011-05-04 15:18:43 UTC (rev 1339) @@ -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.core.client.sitebar.search; + +public interface SiteSearch { + +} Copied: trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPanel.java (from rev 1333, trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPanel.java 2011-05-04 15:18:43 UTC (rev 1339) @@ -0,0 +1,125 @@ +/* + * + * 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.core.client.sitebar.search; + +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.gspace.client.GSpaceArmor; + +import com.google.gwt.event.dom.client.BlurEvent; +import com.google.gwt.event.dom.client.BlurHandler; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.FocusEvent; +import com.google.gwt.event.dom.client.FocusHandler; +import com.google.gwt.event.dom.client.KeyCodes; +import com.google.gwt.event.dom.client.KeyUpEvent; +import com.google.gwt.event.dom.client.KeyUpHandler; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.PushButton; +import com.google.gwt.user.client.ui.TextBox; +import com.google.inject.Inject; + +public class SiteSearchPanel implements SiteSearchView { + private static final int SEARCH_TEXT_HEIGHT = 15; + private static final int SEARCH_TEXT_WIDTH_BIG = 180; + private static final int SEARCH_TEXT_WIDTH_SMALL = 120; + public static final String SITE_SEARCH_BUTTON = "kune-ssp-searchbt"; + public static final String SITE_SEARCH_TEXTBOX = "kune-ssp-tbox"; + + private final PushButton searchButton; + private final TextBox searchTextBox; + + @Inject + public SiteSearchPanel(final SiteSearchPresenter presenter, final GSpaceArmor gs, final CoreResources img) { + searchButton = new PushButton(new Image(img.kuneSearchIco()), new Image(img.kuneSearchIcoPush())); + searchButton.ensureDebugId(SITE_SEARCH_BUTTON); + searchTextBox = new TextBox(); + searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX); + + gs.getSitebar().add(searchButton); + gs.getSitebar().add(searchTextBox); + + setTextSearchSmallImpl(); + searchTextBox.addBlurHandler(new BlurHandler() { + @Override + public void onBlur(final BlurEvent event) { + presenter.onSearchLostFocus(searchTextBox.getText()); + } + }); + searchTextBox.addFocusHandler(new FocusHandler() { + @Override + public void onFocus(final FocusEvent event) { + presenter.onSearchFocus(); + } + }); + searchButton.addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + NotifyUser.showProgressProcessing(); + presenter.doSearch(searchTextBox.getText()); + } + }); + searchTextBox.addKeyUpHandler(new KeyUpHandler() { + @Override + public void onKeyUp(final KeyUpEvent event) { + if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) { + if (searchTextBox.getText().length() > 0) { + NotifyUser.showProgressProcessing(); + presenter.doSearch(searchTextBox.getText()); + } + } + } + }); + } + + @Override + public void clearSearchText() { + searchTextBox.setText(""); + } + + @Override + public void selectSearchText() { + searchTextBox.selectAll(); + } + + public void setSearchText(final String text) { + searchTextBox.setText(text); + } + + @Override + public void setTextSearch(final String text) { + searchTextBox.setText(text); + } + + @Override + public void setTextSearchBig() { + searchTextBox.setPixelSize(SEARCH_TEXT_WIDTH_BIG, 15); + } + + @Override + public void setTextSearchSmall() { + setTextSearchSmallImpl(); + } + + private void setTextSearchSmallImpl() { + searchTextBox.setPixelSize(SEARCH_TEXT_WIDTH_SMALL, SEARCH_TEXT_HEIGHT); + } +} Copied: trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPresenter.java (from rev 1333, trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchPresenter.java 2011-05-04 15:18:43 UTC (rev 1339) @@ -0,0 +1,63 @@ +/* + * + * 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.core.client.sitebar.search; + +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class SiteSearchPresenter implements SiteSearch { + + private final String defaultSearchText; + private SiteSearchView view; + + @Inject + public SiteSearchPresenter(final I18nTranslationService i18n) { + defaultSearchText = i18n.t("Search"); + } + + public void doSearch(final String termToSearch) { + // provider.get().doSearch(termToSearch); + view.setTextSearchSmall(); + } + + public void init(final SiteSearchView view) { + this.view = view; + setDefText(); + } + + public void onSearchFocus() { + view.setTextSearchBig(); + view.selectSearchText(); + } + + public void onSearchLostFocus(final String search) { + if (search.length() == 0 || search.equals(defaultSearchText)) { + view.setTextSearchSmall(); + } + if (search.length() == 0) { + setDefText(); + } + } + + private void setDefText() { + view.setTextSearch(defaultSearchText); + } +} Copied: trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchView.java (from rev 1333, trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchView.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchView.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SiteSearchView.java 2011-05-04 15:18:43 UTC (rev 1339) @@ -0,0 +1,33 @@ +/* + * + * 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.core.client.sitebar.search; + +public interface SiteSearchView { + + void clearSearchText(); + + void selectSearchText(); + + void setTextSearch(String text); + + void setTextSearchBig(); + + void setTextSearchSmall(); +} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearch.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearch.java 2011-05-03 17:09:08 UTC (rev 1338) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearch.java 2011-05-04 15:18:43 UTC (rev 1339) @@ -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.sitebar.sitesearch; - -public interface SiteSearch { - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java 2011-05-03 17:09:08 UTC (rev 1338) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java 2011-05-04 15:18:43 UTC (rev 1339) @@ -1,118 +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.sitebar.sitesearch; - -import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.platf.client.ui.AbstractToolbar; -import org.ourproject.kune.platf.client.ui.noti.OldNotifyUser; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import com.google.gwt.event.dom.client.BlurEvent; -import com.google.gwt.event.dom.client.BlurHandler; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.dom.client.FocusEvent; -import com.google.gwt.event.dom.client.FocusHandler; -import com.google.gwt.event.dom.client.KeyCodes; -import com.google.gwt.event.dom.client.KeyUpEvent; -import com.google.gwt.event.dom.client.KeyUpHandler; -import com.google.gwt.user.client.ui.PushButton; -import com.google.gwt.user.client.ui.TextBox; - -public class SiteSearchPanel implements SiteSearchView { - private static final int SEARCH_TEXT_HEIGHT = 15; - private static final int SEARCH_TEXT_WIDTH_SMALL = 120; - private static final int SEARCH_TEXT_WIDTH_BIG = 180; - public static final String SITE_SEARCH_BUTTON = "kune-ssp-searchbt"; - public static final String SITE_SEARCH_TEXTBOX = "kune-ssp-tbox"; - - private final PushButton searchButton; - private final TextBox searchTextBox; - private final AbstractToolbar siteBar; - - public SiteSearchPanel(final SiteSearchPresenter presenter, final WorkspaceSkeleton ws, final Images img) { - siteBar = ws.getSiteBar(); - siteBar.addSpacer(); - searchButton = new PushButton(img.kuneSearchIco().createImage(), img.kuneSearchIcoPush().createImage()); - searchButton.ensureDebugId(SITE_SEARCH_BUTTON); - searchTextBox = new TextBox(); - searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX); - - siteBar.add(searchButton); - siteBar.addSpacer(); - siteBar.add(searchTextBox); - - setTextSearchSmallImpl(); - searchTextBox.addBlurHandler(new BlurHandler() { - public void onBlur(final BlurEvent event) { - presenter.onSearchLostFocus(searchTextBox.getText()); - } - }); - searchTextBox.addFocusHandler(new FocusHandler() { - public void onFocus(final FocusEvent event) { - presenter.onSearchFocus(); - } - }); - searchButton.addClickHandler(new ClickHandler() { - public void onClick(final ClickEvent event) { - OldNotifyUser.showProgressProcessing(); - presenter.doSearch(searchTextBox.getText()); - } - }); - searchTextBox.addKeyUpHandler(new KeyUpHandler() { - public void onKeyUp(final KeyUpEvent event) { - if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) { - if (searchTextBox.getText().length() > 0) { - OldNotifyUser.showProgressProcessing(); - presenter.doSearch(searchTextBox.getText()); - } - } - } - }); - } - - public void clearSearchText() { - searchTextBox.setText(""); - } - - public void selectSearchText() { - searchTextBox.selectAll(); - } - - public void setSearchText(final String text) { - searchTextBox.setText(text); - } - - public void setTextSearch(final String text) { - searchTextBox.setText(text); - } - - public void setTextSearchBig() { - searchTextBox.setPixelSize(SEARCH_TEXT_WIDTH_BIG, 15); - } - - public void setTextSearchSmall() { - setTextSearchSmallImpl(); - } - - private void setTextSearchSmallImpl() { - searchTextBox.setPixelSize(SEARCH_TEXT_WIDTH_SMALL, SEARCH_TEXT_HEIGHT); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java 2011-05-03 17:09:08 UTC (rev 1338) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java 2011-05-04 15:18:43 UTC (rev 1339) @@ -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.workspace.client.sitebar.sitesearch; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.workspace.client.search.SiteSearcher; - -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.Provider; - -public class SiteSearchPresenter implements SiteSearch { - - private SiteSearchView view; - private final Provider<SiteSearcher> provider; - private final String defaultSearchText; - - public SiteSearchPresenter(final Provider<SiteSearcher> provider, I18nTranslationService i18n) { - this.provider = provider; - defaultSearchText = i18n.t("Search"); - } - - public void doSearch(final String termToSearch) { - provider.get().doSearch(termToSearch); - view.setTextSearchSmall(); - } - - public View getView() { - return view; - } - - public void init(final SiteSearchView view) { - this.view = view; - setDefText(); - } - - public void onSearchFocus() { - view.setTextSearchBig(); - view.selectSearchText(); - } - - public void onSearchLostFocus(final String search) { - if (search.length() == 0 || search.equals(defaultSearchText)) { - view.setTextSearchSmall(); - } - if (search.length() == 0) { - setDefText(); - } - } - - private void setDefText() { - view.setTextSearch(defaultSearchText); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchView.java 2011-05-03 17:09:08 UTC (rev 1338) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchView.java 2011-05-04 15:18:43 UTC (rev 1339) @@ -1,35 +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.sitebar.sitesearch; - -import org.ourproject.kune.platf.client.View; - -public interface SiteSearchView extends View { - - void clearSearchText(); - - void selectSearchText(); - - void setTextSearch(String text); - - void setTextSearchBig(); - - void setTextSearchSmall(); -}

1 0

r1338 - in trunk/src/main/java/cc/kune: core/client/sitebar core/server/content gspace/client/viewers wave/client
by Vicente J. Ruiz Jurado 03 May '11

03 May '11

Author: vjrj_ Date: 2011-05-03 19:09:08 +0200 (Tue, 03 May 2011) New Revision: 1338 Modified: trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.ui.xml trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 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/wave/client/WebClient.java Log: Minor changes in Wave editor and minor fixes Modified: trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java 2011-05-03 13:30:14 UTC (rev 1337) +++ trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.java 2011-05-03 17:09:08 UTC (rev 1338) @@ -14,6 +14,7 @@ import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; @@ -29,6 +30,8 @@ private final BasicTopDialog dialog; @UiField VerticalPanel panel; + @UiField + ScrollPanel scroll; @Inject public ErrorsDialog(final I18nTranslationService i18n, final EventBus eventBus) { @@ -40,6 +43,8 @@ i18n.t("Please copy/paste this info to report problems")); dialog.getInnerPanel().add(subTitle); dialog.getInnerPanel().add(BINDER.createAndBindUi(this)); + scroll.setHeight("400px"); + scroll.setAlwaysShowScrollBars(true); dialog.getFirstBtn().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.ui.xml 2011-05-03 13:30:14 UTC (rev 1337) +++ trunk/src/main/java/cc/kune/core/client/sitebar/ErrorsDialog.ui.xml 2011-05-03 17:09:08 UTC (rev 1338) @@ -4,11 +4,11 @@ xmlns:g='urn:import:com.google.gwt.user.client.ui'> <ui:style> .panel { - background-color: #F2F2F2; + background-color: #F2F2F2; } </ui:style> -<g:ScrollPanel> - <g:VerticalPanel styleName="{style.panel}" ui:field="panel"> - </g:VerticalPanel> -</g:ScrollPanel> + <g:ScrollPanel ui:field="scroll"> + <g:VerticalPanel styleName="{style.panel}" ui:field="panel"> + </g:VerticalPanel> + </g:ScrollPanel> </ui:UiBinder> Modified: trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2011-05-03 13:30:14 UTC (rev 1337) +++ trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2011-05-03 17:09:08 UTC (rev 1338) @@ -65,256 +65,266 @@ @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 void addParticipant(final User user, final Long contentId, final String participant) { - final Content content = finder.getContent(contentId); - if (content.isWave()) { - kuneWaveManager.addParticipant(getWaveRef(content), content.getAuthors().get(0).getShortName(), - user.getShortName(), participant); - } + @Override + public void addParticipant(final User user, final Long contentId, final String participant) { + final Content content = finder.getContent(contentId); + if (content.isWave()) { + kuneWaveManager.addParticipant(getWaveRef(content), content.getAuthors().get(0).getShortName(), + user.getShortName(), participant); } + } - @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); + @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(newtitle, 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; } + } - private WaveRef getWaveRef(final Content content) { - try { - return JavaWaverefEncoder.decodeWaveRefFromPath(String.valueOf(content.getLastRevision().getBody())); - } catch (final InvalidWaveRefException e) { - throw new DefaultException("Error getting the wave"); - } + private WaveRef getWaveRef(final Content content) { + try { + return JavaWaverefEncoder.decodeWaveRefFromPath(String.valueOf(content.getLastRevision().getBody())); + } catch (final InvalidWaveRefException e) { + throw new DefaultException("Error getting the wave"); } + } - @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); - if (content.isWave()) { - final String author = content.getAuthors().get(0).getShortName(); - kuneWaveManager.setTitle(getWaveRef(content), newTitle, author); - } - 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(); + kuneWaveManager.setTitle(getWaveRef(content), newTitle, author); } + 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/gspace/client/viewers/DocViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-05-03 13:30:14 UTC (rev 1337) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-05-03 17:09:08 UTC (rev 1338) @@ -22,12 +22,11 @@ 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.state.UserSignOutEvent; -import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; 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; @@ -48,6 +47,8 @@ interface DocsViewerPanelUiBinder extends UiBinder<Widget, DocViewerPanel> { } + private static final RemoteViewServiceMultiplexer NO_CHANNEL = null; + private static DocsViewerPanelUiBinder uiBinder = GWT.create(DocsViewerPanelUiBinder.class); private final ContentCapabilitiesRegistry capabilitiesRegistry; @@ -63,26 +64,23 @@ private ProfileManager profiles; /** The wave panel, if a wave is open. */ private StagesProvider wave; + private final WaveClientManager waveClient; @UiField ImplPanel waveHolder; + private final WaveStore waveStore = new SimpleWaveStore(); private final Widget widget; @Inject - public DocViewerPanel(final GSpaceArmor wsArmor, - final ContentCapabilitiesRegistry capabilitiesRegistry, final I18nTranslationService i18n, - final cc.kune.core.client.state.Session session) { + public DocViewerPanel(final GSpaceArmor wsArmor, final WaveClientManager waveClient, + final ContentCapabilitiesRegistry capabilitiesRegistry, final I18nTranslationService i18n) { this.gsArmor = wsArmor; + this.waveClient = waveClient; this.capabilitiesRegistry = capabilitiesRegistry; widget = uiBinder.createAndBindUi(this); contentTitle = new ContentTitleWidget(i18n, gsArmor, capabilitiesRegistry.getIconsRegistry()); - session.onUserSignOut(true, new UserSignOutHandler() { - @Override - public void onUserSignOut(final UserSignOutEvent event) { - channel = null; - } - }); + loading.addClassName("kune-Margin-40-tb"); } @Override @@ -151,7 +149,6 @@ @Override public void setEditableContent(final StateContentDTO state) { setTitle(state, true); - initWaveClientIfNeeded(); setEditableWaveContent(state.getWaveRef(), false); deck.showWidget(0); } @@ -169,6 +166,8 @@ wave = null; } + initWaveClientIfNeeded(); + // Release the display:none. // UIObject.setVisible(waveFrame.getElement(), true); waveHolder.getElement().appendChild(loading); @@ -189,4 +188,15 @@ && capabilitiesRegistry.isRenamable(state.getTypeId())); } + @Override + public void signIn() { + // Do nothing (now) + // initWaveClientIfNeeded(); + } + + @Override + public void signOut() { + channel = NO_CHANNEL; + } + } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPresenter.java 2011-05-03 13:30:14 UTC (rev 1337) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPresenter.java 2011-05-03 17:09:08 UTC (rev 1338) @@ -11,6 +11,10 @@ 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.client.state.UserSignInEvent; +import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; +import cc.kune.core.client.state.UserSignOutEvent; +import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.HasContent; @@ -58,6 +62,10 @@ void setEditableContent(StateContentDTO state); void setEditableTitle(String title); + + void signIn(); + + void signOut(); } private final ActionRegistryByType actionsRegistry; @@ -76,6 +84,20 @@ this.renameAction = renameAction; viewerSelector.register(this, true, DocsConstants.TYPE_DOCUMENT); viewerSelector.register(this, true, BlogsConstants.TYPE_POST); + session.onUserSignOut(true, new UserSignOutHandler() { + @Override + public void onUserSignOut(final UserSignOutEvent event) { + getView().signOut(); + } + }); + session.onUserSignIn(true, new UserSignInHandler() { + + @Override + public void onUserSignIn(final UserSignInEvent event) { + getView().signIn(); + } + }); + } @Override Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-05-03 13:30:14 UTC (rev 1337) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-05-03 17:09:08 UTC (rev 1338) @@ -25,7 +25,6 @@ import java.util.Date; import java.util.logging.Logger; -import org.apache.jasper.compiler.ErrorDispatcher; import org.waveprotocol.box.webclient.client.ClientEvents; import org.waveprotocol.box.webclient.client.ClientIdGenerator; import org.waveprotocol.box.webclient.client.DebugMessagePanel; @@ -265,12 +264,12 @@ */ // XXX check formatting wrt GPE public native static String getWebSocketBaseUrl(String moduleBase) /*-{ - return "ws" + /:\/\/[^\/]+/.exec(moduleBase)[0] + "/"; -}-*/; + return "ws" + /:\/\/[^\/]+/.exec(moduleBase)[0] + "/"; + }-*/; public native static boolean useSocketIO() /*-{ - return !!$wnd.__useSocketIO -}-*/; + return !!$wnd.__useSocketIO + }-*/; /** */ @@ -419,4 +418,16 @@ return value != -1 ? String.valueOf(value) : otherwise; } } + + public WaveWebSocketClient getWebSocket() { + return websocket; + } + + public RemoteViewServiceMultiplexer getChannel() { + return channel; + } + + public ProfileManager getProfiles() { + return profiles; + } }

1 0

r1337 - in trunk/src/main/java/cc/kune: core/client/sn domain gspace/client/actions gspace/client/viewers
by Vicente J. Ruiz Jurado 03 May '11

03 May '11

Author: vjrj_ Date: 2011-05-03 15:30:14 +0200 (Tue, 03 May 2011) New Revision: 1337 Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPresenter.java trunk/src/main/java/cc/kune/domain/Container.java trunk/src/main/java/cc/kune/domain/Content.java trunk/src/main/java/cc/kune/domain/GroupList.java trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java Log: Fixes in domain, and wiab editor Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPresenter.java 2011-05-03 11:32:25 UTC (rev 1336) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPresenter.java 2011-05-03 13:30:14 UTC (rev 1337) @@ -5,9 +5,9 @@ import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.sn.actions.registry.GroupSNConfActions; import cc.kune.core.client.sn.actions.registry.GroupSNAdminsMenuItemsRegistry; import cc.kune.core.client.sn.actions.registry.GroupSNCollabsMenuItemsRegistry; +import cc.kune.core.client.sn.actions.registry.GroupSNConfActions; import cc.kune.core.client.sn.actions.registry.GroupSNPendingsMenuItemsRegistry; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SocialNetworkChangedEvent; @@ -31,173 +31,176 @@ import com.gwtplatform.mvp.client.proxy.Proxy; import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; -public class GroupSNPresenter extends AbstractSNPresenter<GroupSNPresenter.GroupSNView, GroupSNPresenter.GroupSNProxy> { +public class GroupSNPresenter extends + AbstractSNPresenter<GroupSNPresenter.GroupSNView, GroupSNPresenter.GroupSNProxy> { - @ProxyCodeSplit - public interface GroupSNProxy extends Proxy<GroupSNPresenter> { - } + @ProxyCodeSplit + public interface GroupSNProxy extends Proxy<GroupSNPresenter> { + } - public interface GroupSNView extends View { + public interface GroupSNView extends View { - void addAdmin(GroupDTO group, String avatarUrl, String tooltip, String tooltipTitle, - GuiActionDescCollection menu); + void addAdmin(GroupDTO group, String avatarUrl, String tooltip, String tooltipTitle, + GuiActionDescCollection menu); - void addCollab(GroupDTO group, String avatarUrl, String tooltip, String tooltipTitle, - GuiActionDescCollection menu); + void addCollab(GroupDTO group, String avatarUrl, String tooltip, String tooltipTitle, + GuiActionDescCollection menu); - void addPending(GroupDTO group, String avatarUrl, String tooltip, String tooltipTitle, - GuiActionDescCollection menu); + void addPending(GroupDTO group, String avatarUrl, String tooltip, String tooltipTitle, + GuiActionDescCollection menu); - void clear(); + void clear(); - IsActionExtensible getBottomToolbar(); + IsActionExtensible getBottomToolbar(); - void setAdminsCount(int count); + void setAdminsCount(int count); - void setCollabsCount(int count); + void setCollabsCount(int count); - void setCollabsVisible(boolean visible); + void setCollabsVisible(boolean visible); - void setPendingsCount(int count); + void setPendingsCount(int count); - void setPendingVisible(boolean visible); + void setPendingVisible(boolean visible); - void setVisible(boolean visible); + void setVisible(boolean visible); - void showMemberNotPublic(); + void showMemberNotPublic(); - void showMembers(); + void showMembers(); - void showOrphan(); - } + void showOrphan(); + } - private final GroupSNConfActions actionsRegistry; - private final GroupSNAdminsMenuItemsRegistry adminsMenuItemsRegistry; - private final GroupSNCollabsMenuItemsRegistry collabsMenuItemsRegistry; - private final GroupSNPendingsMenuItemsRegistry pendingsMenuItemsRegistry; + private final GroupSNConfActions actionsRegistry; + private final GroupSNAdminsMenuItemsRegistry adminsMenuItemsRegistry; + private final GroupSNCollabsMenuItemsRegistry collabsMenuItemsRegistry; + private final GroupSNPendingsMenuItemsRegistry pendingsMenuItemsRegistry; - @Inject - public GroupSNPresenter(final EventBus eventBus, final GroupSNView view, final GroupSNProxy proxy, - final StateManager stateManager, final Session session, final Provider<FileDownloadUtils> downloadProvider, - final GroupSNAdminsMenuItemsRegistry adminsMenuItemsRegistry, - final GroupSNCollabsMenuItemsRegistry collabsMenuItemsRegistry, - final GroupSNPendingsMenuItemsRegistry pendingsMenuItemsRegistry, - final GroupSNConfActions actionsRegistry) { - super(eventBus, view, proxy, downloadProvider); - this.adminsMenuItemsRegistry = adminsMenuItemsRegistry; - this.collabsMenuItemsRegistry = collabsMenuItemsRegistry; - this.pendingsMenuItemsRegistry = pendingsMenuItemsRegistry; - this.actionsRegistry = actionsRegistry; - stateManager.onStateChanged(true, new StateChangedEvent.StateChangedHandler() { - @Override - public void onStateChanged(final StateChangedEvent event) { - GroupSNPresenter.this.onStateChanged(event.getState()); - } + @Inject + public GroupSNPresenter(final EventBus eventBus, final GroupSNView view, final GroupSNProxy proxy, + final StateManager stateManager, final Session session, + final Provider<FileDownloadUtils> downloadProvider, + final GroupSNAdminsMenuItemsRegistry adminsMenuItemsRegistry, + final GroupSNCollabsMenuItemsRegistry collabsMenuItemsRegistry, + final GroupSNPendingsMenuItemsRegistry pendingsMenuItemsRegistry, + final GroupSNConfActions actionsRegistry) { + super(eventBus, view, proxy, downloadProvider); + this.adminsMenuItemsRegistry = adminsMenuItemsRegistry; + this.collabsMenuItemsRegistry = collabsMenuItemsRegistry; + this.pendingsMenuItemsRegistry = pendingsMenuItemsRegistry; + this.actionsRegistry = actionsRegistry; + stateManager.onStateChanged(true, new StateChangedEvent.StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + GroupSNPresenter.this.onStateChanged(event.getState()); + } + }); + stateManager.onSocialNetworkChanged(true, + new SocialNetworkChangedEvent.SocialNetworkChangedHandler() { + @Override + public void onSocialNetworkChanged(final SocialNetworkChangedEvent event) { + GroupSNPresenter.this.onStateChanged(event.getState()); + } }); - stateManager.onSocialNetworkChanged(true, new SocialNetworkChangedEvent.SocialNetworkChangedHandler() { - @Override - public void onSocialNetworkChanged(final SocialNetworkChangedEvent event) { - GroupSNPresenter.this.onStateChanged(event.getState()); - } - }); - session.onUserSignIn(true, new UserSignInHandler() { - @Override - public void onUserSignIn(final UserSignInEvent event) { - refreshOnSignInSignOut(session); - } - }); - session.onUserSignOut(true, new UserSignOutHandler() { - @Override - public void onUserSignOut(final UserSignOutEvent event) { - refreshOnSignInSignOut(session); - } + session.onUserSignIn(true, new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + refreshOnSignInSignOut(session); + } + }); + session.onUserSignOut(true, new UserSignOutHandler() { + @Override + public void onUserSignOut(final UserSignOutEvent event) { + refreshOnSignInSignOut(session); + } - }); - createActions(); - } + }); + createActions(); + } - private void createActions() { - getView().getBottomToolbar().addAll(actionsRegistry); - } + private void createActions() { + getView().getBottomToolbar().addAll(actionsRegistry); + } - @Override - public GroupSNView getView() { - return (GroupSNView) super.getView(); - } + @Override + public GroupSNView getView() { + return (GroupSNView) super.getView(); + } - private void onStateChanged(final StateAbstractDTO state) { - if (state.getGroup().isPersonal()) { - getView().setVisible(false); - } else { - if (state.getSocialNetworkData().isMembersVisible()) { - getView().clear(); - setGroupMembers(state.getGroupMembers(), state.getGroupRights()); - } else { - getView().clear(); - getView().showMemberNotPublic(); - getView().setVisible(true); - } - } + private void onStateChanged(final StateAbstractDTO state) { + if (state.getGroup().isPersonal()) { + getView().setVisible(false); + } else { + if (state.getSocialNetworkData().isMembersVisible()) { + getView().clear(); + setGroupMembers(state.getGroupMembers(), state.getGroupRights()); + } else { + getView().clear(); + getView().showMemberNotPublic(); + getView().setVisible(true); + } } + } - private void refreshOnSignInSignOut(final Session session) { - final StateAbstractDTO currentState = session.getCurrentState(); - if (currentState != null) { - GroupSNPresenter.this.onStateChanged(currentState); - } + private void refreshOnSignInSignOut(final Session session) { + final StateAbstractDTO currentState = session.getCurrentState(); + if (currentState != null) { + GroupSNPresenter.this.onStateChanged(currentState); } + } - @Override - protected void revealInParent() { - RevealRootContentEvent.fire(this, this); - } + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } - private void setGroupMembers(final SocialNetworkDTO socialNetwork, final AccessRights rights) { - final AccessListsDTO accessLists = socialNetwork.getAccessLists(); + private void setGroupMembers(final SocialNetworkDTO socialNetwork, final AccessRights rights) { + final AccessListsDTO accessLists = socialNetwork.getAccessLists(); - final List<GroupDTO> adminsList = accessLists.getAdmins().getList(); - final List<GroupDTO> collabList = accessLists.getEditors().getList(); - final List<GroupDTO> pendingCollabsList = socialNetwork.getPendingCollaborators().getList(); + final List<GroupDTO> adminsList = accessLists.getAdmins().getList(); + final List<GroupDTO> collabList = accessLists.getEditors().getList(); + final List<GroupDTO> pendingCollabsList = socialNetwork.getPendingCollaborators().getList(); - final int numAdmins = adminsList.size(); - final int numCollabs = collabList.size(); - final int numPendings = pendingCollabsList.size(); + final int numAdmins = adminsList.size(); + final int numCollabs = collabList.size(); + final int numPendings = pendingCollabsList.size(); - getView().setAdminsCount(numAdmins); - getView().setCollabsCount(numCollabs); - getView().setPendingsCount(numPendings); + getView().setAdminsCount(numAdmins); + getView().setCollabsCount(numCollabs); + getView().setPendingsCount(numPendings); - if ((numAdmins + numCollabs) == 0) { - getView().showOrphan(); - } else { - final boolean userIsAdmin = rights.isAdministrable(); - final boolean userCanView = rights.isVisible(); + if ((numAdmins + numCollabs) == 0) { + getView().showOrphan(); + } else { + final boolean userIsAdmin = rights.isAdministrable(); + final boolean userCanView = rights.isVisible(); - if (userCanView) { - for (final GroupDTO admin : adminsList) { - final String avatar = getAvatar(admin); - getView().addAdmin(admin, avatar, admin.getLongName(), "", - createMenuItems(admin, adminsMenuItemsRegistry, admin.getLongName())); - } - getView().setCollabsVisible(numCollabs > 0); - for (final GroupDTO collab : collabList) { - final String avatar = getAvatar(collab); - getView().addCollab(collab, avatar, collab.getLongName(), "", - createMenuItems(collab, collabsMenuItemsRegistry, collab.getLongName())); - } - if (userIsAdmin) { - getView().setPendingVisible(numPendings > 0); - for (final GroupDTO pendingCollab : pendingCollabsList) { - final String avatar = getAvatar(pendingCollab); - getView().addPending(pendingCollab, avatar, pendingCollab.getLongName(), "", - createMenuItems(pendingCollab, pendingsMenuItemsRegistry, pendingCollab.getLongName())); - } - } else { - getView().setPendingVisible(false); - } - getView().showMembers(); - } + if (userCanView) { + for (final GroupDTO admin : adminsList) { + final String avatar = getAvatar(admin); + getView().addAdmin(admin, avatar, admin.getLongName(), "", + createMenuItems(admin, adminsMenuItemsRegistry, admin.getLongName())); } - getView().setVisible(true); + getView().setCollabsVisible(numCollabs > 0); + for (final GroupDTO collab : collabList) { + final String avatar = getAvatar(collab); + getView().addCollab(collab, avatar, collab.getLongName(), "", + createMenuItems(collab, collabsMenuItemsRegistry, collab.getLongName())); + } + if (userIsAdmin) { + getView().setPendingVisible(numPendings > 0); + for (final GroupDTO pendingCollab : pendingCollabsList) { + final String avatar = getAvatar(pendingCollab); + getView().addPending(pendingCollab, avatar, pendingCollab.getLongName(), "", + createMenuItems(pendingCollab, pendingsMenuItemsRegistry, pendingCollab.getLongName())); + } + } else { + getView().setPendingVisible(false); + } + getView().showMembers(); + } } + getView().setVisible(true); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/domain/Container.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Container.java 2011-05-03 11:32:25 UTC (rev 1336) +++ trunk/src/main/java/cc/kune/domain/Container.java 2011-05-03 13:30:14 UTC (rev 1337) @@ -59,240 +59,242 @@ @Indexed @Table(name = "containers") public class Container implements HasId, HasStateToken { - @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL) - private List<Container> absolutePath; - @OneToOne(cascade = CascadeType.ALL) - private AccessLists accessLists; + @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + private List<Container> absolutePath; - @Fetch(FetchMode.JOIN) - @OrderBy("createdOn DESC") - @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.EAGER) - private Set<Container> childs; + @OneToOne(cascade = CascadeType.ALL) + private AccessLists accessLists; - @OneToMany(cascade = CascadeType.ALL) - private List<ContainerTranslation> containerTranslations; + @Fetch(FetchMode.JOIN) + @OrderBy("createdOn DESC") + @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + private Set<Container> childs; - @Fetch(FetchMode.JOIN) - @ContainedIn - @OrderBy("createdOn DESC") - @OneToMany(mappedBy = "container", cascade = CascadeType.ALL, fetch = FetchType.EAGER) - private Set<Content> contents; + @OneToMany(cascade = CascadeType.ALL) + private List<ContainerTranslation> containerTranslations; - @Basic(optional = false) - private Long createdOn; + @Fetch(FetchMode.JOIN) + @ContainedIn + @OrderBy("createdOn DESC") + @OneToMany(mappedBy = "container", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + private Set<Content> contents; - @Basic(optional = true) - private Date deletedOn; + @Basic(optional = false) + private Long createdOn; - @Id - @GeneratedValue - @DocumentId - Long id; + @Basic(optional = true) + private Date deletedOn; - @ManyToOne - private I18nLanguage language; + @Id + @GeneratedValue + @DocumentId + Long id; - @Column - @Field(index = Index.TOKENIZED, store = Store.NO) - private String name; + @ManyToOne + private I18nLanguage language; - @IndexedEmbedded(depth = 1, prefix = "owner_") - @OneToOne - private Group owner; + @Column + @Field(index = Index.TOKENIZED, store = Store.NO) + private String name; - // Parent/Child pattern: - // http://www.hibernate.org/hib_docs/reference/en/html/example-parentchild.html - // http://www.researchkitchen.co.uk/blog/archives/57 - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn - private Container parent; + @IndexedEmbedded(depth = 1, prefix = "owner_") + @OneToOne + private Group owner; - private String toolName; + // Parent/Child pattern: + // http://www.hibernate.org/hib_docs/reference/en/html/example-parentchild.html + // http://www.researchkitchen.co.uk/blog/archives/57 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn + private Container parent; - private String typeId; + private String toolName; - public Container() { - this(null, null, null); - } + private String typeId; - public Container(final String title, final Group group, final String toolName) { - this.name = title; - owner = group; - this.toolName = toolName; - this.contents = new HashSet<Content>(); - this.childs = new HashSet<Container>(); - this.absolutePath = new ArrayList<Container>(); - this.createdOn = System.currentTimeMillis(); - } + public Container() { + this(null, null, null); + } - public void addChild(final Container child) { - child.setParent(this); - childs.add(child); - } + public Container(final String title, final Group group, final String toolName) { + this.name = title; + owner = group; + this.toolName = toolName; + this.contents = new HashSet<Content>(); + this.childs = new HashSet<Container>(); + this.absolutePath = new ArrayList<Container>(); + this.createdOn = System.currentTimeMillis(); + } - public void addContent(final Content descriptor) { - // FIXME: something related with lazy initialization (workaround using - // size()) - contents.size(); - contents.add(descriptor); - } + public void addChild(final Container child) { + child.setParent(this); + childs.add(child); + } - public List<Container> getAbsolutePath() { - return absolutePath; - } + public void addContent(final Content descriptor) { + // FIXME: something related with lazy initialization (workaround using + // size()) + contents.size(); + contents.add(descriptor); + } - @Transient - public AccessLists getAccessLists() { - return hasAccessList() ? accessLists : isRoot() ? getOwner().getAccessLists() : getParent().getAccessLists(); - } + public List<Container> getAbsolutePath() { + return absolutePath; + } - public List<ContainerTranslation> getAliases() { - return containerTranslations; - } + @Transient + public AccessLists getAccessLists() { + return hasAccessList() ? accessLists : isRoot() ? getOwner().getAccessLists() + : getParent().getAccessLists(); + } - public Set<Container> getChilds() { - return childs; - } + public List<ContainerTranslation> getAliases() { + return containerTranslations; + } - public List<ContainerTranslation> getContainerTranslations() { - return containerTranslations; - } + public Set<Container> getChilds() { + return childs; + } - public Set<Content> getContents() { - return contents; - } + public List<ContainerTranslation> getContainerTranslations() { + return containerTranslations; + } - public Long getCreatedOn() { - return createdOn; - } + public Set<Content> getContents() { + return contents; + } - public Date getDeletedOn() { - return deletedOn; - } + public Long getCreatedOn() { + return createdOn; + } - @Override - public Long getId() { - return id; - } + public Date getDeletedOn() { + return deletedOn; + } - public I18nLanguage getLanguage() { - return language; - } + @Override + public Long getId() { + return id; + } - public String getName() { - return name; - } + public I18nLanguage getLanguage() { + return language; + } - public Group getOwner() { - return owner; - } + public String getName() { + return name; + } - public Container getParent() { - return parent; - } + public Group getOwner() { + return owner; + } - public Long getParentFolderId() { - return parent != null ? parent.getId() : null; - } + public Container getParent() { + return parent; + } - @Override - @Transient - public StateToken getStateToken() { - return new StateToken(getOwner().getShortName(), getToolName(), getId()); - } + public Long getParentFolderId() { + return parent != null ? parent.getId() : null; + } - @Transient - public String getStateTokenEncoded() { - return getStateToken().getEncoded(); - } + @Override + @Transient + public StateToken getStateToken() { + return new StateToken(getOwner().getShortName(), getToolName(), getId()); + } - public String getToolName() { - return toolName; - } + @Transient + public String getStateTokenEncoded() { + return getStateToken().getEncoded(); + } - public String getTypeId() { - return typeId; - } + public String getToolName() { + return toolName; + } - @Transient - public boolean hasAccessList() { - return accessLists != null; - } + public String getTypeId() { + return typeId; + } - @Transient - public boolean isLeaf() { - return childs.size() == 0 && contents.size() == 0; - } + @Transient + public boolean hasAccessList() { + return accessLists != null; + } - @Transient - public boolean isRoot() { - return parent == null; - } + @Transient + public boolean isLeaf() { + return childs.size() == 0 && contents.size() == 0; + } - public void setAbsolutePath(final List<Container> absolutePath) { - this.absolutePath = absolutePath; - } + @Transient + public boolean isRoot() { + return parent == null; + } - public void setAccessLists(final AccessLists accessLists) { - this.accessLists = accessLists; - } + public void setAbsolutePath(final List<Container> absolutePath) { + this.absolutePath = absolutePath; + } - public void setAliases(final List<ContainerTranslation> containerTranslations) { - this.containerTranslations = containerTranslations; - } + public void setAccessLists(final AccessLists accessLists) { + this.accessLists = accessLists; + } - public void setChilds(final Set<Container> childs) { - this.childs = childs; - } + public void setAliases(final List<ContainerTranslation> containerTranslations) { + this.containerTranslations = containerTranslations; + } - public void setContainerTranslations(final List<ContainerTranslation> containerTranslations) { - this.containerTranslations = containerTranslations; - } + public void setChilds(final Set<Container> childs) { + this.childs = childs; + } - public void setContents(final HashSet<Content> contents) { - this.contents = contents; - } + public void setContainerTranslations(final List<ContainerTranslation> containerTranslations) { + this.containerTranslations = containerTranslations; + } - public void setCreatedOn(final Long createdOn) { - this.createdOn = createdOn; - } + public void setContents(final HashSet<Content> contents) { + this.contents = contents; + } - public void setDeletedOn(final Date deletedOn) { - this.deletedOn = deletedOn; - } + public void setCreatedOn(final Long createdOn) { + this.createdOn = createdOn; + } - @Override - public void setId(final Long id) { - this.id = id; - } + public void setDeletedOn(final Date deletedOn) { + this.deletedOn = deletedOn; + } - public void setLanguage(final I18nLanguage language) { - this.language = language; - } + @Override + public void setId(final Long id) { + this.id = id; + } - public void setName(final String name) { - this.name = name; - } + public void setLanguage(final I18nLanguage language) { + this.language = language; + } - public void setOwner(final Group owner) { - this.owner = owner; - } + public void setName(final String name) { + this.name = name; + } - public void setParent(final Container parent) { - this.parent = parent; - } + public void setOwner(final Group owner) { + this.owner = owner; + } - public void setToolName(final String toolName) { - this.toolName = toolName; - } + public void setParent(final Container parent) { + this.parent = parent; + } - public void setTypeId(final String typeId) { - this.typeId = typeId; - } + public void setToolName(final String toolName) { + this.toolName = toolName; + } - @Override - public String toString() { - return "Container[(" + getStateTokenEncoded() + "): " + getName() + "]"; - } + public void setTypeId(final String typeId) { + this.typeId = typeId; + } + + @Override + public String toString() { + return "Container[(" + getStateTokenEncoded() + "): " + getName() + "]"; + } } Modified: trunk/src/main/java/cc/kune/domain/Content.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Content.java 2011-05-03 11:32:25 UTC (rev 1336) +++ trunk/src/main/java/cc/kune/domain/Content.java 2011-05-03 13:30:14 UTC (rev 1337) @@ -74,6 +74,7 @@ @OneToOne(cascade = CascadeType.ALL) private AccessLists accessLists; + @Fetch(FetchMode.JOIN) @IndexedEmbedded @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) private List<User> authors; @@ -106,6 +107,7 @@ private Long id; @IndexedEmbedded + @Fetch(FetchMode.JOIN) @NotNull @ManyToOne(fetch = FetchType.LAZY) private I18nLanguage language; Modified: trunk/src/main/java/cc/kune/domain/GroupList.java =================================================================== --- trunk/src/main/java/cc/kune/domain/GroupList.java 2011-05-03 11:32:25 UTC (rev 1336) +++ trunk/src/main/java/cc/kune/domain/GroupList.java 2011-05-03 13:30:14 UTC (rev 1337) @@ -35,103 +35,107 @@ import javax.persistence.OrderBy; import javax.persistence.Table; +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; + import cc.kune.core.shared.domain.GroupListMode; @Entity @Table(name = "group_list") @Inheritance(strategy = InheritanceType.SINGLE_TABLE) public class GroupList { - @Id - @GeneratedValue - private Long id; + @Id + @GeneratedValue + private Long id; - @OrderBy("shortName ASC") - @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) - List<Group> list; + @Fetch(FetchMode.JOIN) + @OrderBy("shortName ASC") + @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) + List<Group> list; - @Enumerated(EnumType.STRING) - @Basic - private GroupListMode mode; + @Enumerated(EnumType.STRING) + @Basic + private GroupListMode mode; - public GroupList() { - this(new ArrayList<Group>()); - this.mode = GroupListMode.NORMAL; - } + public GroupList() { + this(new ArrayList<Group>()); + this.mode = GroupListMode.NORMAL; + } - public GroupList(final List<Group> list) { - this.list = list; - } + public GroupList(final List<Group> list) { + this.list = list; + } - public void add(final Group group) { - // No group duplicate - // TODO: Get this outside Domain? - if (!list.contains(group)) { - list.add(group); - } - // TODO: Get this outside Domain? - if (getMode() == GroupListMode.NOBODY) { - setMode(GroupListMode.NORMAL); - } + public void add(final Group group) { + // No group duplicate + // TODO: Get this outside Domain? + if (!list.contains(group)) { + list.add(group); } - - public boolean checkIfIncludes(final Group group, final List<Group> list, final GroupListMode mode) { - switch (mode) { - case NOBODY: - return false; - case EVERYONE: - return true; - default: - return list.contains(group); - } + // TODO: Get this outside Domain? + if (getMode() == GroupListMode.NOBODY) { + setMode(GroupListMode.NORMAL); } + } - public ArrayList<Group> duplicate() { - return new ArrayList<Group>(list); + public boolean checkIfIncludes(final Group group, final List<Group> list, final GroupListMode mode) { + switch (mode) { + case NOBODY: + return false; + case EVERYONE: + return true; + default: + return list.contains(group); } + } - public Long getId() { - return id; - } + public ArrayList<Group> duplicate() { + return new ArrayList<Group>(list); + } - public List<Group> getList() { - return list; - } + public Long getId() { + return id; + } - public GroupListMode getMode() { - return mode; - } + public List<Group> getList() { + return list; + } - public boolean includes(final Group group) { - return checkIfIncludes(group, this.list, mode); - } + public GroupListMode getMode() { + return mode; + } - public boolean isEmpty() { - return list.size() == 0; - } + public boolean includes(final Group group) { + return checkIfIncludes(group, this.list, mode); + } - public void remove(final Group group) { - list.remove(group); - // TODO: Get this outside Domain? - if (list.isEmpty()) { - setMode(GroupListMode.NOBODY); - } - } + public boolean isEmpty() { + return list.size() == 0; + } - public void setId(final Long id) { - this.id = id; + public void remove(final Group group) { + list.remove(group); + // TODO: Get this outside Domain? + if (list.isEmpty()) { + setMode(GroupListMode.NOBODY); } + } - public void setList(final List<Group> list) { - this.list = list; - } + public void setId(final Long id) { + this.id = id; + } - public void setMode(final GroupListMode mode) { - this.mode = mode; - } + public void setList(final List<Group> list) { + this.list = list; + } - @Override - public String toString() { - return "GroupList[(" + mode + "): " + list + "]"; - } + public void setMode(final GroupListMode mode) { + this.mode = mode; + } + @Override + public String toString() { + return "GroupList[(" + mode + "): " + list + "]"; + } + } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java 2011-05-03 11:32:25 UTC (rev 1336) +++ trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java 2011-05-03 13:30:14 UTC (rev 1337) @@ -13,7 +13,6 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.HasContent; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; @@ -39,12 +38,12 @@ @Override public void actionPerformed(final ActionEvent event) { NotifyUser.showProgressProcessing(); - stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken()); contentService.get().addParticipant(session.getUserHash(), session.getCurrentStateToken(), session.getCurrentUser().getShortName(), new AsyncCallbackSimple<Void>() { @Override public void onSuccess(final Void arg) { NotifyUser.hideProgress(); + stateManager.gotoStateToken(session.getCurrentStateToken()); } }); } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-05-03 11:32:25 UTC (rev 1336) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-05-03 13:30:14 UTC (rev 1337) @@ -22,6 +22,8 @@ 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.state.UserSignOutEvent; +import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; @@ -69,11 +71,18 @@ @Inject public DocViewerPanel(final GSpaceArmor wsArmor, - final ContentCapabilitiesRegistry capabilitiesRegistry, final I18nTranslationService i18n) { + final ContentCapabilitiesRegistry capabilitiesRegistry, final I18nTranslationService i18n, + final cc.kune.core.client.state.Session session) { this.gsArmor = wsArmor; this.capabilitiesRegistry = capabilitiesRegistry; widget = uiBinder.createAndBindUi(this); contentTitle = new ContentTitleWidget(i18n, gsArmor, capabilitiesRegistry.getIconsRegistry()); + session.onUserSignOut(true, new UserSignOutHandler() { + @Override + public void onUserSignOut(final UserSignOutEvent event) { + channel = null; + } + }); } @Override

1 0

r1336 - trunk/src/main/java/cc/kune/common/client/ui/dialogs
by Vicente J. Ruiz Jurado 03 May '11

03 May '11

Author: vjrj_ Date: 2011-05-03 13:32:25 +0200 (Tue, 03 May 2011) New Revision: 1336 Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java Log: Minor change 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-05-03 11:29:33 UTC (rev 1335) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java 2011-05-03 11:32:25 UTC (rev 1336) @@ -19,7 +19,6 @@ */ package cc.kune.common.client.ui.dialogs; -import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.ui.PopupTopPanel; import cc.kune.common.client.utils.TextUtils; @@ -203,15 +202,9 @@ } } if (newWidth != null) { - NotifyUser.info(newWidth); - // popup.setWidth(newWidth); - // super.setWidth(newWidth); super.setInnerWidth(newWidth); } if (newHeight != null) { - NotifyUser.info(newHeight); - // popup.setHeight(newHeight); - // super.setHeight(newHeight); super.setInnerHeight(newHeight); } }

1 0