From afdadc2476fc4aa126794f1e2a60141e83badc5f Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Wed, 13 Oct 2021 12:40:35 +0300 Subject: [PATCH] =?UTF-8?q?#386=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=BA=D0=B8=20=D0=B2=20=D1=81=D0=BB=D1=83=D1=87=D0=B0?= =?UTF-8?q?=D0=B5=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=B4=D1=83=D0=B1=D0=BB?= =?UTF-8?q?=D0=B8=D1=80=D1=83=D1=8E=D1=82=D1=81=D1=8F=20=D1=8D=D0=BB=D0=B5?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=D1=8B=20=D0=BA=D0=BE=D0=BB=D0=BB=D0=B5?= =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../check/EventHandlerBooleanParamCheck.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/EventHandlerBooleanParamCheck.java b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/EventHandlerBooleanParamCheck.java index c34afe70..da2ee3e4 100644 --- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/EventHandlerBooleanParamCheck.java +++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/EventHandlerBooleanParamCheck.java @@ -18,9 +18,9 @@ import java.text.MessageFormat; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.TreeSet; -import java.util.stream.Collectors; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.emf.common.util.URI; @@ -354,24 +354,25 @@ public class EventHandlerBooleanParamCheck private Map getAllModuleEvents(Module module) { + Map result = new HashMap<>(); if (module.getModuleType() == ModuleType.FORM_MODULE) { - return bslEventsService.getAllModuleEvents(module) - .entrySet() - .stream() - .collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey)); + for (Entry entry : bslEventsService.getAllModuleEvents(module).entrySet()) + { + result.put(entry.getValue(), entry.getKey()); + } } else { List moduleEvents = contextDefService.getModuleEvents(module); - Map res = new HashMap<>(); + for (Event event : moduleEvents) { - res.put(new CaseInsensitiveString(event.getName()), event); - res.put(new CaseInsensitiveString(event.getNameRu()), event); + result.put(new CaseInsensitiveString(event.getName()), event); + result.put(new CaseInsensitiveString(event.getNameRu()), event); } - return res; } + return result; } private boolean isCorrectModule(Module module)