From 86b2d38d4f73ac25eda3baeeafbb215c38b3cead Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Tue, 14 Nov 2023 11:34:53 +0300 Subject: [PATCH] =?UTF-8?q?G5V8DT-24189=20=D0=9F=D1=80=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=87=D0=B8=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F=20=D0=B8=D0=BB=D0=B8?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B=20=D0=B0=D0=B2?= =?UTF-8?q?=D1=82=D0=BE=D0=BC=D0=B0=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA?= =?UTF-8?q?=D0=B8=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=89=D0=B0=D1=82=D1=8C?= =?UTF-8?q?=20=D0=B5=D0=B3=D0=BE=20=D0=B2=20=D1=81=D0=BE=D0=BE=D1=82=D0=B2?= =?UTF-8?q?=D0=B5=D1=82=D1=81=D1=82=D0=B2=D1=83=D1=8E=D1=89=D0=B5=D0=B9=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BB=D0=B0=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Code style fixes --- .../bsl/ui/services/BslModuleRegionsInfo.java | 15 ++++++++++++--- .../services/BslModuleRegionsInfoService.java | 19 ++++++++++--------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfo.java b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfo.java index da347fe4..811568fa 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfo.java +++ b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfo.java @@ -1,6 +1,15 @@ -/** - * Copyright (C) 2023, 1C - */ +/******************************************************************************* + * 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 + * 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.internal.bsl.ui.services; import com._1c.g5.v8.dt.bsl.common.IBslModuleTextInsertInfo; diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfoService.java b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfoService.java index 4f2dfdb4..91e89b48 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfoService.java +++ b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfoService.java @@ -59,12 +59,12 @@ public class BslModuleRegionsInfoService { return () -> defaultPosition; } - URI moduleResourceURI = module.eResource().getURI(); + URI moduleResourceUri = module.eResource().getURI(); IResourceServiceProvider rsp = - IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider(moduleResourceURI); + IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider(moduleResourceUri); IV8ProjectManager projectManager = rsp.get(IV8ProjectManager.class); BslOwnerComputerService bslOwnerComputerService = rsp.get(BslOwnerComputerService.class); - IV8Project project = projectManager.getProject(moduleResourceURI); + IV8Project project = projectManager.getProject(moduleResourceUri); EClass moduleOwner = bslOwnerComputerService.computeOwnerEClass(module); EObject eventOwner = data.getEventOwner(); BslModuleEventData regionData = (BslModuleEventData)data; @@ -94,12 +94,12 @@ public class BslModuleRegionsInfoService String regionName = moduleRegionInformation.getRegionName(); if (module != null && regionName != null) { - URI moduleResourceURI = module.eResource().getURI(); + URI moduleResourceUri = module.eResource().getURI(); IResourceServiceProvider rsp = - IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider(moduleResourceURI); + IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider(moduleResourceUri); IV8ProjectManager projectManager = rsp.get(IV8ProjectManager.class); BslGeneratorMultiLangProposals proposals = rsp.get(BslGeneratorMultiLangProposals.class); - IV8Project project = projectManager.getProject(moduleResourceURI); + IV8Project project = projectManager.getProject(moduleResourceUri); String lineSeparator = PreferenceUtils.getLineSeparator(project.getProject()); proposals.setRussianLang(ScriptVariant.RUSSIAN.equals(project.getScriptVariant())); String beginRegion = proposals.getBeginRegionPropStr(); @@ -285,11 +285,12 @@ public class BslModuleRegionsInfoService { if (itemType.equals(EventItemType.TABLE)) { - while ((eventOwner = eventOwner.eContainer()) != null) + EObject container; + while ((container = eventOwner.eContainer()) != null) { - if (eventOwner.eClass() == FormPackage.Literals.TABLE) + if (container.eClass() == FormPackage.Literals.TABLE) { - return ((NamedElement)eventOwner).getName(); + return ((NamedElement)container).getName(); } } }