(mbaudier) update code while working on generic FormPageEditor

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

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/text/AbstractTextViewer.java b/org.argeo.cms/src/org/argeo/cms/internal/text/AbstractTextViewer.java
index 57939b5172082f1580dfda7ad388915657065e65..4a15701c699b0a5e641df62b5a6b31c12c0eb78c 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/text/AbstractTextViewer.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/text/AbstractTextViewer.java
@@ -845,16 +845,6 @@ public abstract class AbstractTextViewer extends AbstractPageViewer implements
                        }
                }
 
-               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");
-               }
-
                @Override
                public void mouseUp(MouseEvent e) {
                }

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 48ca70a6947d3a2c220cb329976a4aa8b47fa8d7..17cffe8f80a53db4836c07cb4193188d4838a6aa 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/users/UserViewer.java
+++ b/org.argeo.cms/src/org/argeo/cms/users/UserViewer.java
@@ -4,7 +4,6 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.cms.CmsEditable;
-import org.argeo.cms.CmsException;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.cms.viewers.AbstractPageViewer;
 import org.argeo.cms.viewers.EditablePart;
@@ -86,16 +85,6 @@ public class UserViewer extends AbstractPageViewer {
        }
 
 
-       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();

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 331275c44dd3484dbd8e0bd071bfc7e08109fa58..837cf99292368b9617eeb8cecdfc39d296a57574 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,6 +40,7 @@ public abstract class AbstractPageViewer extends ContentViewer implements
 
        // 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
@@ -223,6 +224,20 @@ public abstract class AbstractPageViewer extends ContentViewer implements
                page.layout(controls);
        }
 
+       /**
+        * Find the first {@link EditablePart} in the parents hierarchy of this
+        * control
+        */
+       protected 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");
+       }
+
        // UTILITIES
        /** Check whether the edited part is in a proper state */
        protected void checkEdited() {