X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fviewers%2FAbstractPageViewer.java;h=ef24ee0d5021fd729ab8fe3a9b055c3aa9c5e896;hb=633a8acd189cc22f06944d278879601189be1bc8;hp=60db89978d9f1ba3493fc582edbce77bffdb1fe6;hpb=5e3263b18866736c3973cb2654c72fa4e549df05;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java
index 60db89978..ef24ee0d5 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java
@@ -11,9 +11,8 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.security.auth.Subject;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.ui.CmsEditable;
+import org.argeo.api.cms.CmsEditable;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.ui.widgets.ScrolledPage;
 import org.argeo.jcr.JcrException;
 import org.eclipse.jface.viewers.ContentViewer;
@@ -33,7 +32,7 @@ import org.xml.sax.SAXParseException;
 public abstract class AbstractPageViewer extends ContentViewer implements Observer {
 	private static final long serialVersionUID = 5438688173410341485L;
 
-	private final static Log log = LogFactory.getLog(AbstractPageViewer.class);
+	private final static CmsLog log = CmsLog.getLog(AbstractPageViewer.class);
 
 	private final boolean readOnly;
 	/** The basis for the layouts, typically a ScrolledPage. */
@@ -164,7 +163,8 @@ public abstract class AbstractPageViewer extends ContentViewer implements Observ
 					mouseListener = null;
 				refresh(getControl());
 				// layout(getControl());
-				layoutPage();
+				if (!getControl().isDisposed())
+					layoutPage();
 			} catch (RepositoryException e) {
 				throw new JcrException("Cannot refresh", e);
 			}