projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor DocBook names.
[gpl/argeo-suite.git]
/
publishing
/
org.argeo.publishing.ui
/
src
/
org
/
argeo
/
docbook
/
ui
/
DbkTextInterpreter.java
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 25056efb7bd5e03b65e43431565583ba56893f54..f5ab9975dcf2b59433f61eed1b6dd9350762756a 100644
(file)
--- 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;
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;
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;
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;
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;
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
Node jcrText = node.getNode(Jcr.JCR_XMLTEXT);
String txt = jcrText.getProperty(Jcr.JCR_XMLCHARACTERS).getString();
// TODO make it more robust