From 609b0ddfbcd6807762810976f079820ceb59a08d Mon Sep 17 00:00:00 2001 From: Vadim Geraskin Date: Fri, 3 Jun 2022 14:45:40 +0700 Subject: [PATCH] =?UTF-8?q?1037:=20=D0=98=D1=81=D0=BA=D0=BB=D1=8E=D1=87?= =?UTF-8?q?=D0=B8=D1=82=D1=8C=20BaseForm=20=D0=B8=D0=B7=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D0=BE=D0=BA=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/check/SkipBaseFormExtension.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) 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 cb7e53f9..99d7c319 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,6 +1,15 @@ -/** - * Copyright (C) 2022, 1C - */ +/******************************************************************************* + * 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 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * 1C-Soft LLC - initial API and implementation + *******************************************************************************/ package com.e1c.v8codestyle.form.check; import com._1c.g5.v8.bm.core.IBmObject; @@ -26,12 +35,8 @@ public class SkipBaseFormExtension private static boolean isBaseForm(Form form) { - if (form != null && form.getMdForm().getObjectBelonging() == ObjectBelonging.ADOPTED + return form != null && form.getMdForm().getObjectBelonging() == ObjectBelonging.ADOPTED && form.getExtensionForm() != null && !form.getExtensionForm().eIsProxy() - && (form.getBaseForm() == null || form.getBaseForm().eIsProxy())) - { - return true; - } - return false; + && (form.getBaseForm() == null || form.getBaseForm().eIsProxy()); } }