Refactor DocBook names.

[gpl/argeo-suite.git] / publishing / org.argeo.publishing.ui / src / org / argeo / docbook / ui / DocumentTextEditor.java

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 aeafcd3466557014c529d84fd8a6494c51cdf1e8..6bb8d438516a055790380b8bff42028827958cb3 100644 (file)
--- 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,12 +1,14 @@
 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.docbook.DbkUtils;
+import org.argeo.docbook.DocBookNames;
+import org.argeo.docbook.DocBookType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrxType;
 import org.eclipse.swt.widgets.Composite;
@@ -24,8 +26,7 @@ public class DocumentTextEditor extends AbstractDbkViewer {
        @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 +34,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(DocBookType.title.get()) || textNode.hasNode(DocBookType.para.get())
+                               || (!isFlat() && textNode.hasNode(DocBookType.section.get()));
        }
 
 }