From 87a11ae753fa45d7feaa601f777ab77c65a87161 Mon Sep 17 00:00:00 2001 From: Dmitry Savenko Date: Mon, 2 Mar 2026 16:49:46 +0700 Subject: [PATCH 1/2] =?UTF-8?q?G5V8DT-28353:=20=D0=B8=D1=81=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20BaseForm=20=D0=B8=D0=B7?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20data-comp?= =?UTF-8?q?osition-conditional-appearance-use?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataCompositionConditionalAppearanceUseCheck.java | 4 ++-- .../v8codestyle/form/check/SkipBaseFormExtension.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/DataCompositionConditionalAppearanceUseCheck.java b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/DataCompositionConditionalAppearanceUseCheck.java index 2f7b1fa1..022dd29b 100644 --- a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/DataCompositionConditionalAppearanceUseCheck.java +++ b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/DataCompositionConditionalAppearanceUseCheck.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2023, 1C-Soft LLC and others. + * Copyright (C) 2023-2026, 1C-Soft LLC and others. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -124,7 +124,7 @@ public class DataCompositionConditionalAppearanceUseCheck else { Form form = manager.getOwner(eObject, Form.class); - if (monitor.isCanceled() || form == null) + if (monitor.isCanceled() || form == null || SkipBaseFormExtension.isBaseForm(form)) { return; } diff --git a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/SkipBaseFormExtension.java b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/SkipBaseFormExtension.java index 99d7c319..346ddc33 100644 --- a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/SkipBaseFormExtension.java +++ b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/SkipBaseFormExtension.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2022, 1C-Soft LLC and others. + * Copyright (C) 2022-2026, 1C-Soft LLC and others. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -33,7 +33,13 @@ public class SkipBaseFormExtension return (IBmObject object, ICheckParameters parameters) -> !isBaseForm((Form)object); } - private static boolean isBaseForm(Form form) + /** + * Returns whether the given form is a base form. + * + * @param form form to test, may be {@code null}. + * @return whether the given form is a base form. + */ + public static boolean isBaseForm(Form form) { return form != null && form.getMdForm().getObjectBelonging() == ObjectBelonging.ADOPTED && form.getExtensionForm() != null && !form.getExtensionForm().eIsProxy() From cdaac1b12db2871b4c564f61235c5f6adcdd86f3 Mon Sep 17 00:00:00 2001 From: Dmitry Savenko Date: Mon, 2 Mar 2026 17:08:47 +0700 Subject: [PATCH 2/2] =?UTF-8?q?G5V8DT-28353:=20=D1=83=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=BB=20=D0=B4=D0=B8=D0=B0=D0=BF=D0=B0=D0=B7=D0=BE=D0=BD=D1=8B?= =?UTF-8?q?=20=D0=B3=D0=BE=D0=B4=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../check/DataCompositionConditionalAppearanceUseCheck.java | 2 +- .../com/e1c/v8codestyle/form/check/SkipBaseFormExtension.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/DataCompositionConditionalAppearanceUseCheck.java b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/DataCompositionConditionalAppearanceUseCheck.java index 022dd29b..61a0c868 100644 --- a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/DataCompositionConditionalAppearanceUseCheck.java +++ b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/DataCompositionConditionalAppearanceUseCheck.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2023-2026, 1C-Soft LLC and others. + * Copyright (C) 2023, 1C-Soft LLC and others. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 diff --git a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/SkipBaseFormExtension.java b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/SkipBaseFormExtension.java index 346ddc33..44ce99d6 100644 --- a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/SkipBaseFormExtension.java +++ b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/SkipBaseFormExtension.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2022-2026, 1C-Soft LLC and others. + * Copyright (C) 2022, 1C-Soft LLC and others. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0