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;
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. */
mouseListener = null;
refresh(getControl());
// layout(getControl());
- layoutPage();
+ if (!getControl().isDisposed())
+ layoutPage();
} catch (RepositoryException e) {
throw new JcrException("Cannot refresh", e);
}
}
part.startEditing();
+ edited = part;
updateContent(part);
prepare(part, caretPosition);
- edited = part;
edited.getControl().addFocusListener(new FocusListener() {
private static final long serialVersionUID = 6883521812717097017L;
save(edited);
edited.stopEditing();
- updateContent(edited);
- layout(((EditablePart) edited).getControl());
+ EditablePart editablePart = edited;
+ Control control = ((EditablePart) edited).getControl();
+ edited = null;
+ // TODO make edited state management more robust
+ updateContent(editablePart);
+ layout(control);
} catch (RepositoryException e) {
throw new JcrException("Cannot stop editing", e);
} finally {