From 6e4fa7cda82b1c2601ee693127e9b14f135141ff Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 25 Jun 2023 10:38:18 +0200
Subject: [PATCH] Adapt to changes in Argeo Commons

---
 org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContent.java | 4 ++--
 .../src/org/argeo/cms/ui/forms/FormPageViewer.java          | 2 +-
 .../src/org/argeo/cms/ui/util/DefaultImageManager.java      | 6 ++----
 .../src/org/argeo/cms/ui/widgets/EditableImage.java         | 2 +-
 .../src/org/argeo/cms/ui/widgets/Img.java                   | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContent.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContent.java
index da38c96..9e662ec 100644
--- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContent.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContent.java
@@ -168,7 +168,7 @@ public class JcrContent extends AbstractContent {
 		try {
 			// Note: it is important to to use the default way (recursing through parents),
 			// since the session may not have access to parent nodes
-			return ContentUtils.ROOT_SLASH + jcrWorkspace + getJcrNode().getPath();
+			return Content.ROOT_PATH + jcrWorkspace + getJcrNode().getPath();
 		} catch (RepositoryException e) {
 			throw new JcrException("Cannot get depth of " + getJcrNode(), e);
 		}
@@ -552,7 +552,7 @@ public class JcrContent extends AbstractContent {
 			if (contentSession == null)
 				throw new IllegalArgumentException(
 						"Cannot adapt " + node + " to content, because it was not loaded from a content session");
-			return contentSession.get(ContentUtils.SLASH + CmsConstants.SYS_WORKSPACE + node.getPath());
+			return contentSession.get(Content.ROOT_PATH + CmsConstants.SYS_WORKSPACE + node.getPath());
 		} catch (RepositoryException e) {
 			throw new JcrException("Cannot adapt " + node + " to a content", e);
 		}
diff --git a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java
index 136fff7..eaeab95 100644
--- a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java
+++ b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormPageViewer.java
@@ -188,7 +188,7 @@ public class FormPageViewer extends AbstractPageViewer {
 			// use control AFTER setting style, since it may have been reset
 			if (part instanceof EditableImage) {
 				EditableImage editableImage = (EditableImage) part;
-				imageManager().load(partNode, part.getControl(), editableImage.getPreferredImageSize());
+				imageManager().load(partNode, part.getControl(), editableImage.getPreferredImageSize(), null);
 			}
 		}
 	}
diff --git a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java
index b431fc3..4056429 100644
--- a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java
+++ b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/util/DefaultImageManager.java
@@ -24,9 +24,7 @@ import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.service.ResourceManager;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.widgets.Display;
 
 /** Manages only public images so far. */
 public class DefaultImageManager extends AbstractSwtImageManager<Node> {
@@ -62,14 +60,14 @@ public class DefaultImageManager extends AbstractSwtImageManager<Node> {
 		}
 	}
 
-	public Image getSwtImage(Node node) {
+	public ImageData getSwtImageData(Node node) {
 		InputStream inputStream = null;
 		Binary binary = getImageBinary(node);
 		if (binary == null)
 			return null;
 		try {
 			inputStream = binary.getStream();
-			return new Image(Display.getCurrent(), inputStream);
+			return new ImageData(inputStream);
 		} catch (RepositoryException e) {
 			throw new JcrException(e);
 		} finally {
diff --git a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/EditableImage.java b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/EditableImage.java
index 95d9e8e..85ccec9 100644
--- a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/EditableImage.java
+++ b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/EditableImage.java
@@ -83,7 +83,7 @@ public abstract class EditableImage extends StyledControl {
 		if (control != null) {
 			((Label) control).setText(imgTag);
 			control.setSize(preferredImageSize != null
-					? new Point(preferredImageSize.getWidth(), preferredImageSize.getHeight())
+					? new Point(preferredImageSize.width(), preferredImageSize.height())
 					: getSize());
 		} else {
 			loaded = false;
diff --git a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/Img.java b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/Img.java
index 9093c84..f5cae6a 100644
--- a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/Img.java
+++ b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/Img.java
@@ -79,7 +79,7 @@ public class Img extends EditableImage implements SectionPart, NodePart {
 	@Override
 	protected synchronized Boolean load(Control lbl) {
 		Node imgNode = getNode();
-		boolean loaded = imageManager.load(imgNode, lbl, getPreferredImageSize());
+		boolean loaded = imageManager.load(imgNode, lbl, getPreferredImageSize(), null);
 		// getParent().layout();
 		return loaded;
 	}
-- 
2.30.2