X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fforms%2FFormPageViewer.java;h=d6de0464e6fdb5f07d86e873d7098af9a1f602a9;hb=2e8e5c43aa204d43fcd80d445c6f4863dc5b54ae;hp=2f2181452493b6c3bb3f230cceb9e2323a1f920e;hpb=95c16971996f79c2e94709d3c1957185e737f2c1;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java b/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java index 2f2181452..d6de0464e 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java @@ -17,11 +17,10 @@ import javax.jcr.ValueFormatException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsNames; import org.argeo.cms.text.Img; +import org.argeo.cms.text.MarkupValidatorCopy; import org.argeo.cms.ui.CmsEditable; import org.argeo.cms.ui.CmsImageManager; -import org.argeo.cms.ui.internal.text.MarkupValidatorCopy; import org.argeo.cms.util.CmsUtils; import org.argeo.cms.viewers.AbstractPageViewer; import org.argeo.cms.viewers.EditablePart; @@ -422,7 +421,7 @@ public class FormPageViewer extends AbstractPageViewer { return body; } - protected class FormFileUploadReceiver extends FileUploadReceiver implements CmsNames { + protected class FormFileUploadReceiver extends FileUploadReceiver { private Node context; private Section section; @@ -542,19 +541,19 @@ public class FormPageViewer extends AbstractPageViewer { return body; } - // LOCAL HELPERS FOR NODE MANAGEMENT - protected Node getOrCreateNode(Node parent, String nodeType, String nodeName) throws RepositoryException { - Node node = null; - if (getCmsEditable().canEdit() && !parent.hasNode(nodeName)) { - node = JcrUtils.mkdirs(parent, nodeName, nodeType); - parent.getSession().save(); - } - - if (getCmsEditable().canEdit() || parent.hasNode(nodeName)) - node = parent.getNode(nodeName); - - return node; - } +// // LOCAL HELPERS FOR NODE MANAGEMENT +// private Node getOrCreateNode(Node parent, String nodeName, String nodeType) throws RepositoryException { +// Node node = null; +// if (getCmsEditable().canEdit() && !parent.hasNode(nodeName)) { +// node = JcrUtils.mkdirs(parent, nodeName, nodeType); +// parent.getSession().save(); +// } +// +// if (getCmsEditable().canEdit() || parent.hasNode(nodeName)) +// node = parent.getNode(nodeName); +// +// return node; +// } private SelectionListener getRemoveValueSelListener() { return new SelectionAdapter() {