From 4bd6cf0556f597ee73c8f13df45019ccf9e418a6 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 25 Jan 2021 09:36:59 +0100 Subject: [PATCH] Refactor DocBook names. --- publishing/org.argeo.publishing.ui/bnd.bnd | 2 +- .../src/org/argeo/docbook/DbkUtils.java | 65 +++++---- .../argeo/docbook/{ui => }/DocBookNames.java | 12 +- .../src/org/argeo/docbook/DocBookType.java | 33 +++++ .../org/argeo/docbook/{ui => }/docbook.cnd | 0 .../argeo/docbook/ui/AbstractDbkViewer.java | 127 +++++++++++------- .../org/argeo/docbook/ui/DbkImageManager.java | 5 +- .../argeo/docbook/ui/DbkTextInterpreter.java | 8 +- .../org/argeo/docbook/ui/DocBookTypes.java | 15 --- .../org/argeo/docbook/ui/DocumentPage.java | 5 +- .../argeo/docbook/ui/DocumentTextEditor.java | 10 +- .../argeo/publishing/ui/PublishingApp.java | 4 +- 12 files changed, 180 insertions(+), 106 deletions(-) rename publishing/org.argeo.publishing.ui/src/org/argeo/docbook/{ui => }/DocBookNames.java (57%) create mode 100644 publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DocBookType.java rename publishing/org.argeo.publishing.ui/src/org/argeo/docbook/{ui => }/docbook.cnd (100%) delete mode 100644 publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocBookTypes.java diff --git a/publishing/org.argeo.publishing.ui/bnd.bnd b/publishing/org.argeo.publishing.ui/bnd.bnd index 03c44b6..60d985c 100644 --- a/publishing/org.argeo.publishing.ui/bnd.bnd +++ b/publishing/org.argeo.publishing.ui/bnd.bnd @@ -9,7 +9,7 @@ org.osgi.framework,\ * Provide-Capability:\ -cms.datamodel; name=docbook; cnd=/org/argeo/docbook/ui/docbook.cnd; abstract=true +cms.datamodel; name=docbook; cnd=/org/argeo/docbook/docbook.cnd; abstract=true Service-Component:\ OSGI-INF/fontsServlet.xml diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java index e153e86..8426a80 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java @@ -1,39 +1,60 @@ package org.argeo.docbook; +import static org.argeo.docbook.DocBookType.para; + import javax.jcr.Node; import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; -import javax.jcr.nodetype.NodeType; -import org.argeo.docbook.ui.DocBookNames; -import org.argeo.docbook.ui.DocBookTypes; -import org.argeo.entity.EntityNames; import org.argeo.entity.EntityType; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrException; -import org.argeo.jcr.JcrUtils; import org.argeo.jcr.JcrxApi; /** Utilities around DocBook. */ public class DbkUtils { - public static String getTitle(Node node) { - return JcrxApi.getXmlValue(node, DocBookTypes.TITLE); + /** Get or add a DocBook element. */ + public static Node getOrAddDbk(Node parent, DocBookType child) { + try { + if (!parent.hasNode(child.get())) { + return addDbk(parent, child); + } else { + return parent.getNode(child.get()); + } + } catch (RepositoryException e) { + throw new JcrException("Cannot get or add element " + child.get() + " to " + parent, e); + } } - public static void setTitle(Node node, String txt) { + /** Add a DocBook element to this node. */ + public static Node addDbk(Node parent, DocBookType child) { try { - Node titleNode = JcrUtils.getOrAdd(node, DocBookTypes.TITLE, DocBookTypes.TITLE); - JcrxApi.setXmlValue(node, titleNode, txt); + Node node = parent.addNode(child.get(), child.get()); + return node; } catch (RepositoryException e) { - throw new JcrException("Cannot add empty paragraph to " + node, e); + throw new JcrException("Cannot add element " + child.get() + " to " + parent, e); } } + /** Whether this DocBook element is of this type. */ + public static boolean isDbk(Node node, DocBookType type) { + return Jcr.getName(node).equals(type.get()); + } + + public static String getTitle(Node node) { + return JcrxApi.getXmlValue(node, DocBookType.title.get()); + } + + public static void setTitle(Node node, String txt) { + Node titleNode = getOrAddDbk(node, DocBookType.title); + JcrxApi.setXmlValue(node, titleNode, txt); + } + public static Node getMetadata(Node infoContainer) { try { - if (!infoContainer.hasNode(DocBookTypes.INFO)) + if (!infoContainer.hasNode(DocBookType.info.get())) return null; - Node info = infoContainer.getNode(DocBookTypes.INFO); + Node info = infoContainer.getNode(DocBookType.info.get()); if (!info.hasNode(EntityType.local.get())) return null; return info.getNode(EntityType.local.get()); @@ -58,33 +79,29 @@ public class DbkUtils { } public static Node addParagraph(Node node, String txt) { - try { - Node para = node.addNode(DocBookTypes.PARA, DocBookTypes.PARA); - JcrxApi.setXmlValue(node, para, txt); - return para; - } catch (RepositoryException e) { - throw new JcrException("Cannot add empty paragraph to " + node, e); - } + Node p = addDbk(node, para); + JcrxApi.setXmlValue(node, p, txt); + return p; } public static Node insertImageAfter(Node sibling) { try { // FIXME make it more robust - if (DocBookTypes.IMAGEDATA.equals(sibling.getName())) { + if (DocBookType.imagedata.get().equals(sibling.getName())) { sibling = sibling.getParent().getParent(); } Node parent = sibling.getParent(); - Node mediaNode = parent.addNode(DocBookTypes.MEDIAOBJECT, DocBookTypes.MEDIAOBJECT); + Node mediaNode = addDbk(parent, DocBookType.mediaobject); // TODO optimise? parent.orderBefore(mediaNode.getName() + "[" + mediaNode.getIndex() + "]", sibling.getName() + "[" + sibling.getIndex() + "]"); parent.orderBefore(sibling.getName() + "[" + sibling.getIndex() + "]", mediaNode.getName() + "[" + mediaNode.getIndex() + "]"); - Node imageNode = mediaNode.addNode(DocBookTypes.IMAGEOBJECT, DocBookTypes.IMAGEOBJECT); - Node imageDataNode = imageNode.addNode(DocBookTypes.IMAGEDATA, DocBookTypes.IMAGEDATA); + Node imageNode = addDbk(mediaNode, DocBookType.imageobject); + Node imageDataNode = addDbk(imageNode, DocBookType.imagedata); // Node infoNode = imageNode.addNode(DocBookTypes.INFO, DocBookTypes.INFO); // Node fileNode = JcrUtils.copyBytesAsFile(mediaFolder, EntityType.box.get(), new byte[0]); // fileNode.addMixin(EntityType.box.get()); diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocBookNames.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DocBookNames.java similarity index 57% rename from publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocBookNames.java rename to publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DocBookNames.java index 10fa7a4..febae9f 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocBookNames.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DocBookNames.java @@ -1,12 +1,12 @@ -package org.argeo.docbook.ui; +package org.argeo.docbook; public interface DocBookNames { // ELEMENTS - public final static String DBK_ARTICLE = "dbk:article"; - public final static String DBK_PARA = "dbk:para"; - public final static String DBK_TITLE = "dbk:title"; - public final static String DBK_SECTION = "dbk:section"; - public final static String DBK_MEDIAOBJECT = "dbk:mediaobject"; +// public final static String DBK_ARTICLE = "dbk:article"; +// public final static String DBK_PARA = "dbk:para"; +// public final static String DBK_TITLE = "dbk:title"; +// public final static String DBK_SECTION = "dbk:section"; +// public final static String DBK_MEDIAOBJECT = "dbk:mediaobject"; // ATTRIBUTES // public final static String JCR_XMLTEXT = "jcr:xmltext"; diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DocBookType.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DocBookType.java new file mode 100644 index 0000000..bb1db63 --- /dev/null +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DocBookType.java @@ -0,0 +1,33 @@ +package org.argeo.docbook; + +import org.argeo.entity.JcrName; + +/** Types related to DocBook. */ +public enum DocBookType implements JcrName { + book, article, section, + // + info, title, para, + // + mediaobject, imageobject, imagedata, + // + ; + + @Override + public String getPrefix() { + return prefix(); + } + + public static String prefix() { + return "dbk"; + } + + @Override + public String getNamespace() { + return namespace(); + } + + public static String namespace() { + return "http://docbook.org/ns/docbook"; + } + +} diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/docbook.cnd b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/docbook.cnd similarity index 100% rename from publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/docbook.cnd rename to publishing/org.argeo.publishing.ui/src/org/argeo/docbook/docbook.cnd diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java index c324756..5896d18 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java @@ -1,7 +1,14 @@ package org.argeo.docbook.ui; import static org.argeo.cms.ui.util.CmsUiUtils.fillWidth; - +import static org.argeo.docbook.DbkUtils.addDbk; +import static org.argeo.docbook.DbkUtils.isDbk; +import static org.argeo.docbook.DocBookType.para; + +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -13,7 +20,6 @@ import javax.jcr.Node; import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; import javax.jcr.Session; -import javax.jcr.nodetype.NodeType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -30,6 +36,9 @@ import org.argeo.cms.ui.viewers.Section; import org.argeo.cms.ui.viewers.SectionPart; import org.argeo.cms.ui.widgets.EditableText; import org.argeo.cms.ui.widgets.StyledControl; +import org.argeo.docbook.DbkUtils; +import org.argeo.docbook.DocBookNames; +import org.argeo.docbook.DocBookType; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrException; import org.argeo.jcr.JcrUtils; @@ -94,10 +103,10 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke CmsUiUtils.clear(section); Node node = section.getNode(); TextSection textSection = (TextSection) section; - if (node.hasNode(DocBookTypes.TITLE)) { + if (node.hasNode(DocBookType.title.get())) { if (section.getHeader() == null) section.createHeader(); - Node titleNode = node.getNode(DocBookTypes.TITLE); + Node titleNode = node.getNode(DocBookType.title.get()); DocBookSectionTitle title = newSectionTitle(textSection, titleNode); title.setLayoutData(CmsUiUtils.fillWidth()); updateContent(title); @@ -106,12 +115,13 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke for (NodeIterator ni = node.getNodes(); ni.hasNext();) { Node child = ni.nextNode(); SectionPart sectionPart = null; - if (child.isNodeType(DocBookTypes.MEDIAOBJECT)) { - if (child.hasNode(DocBookTypes.IMAGEOBJECT)) { - Node imageDataNode = child.getNode(DocBookTypes.IMAGEOBJECT).getNode(DocBookTypes.IMAGEDATA); + if (isDbk(child, DocBookType.mediaobject)) { + if (child.hasNode(DocBookType.imageobject.get())) { + Node imageDataNode = child.getNode(DocBookType.imageobject.get()) + .getNode(DocBookType.imagedata.get()); sectionPart = newImg(textSection, imageDataNode); } - } else if (child.isNodeType(DocBookTypes.PARA)) { + } else if (isDbk(child, para)) { sectionPart = newParagraph(textSection, child); } else { sectionPart = newSectionPart(textSection, child); @@ -124,9 +134,9 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke } // if (!flat) - for (NodeIterator ni = section.getNode().getNodes(DocBookNames.DBK_SECTION); ni.hasNext();) { + for (NodeIterator ni = section.getNode().getNodes(DocBookType.section.get()); ni.hasNext();) { Node child = ni.nextNode(); - if (child.isNodeType(DocBookTypes.SECTION)) { + if (isDbk(child, DocBookType.section)) { TextSection newSection = new TextSection(section, SWT.NONE, child); newSection.setLayoutData(CmsUiUtils.fillWidth()); refresh(newSection); @@ -189,12 +199,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke protected DocBookSectionTitle prepareSectionTitle(Section newSection, String titleText) throws RepositoryException { Node sectionNode = newSection.getNode(); - Node titleNode; - if (!sectionNode.hasNode(DocBookTypes.TITLE)) { - titleNode = sectionNode.addNode(DocBookTypes.TITLE, DocBookTypes.TITLE); - } else { - titleNode = sectionNode.getNode(DocBookTypes.TITLE); - } + Node titleNode = DbkUtils.getOrAddDbk(sectionNode, DocBookType.title); getTextInterpreter().write(titleNode, titleText); if (newSection.getHeader() == null) newSection.createHeader(); @@ -210,7 +215,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke if (part instanceof StyledControl && (sectionPart.getSection() instanceof TextSection)) { TextSection section = (TextSection) sectionPart.getSection(); StyledControl styledControl = (StyledControl) part; - if (partNode.isNodeType(DocBookTypes.PARA)) { + if (isDbk(partNode, para)) { String style = partNode.hasProperty(DocBookNames.DBK_ROLE) ? partNode.getProperty(DocBookNames.DBK_ROLE).getString() : section.getDefaultTextStyle(); @@ -261,7 +266,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke Node sectionNode = section.getNode(); Node currentParagraphN = currentParagraph.getNode(); for (int i = 1; i < lines.length; i++) { - Node newNode = sectionNode.addNode(DocBookNames.DBK_PARA, DocBookTypes.PARA); + Node newNode = addDbk(sectionNode, para); // newNode.addMixin(CmsTypes.CMS_STYLED); saveLine(newNode, lines[i]); // second node was create as last, if it is not the next @@ -356,7 +361,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke if (sectionPart instanceof DbkImg) { // FIXME make it more robust node = node.getParent().getParent(); - if (!DocBookNames.DBK_MEDIAOBJECT.equals(node.getName())) + if (!isDbk(node, DocBookType.mediaobject)) throw new IllegalArgumentException("Node " + node + " is not a media object."); } node.remove(); @@ -402,7 +407,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke // FIXME set content the DocBook way // firstNode.setProperty(CMS_CONTENT, first); - Node secondNode = sectionNode.addNode(DocBookNames.DBK_PARA, DocBookTypes.PARA); + Node secondNode = addDbk(sectionNode, para); // secondNode.addMixin(CmsTypes.CMS_STYLED); // second node was create as last, if it is not the next one, it @@ -434,11 +439,11 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke int caretPosition = text.getCaretPosition(); Section section = sectionTitle.getSection(); Node sectionNode = section.getNode(); - Node paragraphNode = sectionNode.addNode(DocBookNames.DBK_PARA, DocBookTypes.PARA); + Node paragraphNode = addDbk(sectionNode, para); // paragraphNode.addMixin(CmsTypes.CMS_STYLED); textInterpreter.write(paragraphNode, txt.substring(caretPosition)); - textInterpreter.write(sectionNode.getNode(DocBookTypes.TITLE), txt.substring(0, caretPosition)); + textInterpreter.write(sectionNode.getNode(DocBookType.title.get()), txt.substring(0, caretPosition)); sectionNode.orderBefore(p(paragraphNode.getIndex()), p(1)); persistChanges(sectionNode); @@ -482,7 +487,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke String txt = text.getText(); Node paragraphNode = paragraph.getNode(); Node sectionNode = paragraphNode.getParent(); - NodeIterator paragraphNodes = sectionNode.getNodes(DocBookNames.DBK_PARA); + NodeIterator paragraphNodes = sectionNode.getNodes(DocBookType.para.get()); long size = paragraphNodes.getSize(); if (paragraphNode.getIndex() == size) return;// do nothing @@ -514,19 +519,19 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke if (part instanceof Paragraph) { // FIXME adapt to DocBook - Node newNode = sectionNode.addNode(DocBookNames.DBK_MEDIAOBJECT, NodeType.NT_FILE); - newNode.addNode(Node.JCR_CONTENT, NodeType.NT_RESOURCE); - JcrUtils.copyBytesAsFile(sectionNode, p(newNode.getIndex()), new byte[0]); - if (partIndex < newNode.getIndex() - 1) { - // was not last - sectionNode.orderBefore(p(newNode.getIndex()), p(partIndex - 1)); - } - // sectionNode.orderBefore(p(partNode.getIndex()), - // p(newNode.getIndex())); - persistChanges(sectionNode); - DbkImg img = newImg((TextSection) section, newNode); - edit(img, null); - layout(img.getControl()); +// Node newNode = sectionNode.addNode(DocBookNames.DBK_MEDIAOBJECT, NodeType.NT_FILE); +// newNode.addNode(Node.JCR_CONTENT, NodeType.NT_RESOURCE); +// JcrUtils.copyBytesAsFile(sectionNode, p(newNode.getIndex()), new byte[0]); +// if (partIndex < newNode.getIndex() - 1) { +// // was not last +// sectionNode.orderBefore(p(newNode.getIndex()), p(partIndex - 1)); +// } +// // sectionNode.orderBefore(p(partNode.getIndex()), +// // p(newNode.getIndex())); +// persistChanges(sectionNode); +// DbkImg img = newImg((TextSection) section, newNode); +// edit(img, null); +// layout(img.getControl()); } else if (part instanceof DbkImg) { if (getEdited() == part) return; @@ -553,12 +558,12 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke Node sectionNode = section.getNode(); // main title if (section == mainSection && section instanceof TextSection && paragraphNode.getIndex() == 1 - && !sectionNode.hasNode(DocBookTypes.TITLE)) { + && !sectionNode.hasNode(DocBookType.title.get())) { DocBookSectionTitle sectionTitle = prepareSectionTitle(section, txt); edit(sectionTitle, 0); return; } - Node newSectionNode = sectionNode.addNode(DocBookNames.DBK_SECTION, DocBookTypes.SECTION); + Node newSectionNode = addDbk(sectionNode, DocBookType.section); // newSectionNode.addMixin(NodeType.MIX_TITLE); sectionNode.orderBefore(h(newSectionNode.getIndex()), h(1)); @@ -568,13 +573,14 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke while (sectionNode.hasNode(p(paragraphIndex + 1))) { Node parag = sectionNode.getNode(p(paragraphIndex + 1)); sectionNode.getSession().move(sectionPath + '/' + p(paragraphIndex + 1), - newSectionPath + '/' + DocBookNames.DBK_PARA); + newSectionPath + '/' + DocBookType.para.get()); SectionPart sp = section.getSectionPart(parag.getIdentifier()); if (sp instanceof Control) ((Control) sp).dispose(); } // create title - Node titleNode = newSectionNode.addNode(DocBookTypes.TITLE, DocBookTypes.TITLE); + Node titleNode = DbkUtils.addDbk(newSectionNode, DocBookType.title); + // newSectionNode.addNode(DocBookType.TITLE, DocBookType.TITLE); getTextInterpreter().write(titleNode, txt); TextSection newSection = new TextSection(section, section.getStyle(), newSectionNode); @@ -600,7 +606,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke if (sectionN.getIndex() == 1) return;// cannot deepen first section Node previousSectionN = parentSectionN.getNode(h(sectionN.getIndex() - 1)); - NodeIterator subSections = previousSectionN.getNodes(DocBookNames.DBK_SECTION); + NodeIterator subSections = previousSectionN.getNodes(DocBookType.section.get()); int subsectionsCount = (int) subSections.getSize(); previousSectionN.getSession().move(sectionN.getPath(), previousSectionN.getPath() + "/" + h(subsectionsCount + 1)); @@ -639,23 +645,23 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke mergedSection = lst.get(sectionNode.getIndex() - 1); } Node mergedNode = mergedSection.getNode(); - boolean mergedHasSubSections = mergedNode.hasNode(DocBookNames.DBK_SECTION); + boolean mergedHasSubSections = mergedNode.hasNode(DocBookType.section.get()); // title as paragraph - Node newParagrapheNode = mergedNode.addNode(DocBookNames.DBK_PARA, DocBookTypes.PARA); + Node newParagrapheNode = addDbk(mergedNode, para); // newParagrapheNode.addMixin(CmsTypes.CMS_STYLED); if (mergedHasSubSections) mergedNode.orderBefore(p(newParagrapheNode.getIndex()), h(1)); - String txt = getTextInterpreter().read(sectionNode.getNode(DocBookTypes.TITLE)); + String txt = getTextInterpreter().read(sectionNode.getNode(DocBookType.title.get())); getTextInterpreter().write(newParagrapheNode, txt); // move - NodeIterator paragraphs = sectionNode.getNodes(DocBookNames.DBK_PARA); + NodeIterator paragraphs = sectionNode.getNodes(para.get()); while (paragraphs.hasNext()) { Node p = paragraphs.nextNode(); SectionPart sp = section.getSectionPart(p.getIdentifier()); if (sp instanceof Control) ((Control) sp).dispose(); - mergedNode.getSession().move(p.getPath(), mergedNode.getPath() + '/' + DocBookNames.DBK_PARA); + mergedNode.getSession().move(p.getPath(), mergedNode.getPath() + '/' + para.get()); if (mergedHasSubSections) mergedNode.orderBefore(p(p.getIndex()), h(1)); } @@ -665,7 +671,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke while (subsections.hasNext()) { Section subsection = subsections.next(); Node s = subsection.getNode(); - mergedNode.getSession().move(s.getPath(), mergedNode.getPath() + '/' + DocBookNames.DBK_SECTION); + mergedNode.getSession().move(s.getPath(), mergedNode.getPath() + '/' + DocBookType.section.get()); subsection.dispose(); } @@ -723,13 +729,13 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke // UTILITIES protected String p(Integer index) { StringBuilder sb = new StringBuilder(6); - sb.append(DocBookNames.DBK_PARA).append('[').append(index).append(']'); + sb.append(para.get()).append('[').append(index).append(']'); return sb.toString(); } protected String h(Integer index) { StringBuilder sb = new StringBuilder(5); - sb.append(DocBookNames.DBK_SECTION).append('[').append(index).append(']'); + sb.append(DocBookType.section.get()).append('[').append(index).append(']'); return sb.toString(); } @@ -865,6 +871,29 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke return new ArrayList<>(); } + public void export(Path directory, String fileName) { + Path filePath = directory.resolve(fileName); + try { + Files.createDirectories(directory); + try (OutputStream out = Files.newOutputStream(filePath)) { + exportXml(out); + } + if (log.isDebugEnabled()) + log.debug("DocBook " + getMainSection().getNode() + " exported to " + filePath.toAbsolutePath()); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public void exportXml(OutputStream out) throws IOException { + Node node = getMainSection().getNode(); + try { + node.getSession().exportDocumentView(node.getPath(), out, false, false); + } catch (RepositoryException e) { + throw new JcrException("Cannot export " + node + " to XML", e); + } + } + // FILE UPLOAD LISTENER private class FUL implements FileUploadListener { public void uploadProgress(FileUploadEvent event) { diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkImageManager.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkImageManager.java index 2b57b4b..1e3b070 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkImageManager.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkImageManager.java @@ -20,6 +20,9 @@ import javax.jcr.nodetype.NodeType; import org.argeo.cms.ui.CmsImageManager; import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.cms.ui.util.DefaultImageManager; +import org.argeo.docbook.DbkUtils; +import org.argeo.docbook.DocBookNames; +import org.argeo.docbook.DocBookType; import org.argeo.entity.EntityNames; import org.argeo.entity.EntityType; import org.argeo.jcr.JcrException; @@ -38,7 +41,7 @@ public class DbkImageManager extends DefaultImageManager { @Override public Binary getImageBinary(Node node) throws RepositoryException { Node fileNode = null; - if (node.getName().equals(DocBookTypes.IMAGEDATA)) { + if (DbkUtils.isDbk(node, DocBookType.imagedata)) { fileNode = getFileNode(node); } if (node.isNodeType(NT_FILE)) { 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 diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocBookTypes.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocBookTypes.java deleted file mode 100644 index aa37c16..0000000 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocBookTypes.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.argeo.docbook.ui; - -public interface DocBookTypes { - public final static String BOOK = "dbk:book"; - public final static String ARTICLE = "dbk:article"; - public final static String TITLE = "dbk:title"; - public final static String INFO = "dbk:info"; - public final static String SECTION = "dbk:section"; - public final static String PARA = "dbk:para"; -// public final static String XMLTEXT = "dbk:xmltext"; - - public final static String MEDIAOBJECT = "dbk:mediaobject"; - public final static String IMAGEOBJECT = "dbk:imageobject"; - public final static String IMAGEDATA = "dbk:imagedata"; -} diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocumentPage.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocumentPage.java index 6cb0e29..ab491fb 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocumentPage.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DocumentPage.java @@ -13,6 +13,7 @@ import org.argeo.cms.ui.util.CmsLink; import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.cms.ui.viewers.JcrVersionCmsEditable; import org.argeo.cms.ui.widgets.ScrolledPage; +import org.argeo.docbook.DocBookType; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -32,7 +33,7 @@ public class DocumentPage implements CmsUiProvider { GridData textGd = CmsUiUtils.fillAll(); page.setLayoutData(textGd); - if (context.isNodeType(DocBookTypes.ARTICLE)) { + if (context.isNodeType(DocBookType.article.get())) { CmsEditable cmsEditable = new JcrVersionCmsEditable(context); if (cmsEditable.canEdit()) new TextEditorHeader(cmsEditable, parent, SWT.NONE).setLayoutData(CmsUiUtils.fillWidth()); @@ -52,7 +53,7 @@ public class DocumentPage implements CmsUiProvider { } for (NodeIterator ni = context.getNodes(); ni.hasNext();) { Node textNode = ni.nextNode(); - if (textNode.isNodeType(DocBookTypes.ARTICLE) && !textNode.getName().equals(WWW)) + if (textNode.isNodeType(DocBookType.article.get()) && !textNode.getName().equals(WWW)) new CmsLink(textNode.getName(), textNode.getPath()).createUi(parent, textNode); } } 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 bdd72d5..6bb8d43 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 @@ -6,6 +6,9 @@ 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; @@ -23,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()); @@ -32,8 +34,8 @@ public class DocumentTextEditor extends AbstractDbkViewer { @Override protected Boolean isModelInitialized(Node textNode) throws RepositoryException { - return textNode.hasNode(DocBookTypes.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())); } } diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java b/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java index a1f0873..8c0bde3 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java @@ -17,7 +17,7 @@ import org.argeo.api.NodeUtils; import org.argeo.cms.ui.AbstractCmsApp; import org.argeo.cms.ui.CmsApp; import org.argeo.cms.ui.CmsUiProvider; -import org.argeo.docbook.ui.DocBookTypes; +import org.argeo.docbook.DocBookType; import org.argeo.docbook.ui.DocumentPage; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrUtils; @@ -70,7 +70,7 @@ public class PublishingApp extends AbstractCmsApp { parent.setLayout(new GridLayout()); Node indexNode; try { - indexNode = JcrUtils.getOrAdd(Jcr.getRootNode(adminSession), DocumentPage.WWW, DocBookTypes.ARTICLE); + indexNode = JcrUtils.getOrAdd(Jcr.getRootNode(adminSession), DocumentPage.WWW, DocBookType.article.get()); adminSession.save(); } catch (RepositoryException e) { throw new IllegalStateException(e); -- 2.30.2