Remove deprecated method

git-svn-id: https://svn.argeo.org/commons/trunk@8075 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 17cffe8f80a53db4836c07cb4193188d4838a6aa..8badedb12c4017aa3a0767e5d037c4653f10045c 100644 (file)
--- 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 93dca724c1d332582d36b11c90cd34c7ce433a73..21f259c8882d22be81695533091c93be57e4fee5 100644 (file)
--- 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