X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fusers%2FUserViewer.java;h=8badedb12c4017aa3a0767e5d037c4653f10045c;hb=cf02d7afd63e6bbef9f7a88ee9674c27ff843d79;hp=a520da1bd791ba0e718a4ad23818c3481ed7646d;hpb=050d54bb859aaed19777b32d7c9e677c532ef52f;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserViewer.java b/org.argeo.cms/src/org/argeo/cms/users/UserViewer.java index a520da1bd..8badedb12 100644 --- a/org.argeo.cms/src/org/argeo/cms/users/UserViewer.java +++ b/org.argeo.cms/src/org/argeo/cms/users/UserViewer.java @@ -1,13 +1,15 @@ package org.argeo.cms.users; +import static org.eclipse.swt.SWT.NONE; + import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.cms.CmsEditable; -import org.argeo.cms.CmsException; -import org.argeo.cms.CmsUtils; +import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.AbstractPageViewer; import org.argeo.cms.viewers.EditablePart; +import org.argeo.cms.viewers.Section; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; @@ -28,22 +30,21 @@ public class UserViewer extends AbstractPageViewer { private UserViewer(UserPart userPart, int style, Node userNode, CmsEditable cmsEditable) throws RepositoryException { - super(userPart, style, cmsEditable); + super(new Section(userPart, NONE, userNode), style, cmsEditable); this.userPart = userPart; - userPart.createControl(userPart,"cms_test"); + userPart.createControl(userPart, "cms_test"); userPart.setStyle("cms_test"); refresh(); userPart.setLayoutData(CmsUtils.fillWidth()); userPart.setMouseListener(getMouseListener()); - - // Add other parts -// userRolesPart.createControl(userPart,"cms_test"); -// userPart.setStyle("cms_test"); -// refresh(); -// userPart.setLayoutData(CmsUtils.fillWidth()); -// userPart.setMouseListener(getMouseListener()); - - + + // Add other parts + // userRolesPart.createControl(userPart,"cms_test"); + // userPart.setStyle("cms_test"); + // refresh(); + // userPart.setLayoutData(CmsUtils.fillWidth()); + // userPart.setMouseListener(getMouseListener()); + } // private JcrComposite createParents(Composite parent, Node userNode) @@ -79,23 +80,12 @@ public class UserViewer extends AbstractPageViewer { } } } - + protected void updateContent(EditablePart part) throws RepositoryException { if (part instanceof UserPart) ((UserPart) part).refresh(); } - - private EditablePart findDataParent(Control parent) { - if (parent instanceof EditablePart) { - return (EditablePart) parent; - } - if (parent.getParent() != null) - return findDataParent(parent.getParent()); - else - throw new CmsException("No data parent found"); - } - protected void refresh(Control control) throws RepositoryException { if (control instanceof UserPart) ((UserPart) control).refresh();