Author: vjrj Date: 2008-10-13 23:53:04 +0200 (Mon, 13 Oct 2008) New Revision: 906 Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java Log: Incomplete - taskHosted mode default border layout problems Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-13 17:01:21 UTC (rev 905) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-13 21:53:04 UTC (rev 906) @@ -78,9 +78,12 @@ public void onHide(Component component) { super.onHide(component); if (accordionLayout.getActiveItem() != null && accordionLayout.getActiveItem().isHidden()) { - Component firstComponent = entitySummary.getComponent(0); - if (firstComponent != null) { - ((Panel) firstComponent).expand(true); + Panel firstComponent = null; + for (Component compo : entitySummary.getComponents()) { + if (compo.isVisible() && firstComponent == null) { + firstComponent = (Panel) compo; + firstComponent.expand(true); + } } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2008-10-13 17:01:21 UTC (rev 905) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2008-10-13 21:53:04 UTC (rev 906) @@ -43,11 +43,13 @@ gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This is an orphaned project, if you are interested " + "please request to join to work on it"), dragConf, true, true, false, true, false); gridMenuPanel.setBorder(true); - gridMenuPanel.onDoubleClick(new Listener<String>() { + Listener<String> go = new Listener<String>() { public void onEvent(final String groupShortName) { presenter.onDoubleClick(groupShortName); } - }); + }; + gridMenuPanel.onClick(go); + gridMenuPanel.onDoubleClick(go); gridMenuPanel.getBottomBar().setCls("k-blank-toolbar"); super.add(gridMenuPanel); ws.addInSummary(this); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2008-10-13 17:01:21 UTC (rev 905) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2008-10-13 21:53:04 UTC (rev 906) @@ -103,10 +103,6 @@ this.view = view; } - public void onDoubleClick(final String groupShortName) { - stateManager.gotoToken(groupShortName); - } - private boolean isMember(final boolean userIsAdmin, final boolean userIsCollab) { return userIsAdmin || userIsCollab; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2008-10-13 17:01:21 UTC (rev 905) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2008-10-13 21:53:04 UTC (rev 906) @@ -27,6 +27,7 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsTheme; +import com.calclab.suco.client.listener.Listener; import com.gwtext.client.widgets.BoxComponent; import com.gwtext.client.widgets.event.ContainerListenerAdapter; @@ -42,6 +43,13 @@ gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This user is not member of any group"), false, false, false, false, false); gridMenuPanel.setBorder(true); + Listener<String> go = new Listener<String>() { + public void onEvent(final String groupShortName) { + presenter.onDoubleClick(groupShortName); + } + }; + gridMenuPanel.onClick(go); + gridMenuPanel.onDoubleClick(go); super.add(gridMenuPanel); ws.addInSummary(this); ws.addListenerInEntitySummary(new ContainerListenerAdapter() { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2008-10-13 17:01:21 UTC (rev 905) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2008-10-13 21:53:04 UTC (rev 906) @@ -47,235 +47,239 @@ private final MenuItemCollection<GroupDTO> otherLoggedOperationsUsers; public SocialNetworkPresenter(final I18nUITranslationService i18n, final StateManager stateManager, - final ImageUtils imageUtils, final Session session, - final Provider<SocialNetworkServiceAsync> snServiceProvider) { - this.i18n = i18n; - this.stateManager = stateManager; - this.imageUtils = imageUtils; - this.session = session; - this.snServiceProvider = snServiceProvider; - createButtons(); - createMenuActions(); - otherOperationsUsers = new MenuItemCollection<GroupDTO>(); - otherLoggedOperationsUsers = new MenuItemCollection<GroupDTO>(); - otherOperations = new MenuItemCollection<GroupDTO>(); - otherLoggedOperations = new MenuItemCollection<GroupDTO>(); + final ImageUtils imageUtils, final Session session, + final Provider<SocialNetworkServiceAsync> snServiceProvider) { + this.i18n = i18n; + this.stateManager = stateManager; + this.imageUtils = imageUtils; + this.session = session; + this.snServiceProvider = snServiceProvider; + createButtons(); + createMenuActions(); + otherOperationsUsers = new MenuItemCollection<GroupDTO>(); + otherLoggedOperationsUsers = new MenuItemCollection<GroupDTO>(); + otherOperations = new MenuItemCollection<GroupDTO>(); + otherLoggedOperations = new MenuItemCollection<GroupDTO>(); } public void addGroupOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperations : otherOperations; - collection.add(operation); + MenuItemCollection<GroupDTO> collection; + collection = mustBeLogged ? otherLoggedOperations : otherOperations; + collection.add(operation); } public void addUserOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; - collection.add(operation); + MenuItemCollection<GroupDTO> collection; + collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; + collection.add(operation); } + public void onDoubleClick(final String groupShortName) { + stateManager.gotoToken(groupShortName); + } + public void removeGroupOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperations : otherOperations; - collection.remove(operation); + MenuItemCollection<GroupDTO> collection; + collection = mustBeLogged ? otherLoggedOperations : otherOperations; + collection.remove(operation); } public void removeUserOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; - collection.remove(operation); + MenuItemCollection<GroupDTO> collection; + collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; + collection.remove(operation); } protected GridItem<GroupDTO> createGridItem(final GridGroup groupCategory, final GroupDTO group, - final AccessRightsDTO rights, final MenuItem<GroupDTO>... gridMenuItems) { - final GridItem<GroupDTO> gridItem = createDefMemberMenu(group, groupCategory); - final CustomMenu<GroupDTO> menu = gridItem.getMenu(); - if (rights.isAdministrable()) { - for (final MenuItem<GroupDTO> item : gridMenuItems) { - menu.addMenuItem(item); - } - } - return gridItem; + final AccessRightsDTO rights, final MenuItem<GroupDTO>... gridMenuItems) { + final GridItem<GroupDTO> gridItem = createDefMemberMenu(group, groupCategory); + final CustomMenu<GroupDTO> menu = gridItem.getMenu(); + if (rights.isAdministrable()) { + for (final MenuItem<GroupDTO> item : gridMenuItems) { + menu.addMenuItem(item); + } + } + return gridItem; } private void createButtons() { - requestJoin = new GridButton("images/add-green.gif", i18n.t("Participate"), i18n - .t("Request to participate in this group"), new Listener<String>() { - public void onEvent(final String parameter) { - Site.showProgressProcessing(); - snServiceProvider.get().requestJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - Site.hideProgress(); - final SocialNetworkRequestResult resultType = (SocialNetworkRequestResult) result; - switch (resultType) { - case accepted: - Site.info(i18n.t("You are now member of this group")); - stateManager.reload(); - break; - case denied: - Site.important(i18n.t("Sorry this is a closed group")); - break; - case moderated: - Site.info(i18n.t("Requested. Waiting for admins decision")); - break; - } - } - }); - } - }); + requestJoin = new GridButton("images/add-green.gif", i18n.t("Participate"), i18n + .t("Request to participate in this group"), new Listener<String>() { + public void onEvent(final String parameter) { + Site.showProgressProcessing(); + snServiceProvider.get().requestJoinGroup(session.getUserHash(), + session.getCurrentState().getStateToken(), new AsyncCallbackSimple<Object>() { + public void onSuccess(final Object result) { + Site.hideProgress(); + final SocialNetworkRequestResult resultType = (SocialNetworkRequestResult) result; + switch (resultType) { + case accepted: + Site.info(i18n.t("You are now member of this group")); + stateManager.reload(); + break; + case denied: + Site.important(i18n.t("Sorry this is a closed group")); + break; + case moderated: + Site.info(i18n.t("Requested. Waiting for admins decision")); + break; + } + } + }); + } + }); - unJoinButton = new GridButton("images/del.gif", i18n.t("Unjoin"), i18n - .t("Don't participate more in this group"), new Listener<String>() { - public void onEvent(final String parameter) { - removeMemberAction(); - } - }); + unJoinButton = new GridButton("images/del.gif", i18n.t("Unjoin"), i18n + .t("Don't participate more in this group"), new Listener<String>() { + public void onEvent(final String parameter) { + removeMemberAction(); + } + }); } private GridItem<GroupDTO> createDefMemberMenu(final GroupDTO group, final GridGroup gridGroup) { - final CustomMenu<GroupDTO> menu = new CustomMenu<GroupDTO>(group); - final String longName = group.getLongName(); - boolean isPersonal = group.getType().equals(GroupType.PERSONAL); - final String toolTip = i18n.t(isPersonal ? "User nickname: [%s]" : "Group short name: [%s]", group - .getShortName()); - final String imageHtml = isPersonal ? imageUtils.getImageHtml(ImageDescriptor.personDef) : imageUtils - .getImageHtml(ImageDescriptor.groupDefIcon); - final GridItem<GroupDTO> gridItem = new GridItem<GroupDTO>(group, gridGroup, group.getShortName(), imageHtml, - longName, longName, " ", longName, toolTip, menu); - if (!isPersonal) { - menu.addMenuItemList(otherOperations); - } - if (session.isLogged() && !isPersonal) { - menu.addMenuItemList(otherLoggedOperations); - } - if (isPersonal) { - menu.addMenuItemList(otherOperationsUsers); - } - if (session.isLogged() && isPersonal) { - menu.addMenuItemList(otherLoggedOperationsUsers); - } + final CustomMenu<GroupDTO> menu = new CustomMenu<GroupDTO>(group); + final String longName = group.getLongName(); + boolean isPersonal = group.getType().equals(GroupType.PERSONAL); + final String toolTip = i18n.t(isPersonal ? "User nickname: [%s]" : "Group short name: [%s]", group + .getShortName()); + final String imageHtml = isPersonal ? imageUtils.getImageHtml(ImageDescriptor.personDef) : imageUtils + .getImageHtml(ImageDescriptor.groupDefIcon); + final GridItem<GroupDTO> gridItem = new GridItem<GroupDTO>(group, gridGroup, group.getShortName(), imageHtml, + longName, longName, " ", longName, toolTip, menu); + if (!isPersonal) { + menu.addMenuItemList(otherOperations); + } + if (session.isLogged() && !isPersonal) { + menu.addMenuItemList(otherLoggedOperations); + } + if (isPersonal) { + menu.addMenuItemList(otherOperationsUsers); + } + if (session.isLogged() && isPersonal) { + menu.addMenuItemList(otherLoggedOperationsUsers); + } - return gridItem; + return gridItem; } private void createMenuActions() { - gotoGroupMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this group homepage"), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO groupDTO) { - stateManager.gotoToken(groupDTO.getShortName()); - } - }); - gotoMemberMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this member homepage"), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO groupDTO) { - stateManager.gotoToken(groupDTO.getShortName()); - } - }); - unJoinMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n - .t("Don't participate more as a member in this group"), new Listener<GroupDTO>() { - public void onEvent(final GroupDTO groupDTO) { - removeMemberAction(groupDTO); - } - }); - changeToCollabMenuItem = new MenuItem<GroupDTO>("images/arrow-down-green.gif", - i18n.t("Change to collaborator"), new Listener<GroupDTO>() { - public void onEvent(final GroupDTO group) { - Site.showProgressProcessing(); - snServiceProvider.get().setAdminAsCollab(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Type of member changed")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - removeMemberMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Remove this member"), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO group) { - Site.showProgressProcessing(); - snServiceProvider.get().deleteMember(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Member removed")); - stateManager.reload(); - // in the future, only if I cannot - // be affected: - // snService.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) - // result); - } - }); - } - }); - changeToAdminMenuItem = new MenuItem<GroupDTO>("images/arrow-up-green.gif", i18n.t("Change to admin"), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO group) { - Site.showProgressProcessing(); - snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Type of member changed")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - acceptJoinGroupMenuItem = new MenuItem<GroupDTO>("images/accept.gif", i18n.t("Accept this member"), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO group) { - Site.showProgressProcessing(); - snServiceProvider.get().AcceptJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Member accepted")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - denyJoinGroupMenuItem = new MenuItem<GroupDTO>("images/cancel.gif", i18n.t("Don't accept this member"), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO group) { - Site.showProgressProcessing(); - snServiceProvider.get().denyJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Member rejected")); - stateManager.setSocialNetwork(result); - } - }); - } - }); + gotoGroupMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this group homepage"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO groupDTO) { + stateManager.gotoToken(groupDTO.getShortName()); + } + }); + gotoMemberMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this member homepage"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO groupDTO) { + stateManager.gotoToken(groupDTO.getShortName()); + } + }); + unJoinMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Don't participate more in this group"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO groupDTO) { + removeMemberAction(groupDTO); + } + }); + changeToCollabMenuItem = new MenuItem<GroupDTO>("images/arrow-down-green.gif", + i18n.t("Change to collaborator"), new Listener<GroupDTO>() { + public void onEvent(final GroupDTO group) { + Site.showProgressProcessing(); + snServiceProvider.get().setAdminAsCollab(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Type of member changed")); + stateManager.setSocialNetwork(result); + } + }); + } + }); + removeMemberMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Remove this member"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO group) { + Site.showProgressProcessing(); + snServiceProvider.get().deleteMember(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Member removed")); + stateManager.reload(); + // in the future, only if I cannot + // be affected: + // snService.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) + // result); + } + }); + } + }); + changeToAdminMenuItem = new MenuItem<GroupDTO>("images/arrow-up-green.gif", i18n.t("Change to admin"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO group) { + Site.showProgressProcessing(); + snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Type of member changed")); + stateManager.setSocialNetwork(result); + } + }); + } + }); + acceptJoinGroupMenuItem = new MenuItem<GroupDTO>("images/accept.gif", i18n.t("Accept this member"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO group) { + Site.showProgressProcessing(); + snServiceProvider.get().AcceptJoinGroup(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Member accepted")); + stateManager.setSocialNetwork(result); + } + }); + } + }); + denyJoinGroupMenuItem = new MenuItem<GroupDTO>("images/cancel.gif", i18n.t("Don't accept this member"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO group) { + Site.showProgressProcessing(); + snServiceProvider.get().denyJoinGroup(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Member rejected")); + stateManager.setSocialNetwork(result); + } + }); + } + }); } private void removeMemberAction() { - removeMemberAction(session.getCurrentState().getGroup()); + removeMemberAction(session.getCurrentState().getGroup()); } private void removeMemberAction(final GroupDTO groupDTO) { - Site.showProgressProcessing(); - snServiceProvider.get().unJoinGroup(session.getUserHash(), new StateToken(groupDTO.getShortName()), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Removed as member")); - stateManager.reload(); - // in the future with user info: - // services.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) - // result); - } - }); + Site.showProgressProcessing(); + snServiceProvider.get().unJoinGroup(session.getUserHash(), new StateToken(groupDTO.getShortName()), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Removed as member")); + stateManager.reload(); + // in the future with user info: + // services.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) + // result); + } + }); } }