X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=publishing%2Forg.argeo.publishing.ui%2Fsrc%2Forg%2Fargeo%2Fdocbook%2Fui%2FDocumentTextEditor.java;h=61c0120e5ec722fdcc9645b24e5d0058f060e6eb;hb=752a7b2614895002a3d184be166ef4162caf0d05;hp=aeafcd3466557014c529d84fd8a6494c51cdf1e8;hpb=9dd16d64cc4ea274c33a4c1acaa289c46bf5251f;p=gpl%2Fargeo-suite.git

diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocumentTextEditor.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocumentTextEditor.java
index aeafcd3..61c0120 100644
--- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocumentTextEditor.java
+++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocumentTextEditor.java
@@ -1,14 +1,12 @@
 package org.argeo.docbook.ui;
 
 import javax.jcr.Node;
-import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 
-import org.argeo.cms.text.TextSection;
 import org.argeo.cms.ui.CmsEditable;
 import org.argeo.cms.ui.util.CmsUiUtils;
-import org.argeo.jcr.Jcr;
-import org.argeo.jcr.JcrxType;
+import org.argeo.docbook.DbkUtils;
+import org.argeo.docbook.DbkType;
 import org.eclipse.swt.widgets.Composite;
 
 /** Text editor where sections and subsections can be managed by the user. */
@@ -17,15 +15,14 @@ public class DocumentTextEditor extends AbstractDbkViewer {
 
 	public DocumentTextEditor(Composite parent, int style, Node textNode, CmsEditable cmsEditable) {
 		super(new TextSection(parent, style, textNode), style, cmsEditable);
-		refresh();
+//		refresh();
 		getMainSection().setLayoutData(CmsUiUtils.fillWidth());
 	}
 
 	@Override
 	protected void initModel(Node textNode) throws RepositoryException {
 		if (isFlat()) {
-			textNode.addNode(DocBookNames.DBK_PARA, DocBookTypes.PARA).addNode(Jcr.JCR_XMLTEXT, JcrxType.JCRX_XMLTEXT)
-					.setProperty(Jcr.JCR_XMLCHARACTERS, "");
+			DbkUtils.addParagraph(textNode, "");
 		}
 //		else
 //			textNode.setProperty(DocBookNames.DBK_TITLE, textNode.getName());
@@ -33,8 +30,8 @@ public class DocumentTextEditor extends AbstractDbkViewer {
 
 	@Override
 	protected Boolean isModelInitialized(Node textNode) throws RepositoryException {
-		return textNode.hasProperty(Property.JCR_TITLE) || textNode.hasNode(DocBookNames.DBK_PARA)
-				|| (!isFlat() && textNode.hasNode(DocBookNames.DBK_SECTION));
+		return textNode.hasNode(DbkType.title.get()) || textNode.hasNode(DbkType.para.get())
+				|| (!isFlat() && textNode.hasNode(DbkType.section.get()));
 	}
 
 }