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%2FDbkImageManager.java;h=8ff17b8676281961916e68aa672e0dd38f8b427b;hp=1e3b070364c587fbacf6a66d4cfd1e880cc06e32;hb=70010c4afc5799622fcad5b075740d94da074798;hpb=4bd6cf0556f597ee73c8f13df45019ccf9e418a6

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;