X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=jcr%2Forg.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fviewers%2FAbstractPageViewer.java;h=e23846e928d0c47136de8a9f9fd66e6b3c6bffc3;hb=9fd6744d04e89fac07e34947d962aec1509ff9f8;hp=ef24ee0d5021fd729ab8fe3a9b055c3aa9c5e896;hpb=8282011b0e20e80704b209ad55fa9fb132e16280;p=lgpl%2Fargeo-commons.git

diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java
index ef24ee0d5..e23846e92 100644
--- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java
+++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java
@@ -11,9 +11,10 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.security.auth.Subject;
 
-import org.argeo.api.cms.CmsEditable;
 import org.argeo.api.cms.CmsLog;
-import org.argeo.cms.ui.widgets.ScrolledPage;
+import org.argeo.api.cms.ux.CmsEditable;
+import org.argeo.cms.swt.SwtEditablePart;
+import org.argeo.cms.swt.widgets.ScrolledPage;
 import org.argeo.jcr.JcrException;
 import org.eclipse.jface.viewers.ContentViewer;
 import org.eclipse.jface.viewers.ISelection;
@@ -42,7 +43,7 @@ public abstract class AbstractPageViewer extends ContentViewer implements Observ
 	private MouseListener mouseListener;
 	private FocusListener focusListener;
 
-	private EditablePart edited;
+	private SwtEditablePart edited;
 	private ISelection selection = StructuredSelection.EMPTY;
 
 	private AccessControlContext accessControlContext;
@@ -140,11 +141,11 @@ public abstract class AbstractPageViewer extends ContentViewer implements Observ
 	}
 
 	/** To be overridden.Save the edited part. */
-	protected void save(EditablePart part) throws RepositoryException {
+	protected void save(SwtEditablePart part) throws RepositoryException {
 	}
 
 	/** Prepare the edited part */
-	protected void prepare(EditablePart part, Object caretPosition) {
+	protected void prepare(SwtEditablePart part, Object caretPosition) {
 	}
 
 	/** Notified when the editing state changed. Does nothing, to be overridden */
@@ -177,17 +178,17 @@ public abstract class AbstractPageViewer extends ContentViewer implements Observ
 		this.selection = selection;
 	}
 
-	protected void updateContent(EditablePart part) throws RepositoryException {
+	protected void updateContent(SwtEditablePart part) throws RepositoryException {
 	}
 
 	// LOW LEVEL EDITION
-	protected void edit(EditablePart part, Object caretPosition) {
+	protected void edit(SwtEditablePart part, Object caretPosition) {
 		try {
 			if (edited == part)
 				return;
 
 			if (edited != null && edited != part) {
-				EditablePart previouslyEdited = edited;
+				SwtEditablePart previouslyEdited = edited;
 				try {
 					stopEditing(true);
 				} catch (Exception e) {
@@ -239,8 +240,8 @@ public abstract class AbstractPageViewer extends ContentViewer implements Observ
 				save(edited);
 
 			edited.stopEditing();
-			EditablePart editablePart = edited;
-			Control control = ((EditablePart) edited).getControl();
+			SwtEditablePart editablePart = edited;
+			Control control = ((SwtEditablePart) edited).getControl();
 			edited = null;
 			// TODO make edited state management more robust
 			updateContent(editablePart);
@@ -269,11 +270,11 @@ public abstract class AbstractPageViewer extends ContentViewer implements Observ
 	}
 
 	/**
-	 * Find the first {@link EditablePart} in the parents hierarchy of this control
+	 * Find the first {@link SwtEditablePart} in the parents hierarchy of this control
 	 */
-	protected EditablePart findDataParent(Control parent) {
-		if (parent instanceof EditablePart) {
-			return (EditablePart) parent;
+	protected SwtEditablePart findDataParent(Control parent) {
+		if (parent instanceof SwtEditablePart) {
+			return (SwtEditablePart) parent;
 		}
 		if (parent.getParent() != null)
 			return findDataParent(parent.getParent());
@@ -327,7 +328,7 @@ public abstract class AbstractPageViewer extends ContentViewer implements Observ
 		return readOnly;
 	}
 
-	protected EditablePart getEdited() {
+	protected SwtEditablePart getEdited() {
 		return edited;
 	}