From 1d1bbe48ac56d8bf6041a1f435441a8333162274 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 23 Jun 2023 11:19:55 +0200 Subject: [PATCH] Small improvements while migrating to ACR --- .../src/org/argeo/cms/ui/forms/FormConstants.java | 3 ++- .../src/org/argeo/cms/ui/forms/FormPageViewer.java | 2 +- swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/widgets/Img.java | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormConstants.java b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormConstants.java index fe9f7e7..2ea824c 100644 --- a/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormConstants.java +++ b/swt/org.argeo.cms.jcr.ui/src/org/argeo/cms/ui/forms/FormConstants.java @@ -1,7 +1,8 @@ package org.argeo.cms.ui.forms; /** Constants used in the various CMS Forms */ -public interface FormConstants { +@Deprecated +interface FormConstants { // DATAKEYS public final static String LINKED_VALUE = "LinkedValue"; } 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 1888055..136fff7 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 @@ -305,7 +305,7 @@ public class FormPageViewer extends AbstractPageViewer { protected CmsImageManager imageManager() { if (imageManager == null) - imageManager = (CmsImageManager) CmsSwtUtils.getCmsView(mainSection).getImageManager(); + imageManager = CmsSwtUtils.getCmsView(mainSection).getImageManager(); return imageManager; } 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 41063fa..9093c84 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 @@ -53,8 +53,7 @@ public class Img extends EditableImage implements SectionPart, NodePart { CmsImageManager imageManager) throws RepositoryException { super(parent, swtStyle, imgNode, false, preferredImageSize); this.section = section; - this.imageManager = imageManager != null ? imageManager - : (CmsImageManager) CmsSwtUtils.getCmsView(section).getImageManager(); + this.imageManager = imageManager != null ? imageManager : CmsSwtUtils.getCmsView(section).getImageManager(); CmsSwtUtils.style(this, TextStyles.TEXT_IMG); } -- 2.30.2