1c/v8-code-style
1
0
Fork 0
mirror of https://github.com/1C-Company/v8-code-style.git synced 2025-01-06 00:33:23 +02:00
Code Issues Releases Activity

Merge pull request #1060 from 1C-Company/bug/1059-fiixes_for_form-items-single-event-handler

Browse Source 
Ошибки в проверке form-items-single-event-handler #1059
This commit is contained in:
Vadim Geraskin 2022-07-12 12:44:11 +07:00 committed by GitHub
commit a81d8b3647
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/EventHandlerChangeExtension.java
View File

@ -45,7 +45,7 @@ public class EventHandlerChangeExtension
{
OnModelFeatureChangeContextCollector collector = (IBmObject bmObject, EStructuralFeature feature,
BmSubEvent bmEvent, CheckContextCollectingSession contextSession) -> {
if (isHandlerChanged(feature) || isItemRemoved(feature, bmEvent))
if (isHandlerChanged(feature) || isItemChanged(feature, bmEvent))
{
IBmObject top = bmObject.bmIsTop() ? bmObject : bmObject.bmGetTopObject();
if (top instanceof Form)
@ -68,13 +68,14 @@ public class EventHandlerChangeExtension
|| feature == FormPackage.Literals.EVENT_HANDLER_CONTAINER__HANDLERS;
}
private boolean isItemRemoved(EStructuralFeature feature, BmSubEvent bmEvent)
private boolean isItemChanged(EStructuralFeature feature, BmSubEvent bmEvent)
{
if (feature == FormPackage.Literals.FORM_ITEM_CONTAINER__ITEMS)
{
for (Notification notification : ((BmChangeEvent)bmEvent).getNotifications(feature))
{
if (notification.getEventType() == Notification.REMOVE)
if (notification.getEventType() == Notification.ADD
|| notification.getEventType() == Notification.REMOVE)
{
return true;
}

8
bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/messages.properties
View File

@ -12,13 +12,13 @@
# 1C-Soft LLC - initial API and implementation
# Manaev Konstantin - issue #855
###############################################################################
FormItemsSingleEventHandlerCheck_description = An each event has a own handler
FormItemsSingleEventHandlerCheck_description = Each event in the form items should have a unique handler
FormItemsSingleEventHandlerCheck_itemName_dot_eventName = {0}.{1}
FormItemsSingleEventHandlerCheck_the_handler_is_already_assigned_to_event = The "{0}" handler is already assigned to "{1}"
FormItemsSingleEventHandlerCheck_the_handler_is_already_assigned_to_event = The handler "{0}" is already assigned to "{1}"
FormItemsSingleEventHandlerCheck_title = An each event has a own handler
FormItemsSingleEventHandlerCheck_title = Event should have a unique handler
FormListRefUseAlwaysFlagDisabledCheck_UseAlways_flag_is_disabled_for_the_Ref_field = UseAlways flag is disabled for the Ref field
@ -34,6 +34,6 @@ FormListRefUserVisibilityEnabledCheck_title = User visibility is not disabled fo
InputFieldListChoiceMode_Form_input_field_the_list_choice_mode_not_set_with_filled_choice_list = Form input field the "list choice mode" not set with filled choice list
InputFieldListChoiceMode_description = Check input field has correct list choice mode if choice list is not empty
InputFieldListChoiceMode_description = Input field should have correct list choice mode if choice list is not empty
InputFieldListChoiceMode_title = Form input field list choice mode

6
bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/messages_ru.properties
View File

@ -14,13 +14,13 @@
###############################################################################
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
FormItemsSingleEventHandlerCheck_description = У каждого события своя процедура-обработчик
FormItemsSingleEventHandlerCheck_description = У каждого события должна быть назначена своя процедура-обработчик
FormItemsSingleEventHandlerCheck_itemName_dot_eventName = {0}.{1}
FormItemsSingleEventHandlerCheck_the_handler_is_already_assigned_to_event = Обработчик события "{0}" уже назначен для "{1}"
FormItemsSingleEventHandlerCheck_title = У каждого события своя процедура-обработчик
FormItemsSingleEventHandlerCheck_title = У события должен быть уникальный обработчик
FormListRefUseAlwaysFlagDisabledCheck_UseAlways_flag_is_disabled_for_the_Ref_field = У реквизита "Ссылка" динамического списка выключен признак "Использовать всегда"
@ -36,6 +36,6 @@ FormListRefUserVisibilityEnabledCheck_title = У поля "Ссылка" таб
InputFieldListChoiceMode_Form_input_field_the_list_choice_mode_not_set_with_filled_choice_list = У поля ввода формы с заполненным списком выбора отключено свойство "Режим выбора из списка"
InputFieldListChoiceMode_description = Проверяет, что поле ввода содержит корректный режим ввыбора из списка, если список выбора заполнен
InputFieldListChoiceMode_description = Поле ввода должно содержать корректный режим выбора из списка, если список выбора заполнен
InputFieldListChoiceMode_title = Режим выбора из списка поля ввода формы