X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=publishing%2Forg.argeo.publishing.ui%2Fsrc%2Forg%2Fargeo%2Fdocbook%2Fui%2FDbkTextInterpreter.java;h=f5ab9975dcf2b59433f61eed1b6dd9350762756a;hp=25056efb7bd5e03b65e43431565583ba56893f54;hb=4bd6cf0556f597ee73c8f13df45019ccf9e418a6;hpb=f709e4a3ae06e51f767eee8152b393eb1df97df4 diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java index 25056ef..f5ab997 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java @@ -1,5 +1,9 @@ package org.argeo.docbook.ui; +import static org.argeo.docbook.DbkUtils.isDbk; +import static org.argeo.docbook.DocBookType.para; +import static org.argeo.docbook.DocBookType.title; + import java.io.IOException; import java.io.StringReader; import java.util.List; @@ -23,7 +27,7 @@ public class DbkTextInterpreter implements TextInterpreter { try { if (item instanceof Node) { Node node = (Node) item; - if (node.isNodeType(DocBookTypes.PARA) || node.isNodeType(DocBookTypes.TITLE)) { + if (isDbk(node, para) || isDbk(node, title)) { String raw = convertToStorage(node, content); validateBeforeStoring(raw); Node jcrText; @@ -61,7 +65,7 @@ public class DbkTextInterpreter implements TextInterpreter { item.getSession().refresh(true); if (item instanceof Node) { Node node = (Node) item; - if (node.isNodeType(DocBookTypes.PARA) || node.isNodeType(DocBookTypes.TITLE)) { + if (isDbk(node, para) || isDbk(node, title)) { Node jcrText = node.getNode(Jcr.JCR_XMLTEXT); String txt = jcrText.getProperty(Jcr.JCR_XMLCHARACTERS).getString(); // TODO make it more robust