X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Finternal%2FSimpleEditableImage.java;h=c5c1a01a2ac045a7d7e8ec6da9bf12fe62143c97;hb=633a8acd189cc22f06944d278879601189be1bc8;hp=3bb1fdf159b7973e69bb33a118e0dd368a3cacfc;hpb=972528f4de2d00690362c01d3ce843ca9cd10250;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/SimpleEditableImage.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/SimpleEditableImage.java
index 3bb1fdf15..c5c1a01a2 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/SimpleEditableImage.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/SimpleEditableImage.java
@@ -2,9 +2,10 @@ package org.argeo.cms.ui.internal;
 
 import javax.jcr.RepositoryException;
 
-import org.argeo.cms.util.CmsUtils;
-import org.argeo.cms.widgets.EditableImage;
-import org.eclipse.swt.graphics.Point;
+import org.argeo.api.cms.Cms2DSize;
+import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.ui.widgets.EditableImage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
@@ -14,7 +15,7 @@ public class SimpleEditableImage extends EditableImage {
 	private static final long serialVersionUID = -5689145523114022890L;
 
 	private String src;
-	private Point imageSize;
+	private Cms2DSize imageSize;
 
 	public SimpleEditableImage(Composite parent, int swtStyle) {
 		super(parent, swtStyle);
@@ -22,8 +23,7 @@ public class SimpleEditableImage extends EditableImage {
 		getParent().layout();
 	}
 
-	public SimpleEditableImage(Composite parent, int swtStyle, String src,
-			Point imageSize) {
+	public SimpleEditableImage(Composite parent, int swtStyle, String src, Cms2DSize imageSize) {
 		super(parent, swtStyle);
 		this.src = src;
 		this.imageSize = imageSize;
@@ -41,16 +41,15 @@ public class SimpleEditableImage extends EditableImage {
 	protected String createImgTag() throws RepositoryException {
 		String imgTag;
 		if (src != null)
-			imgTag = CmsUtils.img(src, imageSize);
+			imgTag = CmsUiUtils.img(src, imageSize);
 		else
-			imgTag = CmsUtils.noImg(imageSize != null ? imageSize
-					: NO_IMAGE_SIZE);
+			imgTag = CmsUiUtils.noImg(imageSize != null ? imageSize : NO_IMAGE_SIZE);
 		return imgTag;
 	}
 
 	protected Text createText(Composite box, String style) {
 		Text text = new Text(box, getStyle());
-		CmsUtils.style(text, style);
+		CmsSwtUtils.style(text, style);
 		return text;
 	}
 
@@ -62,11 +61,11 @@ public class SimpleEditableImage extends EditableImage {
 		this.src = src;
 	}
 
-	public Point getImageSize() {
+	public Cms2DSize getImageSize() {
 		return imageSize;
 	}
 
-	public void setImageSize(Point imageSize) {
+	public void setImageSize(Cms2DSize imageSize) {
 		this.imageSize = imageSize;
 	}