From 08882f7b9f77cf5a60fa554766ccdfee3b4d73d5 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Mon, 27 Apr 2015 10:23:33 +0000 Subject: [PATCH] Remove deprecated method git-svn-id: https://svn.argeo.org/commons/trunk@8075 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/org/argeo/cms/users/UserViewer.java | 27 ++++++++++--------- .../argeo/cms/viewers/AbstractPageViewer.java | 22 +-------------- 2 files changed, 15 insertions(+), 34 deletions(-) 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 17cffe8f8..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,5 +1,7 @@ package org.argeo.cms.users; +import static org.eclipse.swt.SWT.NONE; + import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -7,6 +9,7 @@ import org.argeo.cms.CmsEditable; 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; @@ -27,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) @@ -78,13 +80,12 @@ public class UserViewer extends AbstractPageViewer { } } } - + protected void updateContent(EditablePart part) throws RepositoryException { if (part instanceof UserPart) ((UserPart) part).refresh(); } - protected void refresh(Control control) throws RepositoryException { if (control instanceof UserPart) ((UserPart) control).refresh(); diff --git a/org.argeo.cms/src/org/argeo/cms/viewers/AbstractPageViewer.java b/org.argeo.cms/src/org/argeo/cms/viewers/AbstractPageViewer.java index 93dca724c..21f259c88 100644 --- a/org.argeo.cms/src/org/argeo/cms/viewers/AbstractPageViewer.java +++ b/org.argeo.cms/src/org/argeo/cms/viewers/AbstractPageViewer.java @@ -40,25 +40,6 @@ public abstract class AbstractPageViewer extends ContentViewer implements private EditablePart edited; private ISelection selection = StructuredSelection.EMPTY; - // FIXME Added by BSinou to manage non-section Composite. - // Is it the correct method? - @Deprecated - protected AbstractPageViewer(Composite parent, int style, - CmsEditable cmsEditable) { - // read only at UI level - readOnly = SWT.READ_ONLY == (style & SWT.READ_ONLY); - - this.cmsEditable = cmsEditable == null ? CmsEditable.NON_EDITABLE - : cmsEditable; - if (this.cmsEditable instanceof Observable) - ((Observable) this.cmsEditable).addObserver(this); - - if (cmsEditable.canEdit()) { - mouseListener = createMouseListener(); - } - page = findPage(parent); - } - protected AbstractPageViewer(Section parent, int style, CmsEditable cmsEditable) { // read only at UI level @@ -302,5 +283,4 @@ public abstract class AbstractPageViewer extends ContentViewer implements public ISelection getSelection() { return selection; } - -} +} \ No newline at end of file -- 2.30.2