From 70010c4afc5799622fcad5b075740d94da074798 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 25 Jan 2021 09:45:31 +0100 Subject: [PATCH] Refactor DocBook attributes. --- .../src/org/argeo/docbook/DbkAttr.java | 10 ++++ .../{DocBookType.java => DbkType.java} | 4 +- .../src/org/argeo/docbook/DbkUtils.java | 26 ++++----- .../src/org/argeo/docbook/DocBookNames.java | 20 ------- .../argeo/docbook/ui/AbstractDbkViewer.java | 57 +++++++++---------- .../org/argeo/docbook/ui/DbkImageManager.java | 16 +++--- .../argeo/docbook/ui/DbkTextInterpreter.java | 4 +- .../org/argeo/docbook/ui/DocumentPage.java | 6 +- .../argeo/docbook/ui/DocumentTextEditor.java | 9 +-- .../argeo/publishing/ui/PublishingApp.java | 4 +- 10 files changed, 71 insertions(+), 85 deletions(-) create mode 100644 publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkAttr.java rename publishing/org.argeo.publishing.ui/src/org/argeo/docbook/{DocBookType.java => DbkType.java} (84%) delete mode 100644 publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DocBookNames.java diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkAttr.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkAttr.java new file mode 100644 index 0000000..c8b7b2d --- /dev/null +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkAttr.java @@ -0,0 +1,10 @@ +package org.argeo.docbook; + +/** Supported DocBook attributes. */ +public enum DbkAttr { + role, + // + fileref, contentwidth, contentdepth + // + ; +} diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DocBookType.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkType.java similarity index 84% rename from publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DocBookType.java rename to publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkType.java index bb1db63..423add3 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DocBookType.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkType.java @@ -2,8 +2,8 @@ package org.argeo.docbook; import org.argeo.entity.JcrName; -/** Types related to DocBook. */ -public enum DocBookType implements JcrName { +/** Supported DocBook elements */ +public enum DbkType implements JcrName { book, article, section, // info, title, para, 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 8426a80..29e29cd 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,6 +1,6 @@ package org.argeo.docbook; -import static org.argeo.docbook.DocBookType.para; +import static org.argeo.docbook.DbkType.para; import javax.jcr.Node; import javax.jcr.NodeIterator; @@ -14,7 +14,7 @@ import org.argeo.jcr.JcrxApi; /** Utilities around DocBook. */ public class DbkUtils { /** Get or add a DocBook element. */ - public static Node getOrAddDbk(Node parent, DocBookType child) { + public static Node getOrAddDbk(Node parent, DbkType child) { try { if (!parent.hasNode(child.get())) { return addDbk(parent, child); @@ -27,7 +27,7 @@ public class DbkUtils { } /** Add a DocBook element to this node. */ - public static Node addDbk(Node parent, DocBookType child) { + public static Node addDbk(Node parent, DbkType child) { try { Node node = parent.addNode(child.get(), child.get()); return node; @@ -37,24 +37,24 @@ public class DbkUtils { } /** Whether this DocBook element is of this type. */ - public static boolean isDbk(Node node, DocBookType type) { + public static boolean isDbk(Node node, DbkType type) { return Jcr.getName(node).equals(type.get()); } public static String getTitle(Node node) { - return JcrxApi.getXmlValue(node, DocBookType.title.get()); + return JcrxApi.getXmlValue(node, DbkType.title.get()); } public static void setTitle(Node node, String txt) { - Node titleNode = getOrAddDbk(node, DocBookType.title); + Node titleNode = getOrAddDbk(node, DbkType.title); JcrxApi.setXmlValue(node, titleNode, txt); } public static Node getMetadata(Node infoContainer) { try { - if (!infoContainer.hasNode(DocBookType.info.get())) + if (!infoContainer.hasNode(DbkType.info.get())) return null; - Node info = infoContainer.getNode(DocBookType.info.get()); + Node info = infoContainer.getNode(DbkType.info.get()); if (!info.hasNode(EntityType.local.get())) return null; return info.getNode(EntityType.local.get()); @@ -68,7 +68,7 @@ public class DbkUtils { NodeIterator baseSections = parent.getNodes(); while (baseSections.hasNext()) { Node n = baseSections.nextNode(); - String r = Jcr.get(n, DocBookNames.DBK_ROLE); + String r = Jcr.get(n, DbkAttr.role.name()); if (r != null && r.equals(role)) return n; } @@ -88,20 +88,20 @@ public class DbkUtils { try { // FIXME make it more robust - if (DocBookType.imagedata.get().equals(sibling.getName())) { + if (DbkType.imagedata.get().equals(sibling.getName())) { sibling = sibling.getParent().getParent(); } Node parent = sibling.getParent(); - Node mediaNode = addDbk(parent, DocBookType.mediaobject); + Node mediaNode = addDbk(parent, DbkType.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 = addDbk(mediaNode, DocBookType.imageobject); - Node imageDataNode = addDbk(imageNode, DocBookType.imagedata); + Node imageNode = addDbk(mediaNode, DbkType.imageobject); + Node imageDataNode = addDbk(imageNode, DbkType.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/DocBookNames.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DocBookNames.java deleted file mode 100644 index febae9f..0000000 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DocBookNames.java +++ /dev/null @@ -1,20 +0,0 @@ -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"; - - // ATTRIBUTES -// public final static String JCR_XMLTEXT = "jcr:xmltext"; -// public final static String JCR_XMLCHARACTERS = "jcr:xmlcharacters"; - - public final static String DBK_ROLE = "dbk:role"; - public final static String DBK_FILEREF = "dbk:fileref"; - public final static String DBK_CONTENTWIDTH = "dbk:contentwidth"; - public final static String DBK_CONTENTDEPTH = "dbk:contentdepth"; - -} 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 5896d18..a4755c7 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,9 +1,9 @@ package org.argeo.docbook.ui; import static org.argeo.cms.ui.util.CmsUiUtils.fillWidth; +import static org.argeo.docbook.DbkType.para; 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; @@ -36,9 +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.DbkAttr; +import org.argeo.docbook.DbkType; 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; @@ -103,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(DocBookType.title.get())) { + if (node.hasNode(DbkType.title.get())) { if (section.getHeader() == null) section.createHeader(); - Node titleNode = node.getNode(DocBookType.title.get()); + Node titleNode = node.getNode(DbkType.title.get()); DocBookSectionTitle title = newSectionTitle(textSection, titleNode); title.setLayoutData(CmsUiUtils.fillWidth()); updateContent(title); @@ -115,10 +115,9 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke for (NodeIterator ni = node.getNodes(); ni.hasNext();) { Node child = ni.nextNode(); SectionPart sectionPart = null; - if (isDbk(child, DocBookType.mediaobject)) { - if (child.hasNode(DocBookType.imageobject.get())) { - Node imageDataNode = child.getNode(DocBookType.imageobject.get()) - .getNode(DocBookType.imagedata.get()); + if (isDbk(child, DbkType.mediaobject)) { + if (child.hasNode(DbkType.imageobject.get())) { + Node imageDataNode = child.getNode(DbkType.imageobject.get()).getNode(DbkType.imagedata.get()); sectionPart = newImg(textSection, imageDataNode); } } else if (isDbk(child, para)) { @@ -134,9 +133,9 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke } // if (!flat) - for (NodeIterator ni = section.getNode().getNodes(DocBookType.section.get()); ni.hasNext();) { + for (NodeIterator ni = section.getNode().getNodes(DbkType.section.get()); ni.hasNext();) { Node child = ni.nextNode(); - if (isDbk(child, DocBookType.section)) { + if (isDbk(child, DbkType.section)) { TextSection newSection = new TextSection(section, SWT.NONE, child); newSection.setLayoutData(CmsUiUtils.fillWidth()); refresh(newSection); @@ -199,7 +198,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke protected DocBookSectionTitle prepareSectionTitle(Section newSection, String titleText) throws RepositoryException { Node sectionNode = newSection.getNode(); - Node titleNode = DbkUtils.getOrAddDbk(sectionNode, DocBookType.title); + Node titleNode = DbkUtils.getOrAddDbk(sectionNode, DbkType.title); getTextInterpreter().write(titleNode, titleText); if (newSection.getHeader() == null) newSection.createHeader(); @@ -216,8 +215,8 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke TextSection section = (TextSection) sectionPart.getSection(); StyledControl styledControl = (StyledControl) part; if (isDbk(partNode, para)) { - String style = partNode.hasProperty(DocBookNames.DBK_ROLE) - ? partNode.getProperty(DocBookNames.DBK_ROLE).getString() + String style = partNode.hasProperty(DbkAttr.role.name()) + ? partNode.getProperty(DbkAttr.role.name()).getString() : section.getDefaultTextStyle(); styledControl.setStyle(style); } @@ -332,10 +331,10 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke try { Node paragraphNode = paragraph.getNode(); if (style == null) {// default - if (paragraphNode.hasProperty(DocBookNames.DBK_ROLE)) - paragraphNode.getProperty(DocBookNames.DBK_ROLE).remove(); + if (paragraphNode.hasProperty(DbkAttr.role.name())) + paragraphNode.getProperty(DbkAttr.role.name()).remove(); } else { - paragraphNode.setProperty(DocBookNames.DBK_ROLE, style); + paragraphNode.setProperty(DbkAttr.role.name(), style); } persistChanges(paragraphNode); updateContent(paragraph); @@ -361,7 +360,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke if (sectionPart instanceof DbkImg) { // FIXME make it more robust node = node.getParent().getParent(); - if (!isDbk(node, DocBookType.mediaobject)) + if (!isDbk(node, DbkType.mediaobject)) throw new IllegalArgumentException("Node " + node + " is not a media object."); } node.remove(); @@ -443,7 +442,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke // paragraphNode.addMixin(CmsTypes.CMS_STYLED); textInterpreter.write(paragraphNode, txt.substring(caretPosition)); - textInterpreter.write(sectionNode.getNode(DocBookType.title.get()), txt.substring(0, caretPosition)); + textInterpreter.write(sectionNode.getNode(DbkType.title.get()), txt.substring(0, caretPosition)); sectionNode.orderBefore(p(paragraphNode.getIndex()), p(1)); persistChanges(sectionNode); @@ -487,7 +486,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(DocBookType.para.get()); + NodeIterator paragraphNodes = sectionNode.getNodes(DbkType.para.get()); long size = paragraphNodes.getSize(); if (paragraphNode.getIndex() == size) return;// do nothing @@ -558,12 +557,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(DocBookType.title.get())) { + && !sectionNode.hasNode(DbkType.title.get())) { DocBookSectionTitle sectionTitle = prepareSectionTitle(section, txt); edit(sectionTitle, 0); return; } - Node newSectionNode = addDbk(sectionNode, DocBookType.section); + Node newSectionNode = addDbk(sectionNode, DbkType.section); // newSectionNode.addMixin(NodeType.MIX_TITLE); sectionNode.orderBefore(h(newSectionNode.getIndex()), h(1)); @@ -573,13 +572,13 @@ 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 + '/' + DocBookType.para.get()); + newSectionPath + '/' + DbkType.para.get()); SectionPart sp = section.getSectionPart(parag.getIdentifier()); if (sp instanceof Control) ((Control) sp).dispose(); } // create title - Node titleNode = DbkUtils.addDbk(newSectionNode, DocBookType.title); + Node titleNode = DbkUtils.addDbk(newSectionNode, DbkType.title); // newSectionNode.addNode(DocBookType.TITLE, DocBookType.TITLE); getTextInterpreter().write(titleNode, txt); @@ -606,7 +605,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(DocBookType.section.get()); + NodeIterator subSections = previousSectionN.getNodes(DbkType.section.get()); int subsectionsCount = (int) subSections.getSize(); previousSectionN.getSession().move(sectionN.getPath(), previousSectionN.getPath() + "/" + h(subsectionsCount + 1)); @@ -645,14 +644,14 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke mergedSection = lst.get(sectionNode.getIndex() - 1); } Node mergedNode = mergedSection.getNode(); - boolean mergedHasSubSections = mergedNode.hasNode(DocBookType.section.get()); + boolean mergedHasSubSections = mergedNode.hasNode(DbkType.section.get()); // title as paragraph 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(DocBookType.title.get())); + String txt = getTextInterpreter().read(sectionNode.getNode(DbkType.title.get())); getTextInterpreter().write(newParagrapheNode, txt); // move NodeIterator paragraphs = sectionNode.getNodes(para.get()); @@ -671,7 +670,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() + '/' + DocBookType.section.get()); + mergedNode.getSession().move(s.getPath(), mergedNode.getPath() + '/' + DbkType.section.get()); subsection.dispose(); } @@ -735,7 +734,7 @@ public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke protected String h(Integer index) { StringBuilder sb = new StringBuilder(5); - sb.append(DocBookType.section.get()).append('[').append(index).append(']'); + sb.append(DbkType.section.get()).append('[').append(index).append(']'); return sb.toString(); } 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 1e3b070..8ff17b8 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 @@ -21,8 +21,8 @@ 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.docbook.DbkAttr; +import org.argeo.docbook.DbkType; import org.argeo.entity.EntityNames; import org.argeo.entity.EntityType; import org.argeo.jcr.JcrException; @@ -41,7 +41,7 @@ public class DbkImageManager extends DefaultImageManager { @Override public Binary getImageBinary(Node node) throws RepositoryException { Node fileNode = null; - if (DbkUtils.isDbk(node, DocBookType.imagedata)) { + if (DbkUtils.isDbk(node, DbkType.imagedata)) { fileNode = getFileNode(node); } if (node.isNodeType(NT_FILE)) { @@ -88,15 +88,15 @@ public class DbkImageManager extends DefaultImageManager { updateSize(fileNode, id); String filePath = fileNode.getPath(); String relPath = filePath.substring(baseFolder.getPath().length() + 1); - context.setProperty(DocBookNames.DBK_FILEREF, relPath); + context.setProperty(DbkAttr.fileref.name(), relPath); } @Override public String getImageUrl(Node imageDataNode) throws RepositoryException { // TODO factorise String fileref = null; - if (imageDataNode.hasProperty(DocBookNames.DBK_FILEREF)) - fileref = imageDataNode.getProperty(DocBookNames.DBK_FILEREF).getString(); + if (imageDataNode.hasProperty(DbkAttr.fileref.name())) + fileref = imageDataNode.getProperty(DbkAttr.fileref.name()).getString(); if (fileref == null) return null; URI fileUri; @@ -116,8 +116,8 @@ public class DbkImageManager extends DefaultImageManager { protected Node getFileNode(Node imageDataNode) throws RepositoryException { // FIXME make URL use case more robust String fileref = null; - if (imageDataNode.hasProperty(DocBookNames.DBK_FILEREF)) - fileref = imageDataNode.getProperty(DocBookNames.DBK_FILEREF).getString(); + if (imageDataNode.hasProperty(DbkAttr.fileref.name())) + fileref = imageDataNode.getProperty(DbkAttr.fileref.name()).getString(); if (fileref == null) return null; Node fileNode; 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 f5ab997..2717a38 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,8 +1,8 @@ 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 static org.argeo.docbook.DbkType.para; +import static org.argeo.docbook.DbkType.title; import java.io.IOException; import java.io.StringReader; 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 ab491fb..8ba6085 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,7 +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.argeo.docbook.DbkType; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -33,7 +33,7 @@ public class DocumentPage implements CmsUiProvider { GridData textGd = CmsUiUtils.fillAll(); page.setLayoutData(textGd); - if (context.isNodeType(DocBookType.article.get())) { + if (context.isNodeType(DbkType.article.get())) { CmsEditable cmsEditable = new JcrVersionCmsEditable(context); if (cmsEditable.canEdit()) new TextEditorHeader(cmsEditable, parent, SWT.NONE).setLayoutData(CmsUiUtils.fillWidth()); @@ -53,7 +53,7 @@ public class DocumentPage implements CmsUiProvider { } for (NodeIterator ni = context.getNodes(); ni.hasNext();) { Node textNode = ni.nextNode(); - if (textNode.isNodeType(DocBookType.article.get()) && !textNode.getName().equals(WWW)) + if (textNode.isNodeType(DbkType.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 6bb8d43..bac3fc3 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 @@ -7,10 +7,7 @@ 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.argeo.docbook.DbkType; import org.eclipse.swt.widgets.Composite; /** Text editor where sections and subsections can be managed by the user. */ @@ -34,8 +31,8 @@ public class DocumentTextEditor extends AbstractDbkViewer { @Override protected Boolean isModelInitialized(Node textNode) throws RepositoryException { - return textNode.hasNode(DocBookType.title.get()) || textNode.hasNode(DocBookType.para.get()) - || (!isFlat() && textNode.hasNode(DocBookType.section.get())); + return textNode.hasNode(DbkType.title.get()) || textNode.hasNode(DbkType.para.get()) + || (!isFlat() && textNode.hasNode(DbkType.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 8c0bde3..f527d5b 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.DocBookType; +import org.argeo.docbook.DbkType; 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, DocBookType.article.get()); + indexNode = JcrUtils.getOrAdd(Jcr.getRootNode(adminSession), DocumentPage.WWW, DbkType.article.get()); adminSession.save(); } catch (RepositoryException e) { throw new IllegalStateException(e); -- 2.30.2