From f515b2024832307daeb5c772830d00d45f88b6fe Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Fri, 13 Mar 2015 17:53:33 +0000
Subject: [PATCH] (mbaudier) update code while working on generic
 FormPageEditor

git-svn-id: https://svn.argeo.org/commons/trunk@8023 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../cms/internal/text/AbstractTextViewer.java     | 10 ----------
 .../src/org/argeo/cms/users/UserViewer.java       | 11 -----------
 .../org/argeo/cms/viewers/AbstractPageViewer.java | 15 +++++++++++++++
 3 files changed, 15 insertions(+), 21 deletions(-)

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 57939b517..4a15701c6 100644
--- 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 48ca70a69..17cffe8f8 100644
--- 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 331275c44..837cf9929 100644
--- 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() {
-- 
2.30.2