X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Finternal%2FSimpleEditableImage.java;fp=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Finternal%2FSimpleEditableImage.java;h=c5c1a01a2ac045a7d7e8ec6da9bf12fe62143c97;hb=b7683883512d924a039a43c2e1102290aa49f64d;hp=5602d991b0b88a70f9dab4215ff3e618aec0a215;hpb=03f646fd0d7e7ce393694c836c779bc67a4eef55;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 5602d991b..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.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.graphics.Point; 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; @@ -43,14 +43,13 @@ public class SimpleEditableImage extends EditableImage { if (src != null) imgTag = CmsUiUtils.img(src, imageSize); else - imgTag = CmsUiUtils.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()); - CmsUiUtils.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; }