diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/CF.java b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/CF.java index 51c0dfcf6..e65dce8b5 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/CF.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/CF.java @@ -110,7 +110,7 @@ public interface CF extends MDClass, ConfigurationTree, CFAccess { /** * Возвращает соответствие типов модулей их путям к файлам для дочернего объекта */ - default Map mdoModuleTypes(MdoReference mdoReference) { + default Map> mdoModuleTypes(MdoReference mdoReference) { var child = findChild(mdoReference); if (child.isPresent() && child.get() instanceof ModuleOwner moduleOwner) { return moduleOwner.getModuleTypes(); @@ -122,7 +122,7 @@ default Map mdoModuleTypes(MdoReference mdoReference) { /** * Возвращает соответствие типов модулей их путям к файлам для дочернего объекта */ - default Map mdoModuleTypes(String mdoRef) { + default Map> mdoModuleTypes(String mdoRef) { return mdoModuleTypes(MdoReference.create(mdoRef)); } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/Configuration.java b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/Configuration.java index 5bf339a12..400227a75 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/Configuration.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/Configuration.java @@ -104,7 +104,7 @@ * Корневой класс конфигурации 1с */ @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class Configuration implements CF { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationExtension.java b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationExtension.java index b9be91cce..1c5be9bd7 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationExtension.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationExtension.java @@ -103,7 +103,7 @@ * Класс расширения конфигурации 1с */ @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class ConfigurationExtension implements CF { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalDataProcessor.java b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalDataProcessor.java index de60f3baf..a7ec2a3cf 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalDataProcessor.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalDataProcessor.java @@ -47,7 +47,7 @@ * Внешняя обработка */ @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class ExternalDataProcessor implements ExternalSource { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalReport.java b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalReport.java index de70b899d..88ce86a95 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalReport.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalReport.java @@ -47,7 +47,7 @@ * Внешний отчет */ @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class ExternalReport implements ExternalSource { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/MDClasses.java b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/MDClasses.java index 09af8c274..44ca8d7df 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdclasses/MDClasses.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdclasses/MDClasses.java @@ -21,6 +21,7 @@ */ package com.github._1c_syntax.bsl.mdclasses; +import com.github._1c_syntax.bsl.reader.MDMerger; import com.github._1c_syntax.bsl.reader.MDOReader; import com.github._1c_syntax.bsl.types.MDOType; import lombok.experimental.UtilityClass; @@ -128,9 +129,53 @@ public List createConfigurations(Path sourcePath) { */ @Deprecated(since = "0.16.0") public List createConfigurations(Path sourcePath, boolean skipSupport) { - return findFiles(sourcePath, SEARCH_CONFIGURATION).parallelStream() - .map(path -> createConfiguration(path, MDCReadSettings.builder().skipSupport(skipSupport).build())) - .toList(); + return createConfigurations(sourcePath, MDCReadSettings.builder().skipSupport(skipSupport).build()); + } + + /** + * Читает каталог проекта и + * - возвращает объект MDClass, если содержится только один объект MDC + * - возвращает объединенную конфигурацию с расширениями + * - возвращает объединение расширений с пустой конфигурацией + * + * @param sourcePath Путь к каталогу исходников + * @return Результат чтения решения + */ + public MDClass createSolution(Path sourcePath) { + var mdcs = createConfigurations(sourcePath, MDCReadSettings.DEFAULT); + + if (mdcs.isEmpty()) { + return Configuration.EMPTY; + } else if (mdcs.size() == 1) { + return mdcs.get(0); + } else { + var mdc = mdcs.stream().filter(Configuration.class::isInstance).map(Configuration.class::cast).findFirst(); + var cf = mdc.orElse(Configuration.EMPTY); + var extensions = mdcs.stream() + .filter(ConfigurationExtension.class::isInstance) + .map(ConfigurationExtension.class::cast) + .toList(); + + if (cf.isEmpty()) { + if (extensions.isEmpty()) { + // вернем первое значение, т.к. там нет ни конфы, ни расширений + return mdcs.get(0); + } else if (extensions.size() == 1) { + // есть одно расширение, вернем его + return extensions.get(0); + } + } else if (extensions.isEmpty()) { + // расширений нет, вернем конфигурацию + return cf; + } + + // объединим расширения с конфигурацией в одно целое + var result = cf; + for (var extension : extensions) { + result = MDMerger.merge(result, extension); + } + return result; + } } /** diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/AccountingRegister.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/AccountingRegister.java index 923b3aa4c..ab5977a27 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/AccountingRegister.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/AccountingRegister.java @@ -44,7 +44,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class AccountingRegister implements Register, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegister.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegister.java index d33efddd6..9112c6a15 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegister.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegister.java @@ -44,7 +44,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class AccumulationRegister implements Register, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Bot.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Bot.java index c375d5341..69d03acd2 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Bot.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Bot.java @@ -35,7 +35,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class Bot implements MDObject, ModuleOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/BusinessProcess.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/BusinessProcess.java index b65608954..c65bc2dda 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/BusinessProcess.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/BusinessProcess.java @@ -42,7 +42,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class BusinessProcess implements ReferenceObject, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/CalculationRegister.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/CalculationRegister.java index e2bad6909..1931d4dba 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/CalculationRegister.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/CalculationRegister.java @@ -45,7 +45,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class CalculationRegister implements Register, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Catalog.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Catalog.java index 8b10f9048..f59fd37cb 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Catalog.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Catalog.java @@ -42,7 +42,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class Catalog implements ReferenceObject, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccounts.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccounts.java index f87f69e56..b6ec151e0 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccounts.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfAccounts.java @@ -44,7 +44,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class ChartOfAccounts implements ReferenceObject, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypes.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypes.java index f34dd0752..2ab07039b 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypes.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCalculationTypes.java @@ -42,7 +42,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class ChartOfCalculationTypes implements ReferenceObject, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypes.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypes.java index b50e0cbab..61f149d4b 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypes.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/ChartOfCharacteristicTypes.java @@ -45,7 +45,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class ChartOfCharacteristicTypes implements ReferenceObject, AccessRightsOwner, ValueTypeOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/CommonCommand.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/CommonCommand.java index 27b9a41b3..bc95e2787 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/CommonCommand.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/CommonCommand.java @@ -37,7 +37,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class CommonCommand implements MDObject, Command { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/CommonForm.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/CommonForm.java index 39394ed12..817027417 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/CommonForm.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/CommonForm.java @@ -39,7 +39,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class CommonForm implements MDObject, Form, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/CommonModule.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/CommonModule.java index 17df92f59..01e6cc10f 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/CommonModule.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/CommonModule.java @@ -38,7 +38,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class CommonModule implements MDObject, Module, ModuleOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Constant.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Constant.java index 27c2ec95e..f6e3be3df 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Constant.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Constant.java @@ -39,7 +39,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class Constant implements MDObject, ModuleOwner, AccessRightsOwner, ValueTypeOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/DataProcessor.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/DataProcessor.java index 505c5a90c..dec437444 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/DataProcessor.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/DataProcessor.java @@ -42,7 +42,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class DataProcessor implements MDObject, ModuleOwner, CommandOwner, AttributeOwner, TabularSectionOwner, diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Document.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Document.java index d3117d2f0..9b1f5fc8a 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Document.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Document.java @@ -42,7 +42,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class Document implements ReferenceObject, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/DocumentJournal.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/DocumentJournal.java index bb9014d1c..544ef9c1a 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/DocumentJournal.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/DocumentJournal.java @@ -43,7 +43,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class DocumentJournal implements MDObject, ModuleOwner, CommandOwner, AttributeOwner, FormOwner, TemplateOwner, diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Enum.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Enum.java index 2cd2ce47e..5eb0dfb93 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Enum.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Enum.java @@ -42,7 +42,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class Enum implements MDObject, ModuleOwner, CommandOwner, FormOwner, TemplateOwner, AttributeOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/ExchangePlan.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/ExchangePlan.java index 5e0758058..fa0dc0f39 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/ExchangePlan.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/ExchangePlan.java @@ -43,7 +43,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class ExchangePlan implements ReferenceObject, AccessRightsOwner { @@ -227,7 +227,7 @@ private static List computePossibleRights() { } @Value - @Builder + @Builder(toBuilder = true) public static class RecordContent { /** diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/ExternalDataSource.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/ExternalDataSource.java index 8cd869cf6..19534e46d 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/ExternalDataSource.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/ExternalDataSource.java @@ -42,7 +42,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class ExternalDataSource implements MDObject, ChildrenOwner, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/FilterCriterion.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/FilterCriterion.java index 56f11e4a2..ba1fcf197 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/FilterCriterion.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/FilterCriterion.java @@ -41,7 +41,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class FilterCriterion implements MDObject, ModuleOwner, CommandOwner, FormOwner, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/HTTPService.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/HTTPService.java index 1cb96a6aa..8b1020155 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/HTTPService.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/HTTPService.java @@ -39,7 +39,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class HTTPService implements MDObject, ModuleOwner, ChildrenOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/InformationRegister.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/InformationRegister.java index 6cc906fc7..5b4305434 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/InformationRegister.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/InformationRegister.java @@ -44,7 +44,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class InformationRegister implements Register, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/IntegrationService.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/IntegrationService.java index 82600c38e..7a8dfe89c 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/IntegrationService.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/IntegrationService.java @@ -37,7 +37,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class IntegrationService implements MDObject, ModuleOwner, ChildrenOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/ModuleOwner.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/ModuleOwner.java index 3f394c9ed..24137a440 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/ModuleOwner.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/ModuleOwner.java @@ -65,7 +65,12 @@ default ModuleType getModuleTypeByURI(URI uri) { /** * Возвращает соответствие типов модулей их путям к файлам */ - default Map getModuleTypes() { - return getModules().stream().collect(Collectors.toMap(Module::getModuleType, Module::getUri)); + default Map> getModuleTypes() { + return getModules().stream().collect( + Collectors.groupingBy( + Module::getModuleType, + Collectors.mapping(Module::getUri, Collectors.toList()) + ) + ); } } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Report.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Report.java index 1891663a1..375845d57 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Report.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Report.java @@ -43,7 +43,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class Report implements MDObject, ModuleOwner, CommandOwner, AttributeOwner, TabularSectionOwner, diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Sequence.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Sequence.java index d6040a590..27ea50548 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Sequence.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Sequence.java @@ -38,7 +38,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class Sequence implements MDObject, AttributeOwner, ModuleOwner, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/SettingsStorage.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/SettingsStorage.java index ef5ad7623..99636aa5e 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/SettingsStorage.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/SettingsStorage.java @@ -40,7 +40,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class SettingsStorage implements MDObject, ModuleOwner, FormOwner, TemplateOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Task.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Task.java index fe29aea5c..82ede9e01 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Task.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Task.java @@ -43,7 +43,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class Task implements ReferenceObject, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/WebService.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/WebService.java index 17238f7ff..b9285c018 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/WebService.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/WebService.java @@ -40,7 +40,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class WebService implements MDObject, ChildrenOwner, ModuleOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/WebSocketClient.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/WebSocketClient.java index add9a6c34..ae6d9d121 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/WebSocketClient.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/WebSocketClient.java @@ -35,7 +35,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class WebSocketClient implements MDObject, ModuleOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCube.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCube.java index b3416004a..8c65d957a 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCube.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCube.java @@ -50,7 +50,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class ExternalDataSourceCube implements MDChild, ModuleOwner, CommandOwner, AttributeOwner, FormOwner, diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCubeDimensionTable.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCubeDimensionTable.java index f7a565875..d082e1f7a 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCubeDimensionTable.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCubeDimensionTable.java @@ -50,7 +50,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class ExternalDataSourceCubeDimensionTable implements MDChild, ModuleOwner, CommandOwner, AttributeOwner, FormOwner, diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTable.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTable.java index 18d463010..58909a12c 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTable.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTable.java @@ -50,7 +50,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class ExternalDataSourceTable implements MDChild, ModuleOwner, CommandOwner, AttributeOwner, FormOwner, diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectCommand.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectCommand.java index 25100b40f..6757f597f 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectCommand.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectCommand.java @@ -39,7 +39,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class ObjectCommand implements Command, MDChild { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectForm.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectForm.java index 96cc9ece3..9ada87eac 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectForm.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectForm.java @@ -43,7 +43,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class ObjectForm implements Form, MDChild { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectModule.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectModule.java index 86ab50a4d..c2f15f61b 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectModule.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectModule.java @@ -34,7 +34,7 @@ import java.net.URI; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"uri"}) @EqualsAndHashCode(of = {"uri"}) public class ObjectModule implements Module { diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/Recalculation.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/Recalculation.java index 36b1bb6d6..1d750b0a8 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/Recalculation.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/Recalculation.java @@ -40,7 +40,7 @@ import java.util.List; @Value -@Builder +@Builder(toBuilder = true) @ToString(of = {"name", "uuid"}) @EqualsAndHashCode(of = {"name", "uuid"}) public class Recalculation implements MDChild, ModuleOwner, AccessRightsOwner { diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/MDMerger.java b/src/main/java/com/github/_1c_syntax/bsl/reader/MDMerger.java new file mode 100644 index 000000000..678321d9c --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/reader/MDMerger.java @@ -0,0 +1,332 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.reader; + +import com.github._1c_syntax.bsl.mdclasses.CF; +import com.github._1c_syntax.bsl.mdclasses.Configuration; +import com.github._1c_syntax.bsl.mdclasses.ConfigurationExtension; +import com.github._1c_syntax.bsl.mdo.ChildrenOwner; +import com.github._1c_syntax.bsl.mdo.Command; +import com.github._1c_syntax.bsl.mdo.CommandOwner; +import com.github._1c_syntax.bsl.mdo.Form; +import com.github._1c_syntax.bsl.mdo.FormOwner; +import com.github._1c_syntax.bsl.mdo.MD; +import com.github._1c_syntax.bsl.mdo.Module; +import com.github._1c_syntax.bsl.mdo.ModuleOwner; +import com.github._1c_syntax.bsl.mdo.Template; +import com.github._1c_syntax.bsl.mdo.TemplateOwner; +import com.github._1c_syntax.bsl.reader.common.TransformationUtils; +import lombok.NonNull; +import lombok.experimental.UtilityClass; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * Вспомогательный класс для выполнения объединения объектов + */ +@UtilityClass +public class MDMerger { + + /** + * Выполняет объединение конфигурации и расширения + * + * @param cf Основная конфигурация + * @param extension Добавляемое расширение + * @return Объединенная конфигурация + */ + @NonNull + public static Configuration merge(@NonNull Configuration cf, @NonNull ConfigurationExtension extension) { + var builder = cf.toBuilder(); + // todo подумать о том, как контролировать, что все свойства копируются + if (cf.isEmpty()) { // скопируем из первого расширения + builder.configurationSource(extension.getConfigurationSource()) + .name("solution") + .uuid("solution") + .defaultLanguage(extension.getDefaultLanguage()) + .scriptVariant(extension.getScriptVariant()) + .interfaceCompatibilityMode(extension.getInterfaceCompatibilityMode()) + .compatibilityMode(extension.getCompatibilityMode()) + .defaultRunMode(extension.getDefaultRunMode()); + } + + List newChildren = new ArrayList<>(); + return builder + .modules(mergeModules(cf.getModules(), extension.getModules())) + + .subsystems(mergeMDListSimple(cf, extension, CF::getSubsystems, newChildren)) + .sessionParameters(mergeMDListSimple(cf, extension, CF::getSessionParameters, newChildren)) + .roles(mergeMDListSimple(cf, extension, CF::getRoles, newChildren)) + .commonAttributes(mergeMDListSimple(cf, extension, CF::getCommonAttributes, newChildren)) + .eventSubscriptions(mergeMDListSimple(cf, extension, CF::getEventSubscriptions, newChildren)) + .scheduledJobs(mergeMDListSimple(cf, extension, CF::getScheduledJobs, newChildren)) + .functionalOptions(mergeMDListSimple(cf, extension, CF::getFunctionalOptions, newChildren)) + .functionalOptionsParameters(mergeMDListSimple(cf, extension, CF::getFunctionalOptionsParameters, newChildren)) + .definedTypes(mergeMDListSimple(cf, extension, CF::getDefinedTypes, newChildren)) + .commandGroups(mergeMDListSimple(cf, extension, CF::getCommandGroups, newChildren)) + .commonTemplates(mergeMDListSimple(cf, extension, CF::getCommonTemplates, newChildren)) + .commonPictures(mergeMDListSimple(cf, extension, CF::getCommonPictures, newChildren)) + .interfaces(mergeMDListSimple(cf, extension, CF::getInterfaces, newChildren)) + .xDTOPackages(mergeMDListSimple(cf, extension, CF::getXDTOPackages, newChildren)) + .wsReferences(mergeMDListSimple(cf, extension, CF::getWsReferences, newChildren)) + .styleItems(mergeMDListSimple(cf, extension, CF::getStyleItems, newChildren)) + .paletteColors(mergeMDListSimple(cf, extension, CF::getPaletteColors, newChildren)) + .styles(mergeMDListSimple(cf, extension, CF::getStyles, newChildren)) + .languages(mergeMDListSimple(cf, extension, CF::getLanguages, newChildren)) + .documentNumerators(mergeMDListSimple(cf, extension, CF::getDocumentNumerators, newChildren)) + + .clearCommonModules().commonModules(mergeMD(cf, extension, CF::getCommonModules, newChildren)) + .clearFilterCriteria().filterCriteria(mergeMD(cf, extension, CF::getFilterCriteria, newChildren)) + .clearBots().bots(mergeMD(cf, extension, CF::getBots, newChildren)) + .clearSettingsStorages().settingsStorages(mergeMD(cf, extension, CF::getSettingsStorages, newChildren)) + .clearCommonForms().commonForms(mergeMD(cf, extension, CF::getCommonForms, newChildren)) + .clearCommonCommands().commonCommands(mergeMD(cf, extension, CF::getCommonCommands, newChildren)) + .clearWebServices().webServices(mergeMD(cf, extension, CF::getWebServices, newChildren)) + .clearWebSocketClients().webSocketClients(mergeMD(cf, extension, CF::getWebSocketClients, newChildren)) + .clearHttpServices().httpServices(mergeMD(cf, extension, CF::getHttpServices, newChildren)) + .clearIntegrationServices().integrationServices(mergeMD(cf, extension, CF::getIntegrationServices, newChildren)) + .clearConstants().constants(mergeMD(cf, extension, CF::getConstants, newChildren)) + .clearCatalogs().catalogs(mergeMD(cf, extension, CF::getCatalogs, newChildren)) + .clearDocuments().documents(mergeMD(cf, extension, CF::getDocuments, newChildren)) + .clearSequences().sequences(mergeMD(cf, extension, CF::getSequences, newChildren)) + .clearDocumentJournals().documentJournals(mergeMD(cf, extension, CF::getDocumentJournals, newChildren)) + .clearEnums().enums(mergeMD(cf, extension, CF::getEnums, newChildren)) + .clearReports().reports(mergeMD(cf, extension, CF::getReports, newChildren)) + .clearDataProcessors().dataProcessors(mergeMD(cf, extension, CF::getDataProcessors, newChildren)) + .clearChartsOfCharacteristicTypes() + .chartsOfCharacteristicTypes(mergeMD(cf, extension, CF::getChartsOfCharacteristicTypes, newChildren)) + .clearChartsOfAccounts().chartsOfAccounts(mergeMD(cf, extension, CF::getChartsOfAccounts, newChildren)) + .clearChartsOfCalculationTypes().chartsOfCalculationTypes(mergeMD(cf, extension, CF::getChartsOfCalculationTypes, newChildren)) + .clearInformationRegisters().informationRegisters(mergeMD(cf, extension, CF::getInformationRegisters, newChildren)) + .clearAccumulationRegisters().accumulationRegisters(mergeMD(cf, extension, CF::getAccumulationRegisters, newChildren)) + .clearAccountingRegisters().accountingRegisters(mergeMD(cf, extension, CF::getAccountingRegisters, newChildren)) + .clearCalculationRegisters().calculationRegisters(mergeMD(cf, extension, CF::getCalculationRegisters, newChildren)) + .clearBusinessProcesses().businessProcesses(mergeMD(cf, extension, CF::getBusinessProcesses, newChildren)) + .clearTasks().tasks(mergeMD(cf, extension, CF::getTasks, newChildren)) + .clearExternalDataSources().externalDataSources(mergeMD(cf, extension, CF::getExternalDataSources, newChildren)) + + .clearChildren().children(Collections.unmodifiableList(newChildren)) + .build(); + } + + /** + * Объединяет список модулей. Выполняется простое добавление модулей из копируемого объекта, т.к. в любом случае + * совпадений быть не может (модуль связан с файлом на диске) + * + * @param source Исходный список модулей + * @param additional Список модулей копируемого объекта + * @return Объединенный список + */ + private static List mergeModules(List source, List additional) { + if (additional.isEmpty()) { + return source; + } else if (source.isEmpty()) { + return additional; + } + var result = new ArrayList<>(source); + result.addAll(additional); + return Collections.unmodifiableList(result); + } + + /** + * для простого объединения, не предусматривающего предварительную очистку источника и анализа дочерних + */ + private static List mergeMDListSimple(Configuration cf, + ConfigurationExtension extension, + Function> getList, List newChildren) { + var additional = getList.apply(extension); + var source = getList.apply(cf); + newChildren.addAll(source); + if (source.isEmpty() || additional.isEmpty()) { + newChildren.addAll(additional); + return additional; + } + + // список ссылок всех существующих объектов + var refs = source.stream().map(MD::getMdoRef).toList(); + var result = List.copyOf(additional.stream().filter(md -> !refs.contains(md.getMdoRef())).toList()); + newChildren.addAll(result); + return result; + } + + /** + * Выполняет объединение коллекций дочерних объектов. + * Объединение работает следующим образом + * - получается список объектов, несовпадающих по именам - это новые, все добавляются в итоговый список + * - получается список объектов, по которым имена совпадают. Для них создаются копии (рекурсивно). Копии включаются + * в итоговый список + * + * @param Тип дочерних объектов + * @param Тип объединяемых объектов + * @param source Исходный объект + * @param copy Объединяемый расширение + * @param getList Метод получения списка дочерних + * @param newChildren Накопительный список всех дочерних + * @return Итоговый список дочерних + */ + private static List mergeMD(K source, + K copy, + Function> getList, + List newChildren) { + var additionalList = getList.apply(copy); + var sourceList = getList.apply(source); + if (sourceList.isEmpty()) { + newChildren.addAll(additionalList); + return additionalList; + } else if (additionalList.isEmpty()) { + newChildren.addAll(sourceList); + return sourceList; + } + + // список ссылок всех существующих объектов + var additionalRefs = additionalList.stream() + .collect(Collectors.toMap(MD::getMdoRef, Function.identity(), (a, b) -> b)); + + // переносим сначала существующие объекты + List result = new ArrayList<>(); + sourceList.forEach((T srcMD) -> { + var modMD = additionalRefs.get(srcMD.getMdoRef()); + if (modMD == null) { // изменений нет, просто копируем + result.add(srcMD); + return; + } + + // изменения есть, создаем копию + + // ModuleOwner + var md = copyModuleOwner(srcMD, modMD); + // ChildrenOwner + md = copyChildrenOwner(md, modMD); + + result.add(md); + }); + + var sourceRefs = sourceList.stream().map(MD::getMdoRef).collect(Collectors.toSet()); + result.addAll(additionalList.stream() + .filter(md -> !sourceRefs.contains(md.getMdoRef())) + .toList()); + + newChildren.addAll(result); + return Collections.unmodifiableList(result); + } + + @SuppressWarnings("unchecked") + private static T copyModuleOwner(T srcMD, T modMD) { + if (srcMD instanceof ModuleOwner moduleOwner) { + var source = moduleOwner.getModules(); + var merge = mergeModules(source, ((ModuleOwner) modMD).getModules()); + if (source != merge) { // список модулей изменился, создадим копию + var builder = TransformationUtils.toBuilder(srcMD); + if (builder == null) { // такого не бывает, но проверка нужна для спокойствия jwm + throw new IllegalStateException("toBuilder() is not available for " + srcMD.getClass()); + } + TransformationUtils.setValue(builder, "modules", merge); + return (T) TransformationUtils.build(builder); + } + } + return srcMD; + } + + @SuppressWarnings("unchecked") + private static T copyChildrenOwner(T srcMD, T modMD) { + // todo доделать копирование атрибутов и других дочерних + + var result = srcMD; + if (result instanceof ChildrenOwner childrenOwner) { + Object builder = null; + + var newChildren = new ArrayList<>( + childrenOwner.getChildren().stream() + .filter( + child -> !(child instanceof Form) + && !(child instanceof Template) + && !(child instanceof Command) + ).toList() + ); + + if (srcMD instanceof FormOwner formOwner) { + builder = copyFormOwner(formOwner, (FormOwner) modMD, builder, newChildren); + } + + if (srcMD instanceof TemplateOwner templateOwner) { + builder = copyTemplateOwner(templateOwner, (TemplateOwner) modMD, builder, newChildren); + } + + if (srcMD instanceof CommandOwner commandOwner) { + builder = copyCommandOwner(commandOwner, (CommandOwner) modMD, builder, newChildren); + } + + if (builder != null) { + TransformationUtils.invoke(builder, "clearChildren"); + TransformationUtils.setValue(builder, "children", newChildren); + result = (T) TransformationUtils.build(builder); + } + } + return result; + } + + private static Object copyChildrenList(K srcMD, + K modMD, + @Nullable Object builder, + Function> getList, + String methodName, + ArrayList newChildren) { + var source = getList.apply(srcMD); + var merge = mergeMD(srcMD, modMD, getList, newChildren); + if (source != merge) { // список изменился, создадим копию + if (builder == null) { + builder = TransformationUtils.toBuilder(srcMD); + if (builder == null) { // такого не бывает, но проверка нужна для спокойствия jwm + throw new IllegalStateException("toBuilder() is not available for " + srcMD.getClass()); + } + } + TransformationUtils.invoke(builder, "clear" + methodName); + TransformationUtils.setValue(builder, methodName, merge); + } + return builder; + } + + private static Object copyFormOwner(FormOwner srcMD, + FormOwner modMD, + @Nullable Object builder, + ArrayList newChildren) { + return copyChildrenList(srcMD, modMD, builder, FormOwner::getForms, "Forms", newChildren); + } + + private static Object copyTemplateOwner(TemplateOwner srcMD, + TemplateOwner modMD, + @Nullable Object builder, + ArrayList newChildren) { + return copyChildrenList(srcMD, modMD, builder, TemplateOwner::getTemplates, "Templates", newChildren); + } + + private static Object copyCommandOwner(CommandOwner srcMD, + CommandOwner modMD, + @Nullable Object builder, + ArrayList newChildren) { + return copyChildrenList(srcMD, modMD, builder, CommandOwner::getCommands, "Commands", newChildren); + } +} diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/TransformationUtils.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/TransformationUtils.java index 4ea0e4852..0e41c5e90 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/reader/common/TransformationUtils.java +++ b/src/main/java/com/github/_1c_syntax/bsl/reader/common/TransformationUtils.java @@ -51,6 +51,7 @@ public class TransformationUtils { private static final Map>> TYPES = new ConcurrentHashMap<>(); private static final String BUILD_METHOD_NAME = "build"; private static final String BUILDER_METHOD_NAME = "builder"; + private static final String TO_BUILDER_METHOD_NAME = "toBuilder"; private static final String LOGGER_MESSAGE_PREF = "Class {}, method {}"; /** @@ -77,6 +78,17 @@ public void setValue(@NonNull Object source, @NonNull String methodName, Object } } + public void invoke(@NonNull Object source, @NonNull String methodName) { + var method = getMethod(source.getClass(), methodName); + if (method != null) { + try { + method.invoke(source); + } catch (IllegalArgumentException | InvocationTargetException | IllegalAccessException e) { + LOGGER.error(LOGGER_MESSAGE_PREF, source.getClass(), methodName, e); + } + } + } + /** * Определяет тип значения поля\метода * @@ -111,6 +123,26 @@ public Object builder(@NonNull Class clazz) { return null; } + /** + * Возвращает объект-билдер для объекта + * + * @param object Объект, для которого ищется билдер копирования + * @return Найденный билдер копирования + */ + @Nullable + public Object toBuilder(@NonNull Object object) { + var clazz = object.getClass(); + var method = getMethod(clazz, TO_BUILDER_METHOD_NAME); + if (method != null) { + try { + return method.invoke(object); + } catch (IllegalAccessException | InvocationTargetException e) { + LOGGER.error(LOGGER_MESSAGE_PREF, clazz, TO_BUILDER_METHOD_NAME, e); + } + } + return null; + } + /** * Вызывает метод сборки билдера * @@ -131,6 +163,19 @@ public Object build(@NonNull Object builder, @NonNull Path path) { return null; } + @Nullable + public Object build(@NonNull Object builder) { + var method = getMethod(builder.getClass(), BUILD_METHOD_NAME); + if (method != null) { + try { + return method.invoke(builder); + } catch (Exception e) { + LOGGER.error(LOGGER_MESSAGE_PREF, builder.getClass(), BUILD_METHOD_NAME, e); + } + } + return null; + } + @Nullable private Method getMethod(@NonNull Class clazz, @NonNull String methodName) { return METHODS.computeIfAbsent(clazz.getName(), k -> new ConcurrentSkipListMap<>(String.CASE_INSENSITIVE_ORDER)) diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdclasses/MDClassesSolutionTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdclasses/MDClassesSolutionTest.java new file mode 100644 index 000000000..1c23563c7 --- /dev/null +++ b/src/test/java/com/github/_1c_syntax/bsl/mdclasses/MDClassesSolutionTest.java @@ -0,0 +1,122 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * MDClasses is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * MDClasses is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with MDClasses. + */ +package com.github._1c_syntax.bsl.mdclasses; + +import com.github._1c_syntax.bsl.mdo.MD; +import com.github._1c_syntax.bsl.support.SupportVariant; +import com.github._1c_syntax.bsl.test_utils.MDTestUtils; +import com.github._1c_syntax.bsl.test_utils.assertions.Assertions; +import com.github._1c_syntax.bsl.types.MdoReference; +import com.github._1c_syntax.bsl.types.ModuleType; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.aggregator.ArgumentsAccessor; +import org.junit.jupiter.params.provider.CsvSource; + +import java.nio.file.Path; + +import static org.assertj.core.api.Assertions.assertThat; + +class MDClassesSolutionTest { + + @Test + void createSolutionEmpty() { + var solutionEmpty = MDClasses.createSolution(Path.of("src/test/resources/fixtures")); + assertThat(solutionEmpty).isEqualTo(Configuration.EMPTY); + } + + @ParameterizedTest + @CsvSource( + { + "src/test/resources/ext/designer/mdclasses/src/cf", + "src/test/resources/ext/edt/mdclasses_3_27/configuration", + "src/test/resources/ext/designer/mdclasses_ext/src/cf" + } + ) + void createSolutionSimple(ArgumentsAccessor argumentsAccessor) { + var path = Path.of(argumentsAccessor.getString(0)); + var solutionCf = MDClasses.createSolution(path); + var cf = MDClasses.createConfigurations(path).get(0); + Assertions.assertThat(MDTestUtils.createJson(solutionCf), true) + .isEqual(MDTestUtils.createJson(cf)); + } + + @Test + void createSolutionCf_2_exts() { + var solution = MDClasses.createSolution(Path.of("src/test/resources/solutions/sol1")); + assertThat(solution).isInstanceOf(Configuration.class); + var cf = (Configuration) solution; + assertThat(cf.getSupportVariant()).isEqualTo(SupportVariant.NONE); + assertThat(cf.getModules()).hasSize(3); + assertThat(cf.getChildren()).hasSize(10); + + assertThat(cf.getAllModules()).hasSize(7); + + assertThat(cf.getRoles()).hasSize(2); + assertThat(cf.getLanguages()).hasSize(1); + assertThat(cf.getConstants()).hasSize(1); + assertThat(cf.getCatalogs()).hasSize(3); + assertThat(cf.getDocuments()).hasSize(1); + assertThat(cf.getEnums()).hasSize(1); + assertThat(cf.getDataProcessors()).hasSize(1); + assertThat(cf.getPlainChildren().stream().map(MD::getMdoRef).sorted()).hasSize(53); + + assertThat(cf.getModulesByType()).hasSize(7) + .containsValue(ModuleType.FormModule) + ; + + assertThat(cf.getModulesByObject()) + .hasSize(7) + .containsValue(cf.findChild(MdoReference.create("Catalog.Расш1_Справочник3.Form.ФормаЭлемента")).get()) + ; + } + + @Test + void createSolutionCf_2_exts_empty_cf() { + var solution = MDClasses.createSolution(Path.of("src/test/resources/solutions/sol2")); + assertThat(solution).isInstanceOf(Configuration.class); + var cf = (Configuration) solution; + assertThat(cf.getSupportVariant()).isEqualTo(SupportVariant.NONE); + assertThat(cf.getModules()).hasSize(1); + assertThat(cf.getChildren()).hasSize(8); + + assertThat(cf.getAllModules()).hasSize(4); + + assertThat(cf.getRoles()).hasSize(2); + assertThat(cf.getLanguages()).hasSize(1); + assertThat(cf.getConstants()).hasSize(1); + assertThat(cf.getCatalogs()).hasSize(2); + assertThat(cf.getDocuments()).hasSize(1); + assertThat(cf.getEnums()).isEmpty(); + assertThat(cf.getDataProcessors()).hasSize(1); + assertThat(cf.getPlainChildren().stream().map(MD::getMdoRef).sorted()).hasSize(39); + + assertThat(cf.getModulesByType()).hasSize(4) + .containsValue(ModuleType.FormModule) + ; + + assertThat(cf.getModulesByObject()) + .hasSize(4) + .containsValue(cf.findChild(MdoReference.create("Catalog.Расш1_Справочник3.Form.ФормаЭлемента")).get()) + ; + } +} \ No newline at end of file diff --git "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260.json" "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260.json" index 78d29bed8..2f3731a9a 100644 --- "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260.json" +++ "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260.json" @@ -91,7 +91,9 @@ "moduleTypes": [ [ "ObjectModule", - "src/test/resources/ext/designer/external/src/epf/ТестоваяВнешняяОбработка/Ext/ObjectModule.bsl" + [ + 1 + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260_edt.json" "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260_edt.json" index 53e4aca10..9b20e47f6 100644 --- "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260_edt.json" +++ "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260_edt.json" @@ -91,7 +91,9 @@ "moduleTypes": [ [ "ObjectModule", - "src/test/resources/ext/edt/external/src/ExternalDataProcessors/ТестоваяВнешняяОбработка/ObjectModule.bsl" + [ + 1 + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202.json" "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202.json" index 99829fa44..240b3f356 100644 --- "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202.json" +++ "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202.json" @@ -91,7 +91,9 @@ "moduleTypes": [ [ "ObjectModule", - "src/test/resources/ext/designer/external/src/erf/Тестовы_Внешни_Отчет/Ext/ObjectModule.bsl" + [ + 1 + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202_edt.json" "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202_edt.json" index 6de542131..e313d7207 100644 --- "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202_edt.json" +++ "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202_edt.json" @@ -91,7 +91,9 @@ "moduleTypes": [ [ "ObjectModule", - "src/test/resources/ext/edt/external/src/ExternalReports/Тестовы_Внешни_Отчет/ObjectModule.bsl" + [ + 1 + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011.json" "b/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011.json" index 8046edbbb..aa8286663 100644 --- "a/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011.json" +++ "b/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011.json" @@ -372,7 +372,9 @@ "moduleTypes": [ [ "ObjectModule", - "src/test/resources/ext/designer/mdclasses/src/cf/BusinessProcesses/БизнесПроцесс1/Ext/ObjectModule.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/BusinessProcesses/БизнесПроцесс1/Ext/ObjectModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011_edt.json" "b/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011_edt.json" index f8a10c5cd..e5f6f6c4c 100644 --- "a/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/BusinessProcesses.\320\221\320\270\320\267\320\275\320\265\321\201\320\237\321\200\320\276\321\206\320\265\321\201\321\2011_edt.json" @@ -372,7 +372,9 @@ "moduleTypes": [ [ "ObjectModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/BusinessProcesses/БизнесПроцесс1/ObjectModule.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/BusinessProcesses/БизнесПроцесс1/ObjectModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.json" "b/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.json" index d0a989ecf..46ddaf0a5 100644 --- "a/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.json" +++ "b/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.json" @@ -1224,12 +1224,16 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ObjectModule.bin" + ] ], [ - "ObjectModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ObjectModule.bin" + "ManagerModule", + [ + "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721_edt.json" "b/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721_edt.json" index 3652369e0..1d8fd3be2 100644 --- "a/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721_edt.json" @@ -1224,12 +1224,16 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621.json" "b/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621.json" index 8129f005a..48a70e512 100644 --- "a/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621.json" +++ "b/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621.json" @@ -613,7 +613,9 @@ "moduleTypes": [ [ "ObjectModule", - "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfAccounts/ПланСчетов1/Ext/ObjectModule.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfAccounts/ПланСчетов1/Ext/ObjectModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621_edt.json" "b/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621_edt.json" index 5a9b0cd34..835816bf3 100644 --- "a/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621_edt.json" @@ -613,7 +613,9 @@ "moduleTypes": [ [ "ObjectModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfAccounts/ПланСчетов1/ObjectModule.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfAccounts/ПланСчетов1/ObjectModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721.json" "b/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721.json" index e8ae5f385..54876139a 100644 --- "a/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721.json" +++ "b/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721.json" @@ -490,12 +490,16 @@ "mdoType": "CHART_OF_CHARACTERISTIC_TYPES", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721_edt.json" "b/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721_edt.json" index 21f988fb6..c383ead99 100644 --- "a/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721_edt.json" @@ -490,12 +490,16 @@ "mdoType": "CHART_OF_CHARACTERISTIC_TYPES", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/CommonCommands.\320\236\320\261\321\211\320\260\321\217\320\232\320\276\320\274\320\260\320\275\320\264\320\2601.json" "b/src/test/resources/fixtures/mdclasses/CommonCommands.\320\236\320\261\321\211\320\260\321\217\320\232\320\276\320\274\320\260\320\275\320\264\320\2601.json" index 347d14600..d266d6275 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonCommands.\320\236\320\261\321\211\320\260\321\217\320\232\320\276\320\274\320\260\320\275\320\264\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonCommands.\320\236\320\261\321\211\320\260\321\217\320\232\320\276\320\274\320\260\320\275\320\264\320\2601.json" @@ -10,7 +10,9 @@ "moduleTypes": [ [ "CommandModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonCommands/ОбщаяКоманда1/Ext/CommandModule.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/CommonCommands/ОбщаяКоманда1/Ext/CommandModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/CommonCommands.\320\236\320\261\321\211\320\260\321\217\320\232\320\276\320\274\320\260\320\275\320\264\320\2601_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonCommands.\320\236\320\261\321\211\320\260\321\217\320\232\320\276\320\274\320\260\320\275\320\264\320\2601_edt.json" index d9e1b1450..b94eb3afd 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonCommands.\320\236\320\261\321\211\320\260\321\217\320\232\320\276\320\274\320\260\320\275\320\264\320\2601_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonCommands.\320\236\320\261\321\211\320\260\321\217\320\232\320\276\320\274\320\260\320\275\320\264\320\2601_edt.json" @@ -10,7 +10,9 @@ "moduleTypes": [ [ "CommandModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonCommands/ОбщаяКоманда1/CommandModule.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonCommands/ОбщаяКоманда1/CommandModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/CommonForms.\320\244\320\276\321\200\320\274\320\260.json" "b/src/test/resources/fixtures/mdclasses/CommonForms.\320\244\320\276\321\200\320\274\320\260.json" index 288e1aafc..31345028e 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonForms.\320\244\320\276\321\200\320\274\320\260.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonForms.\320\244\320\276\321\200\320\274\320\260.json" @@ -20,7 +20,9 @@ "moduleTypes": [ [ "FormModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonForms/Форма/Ext/Form/Module.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/CommonForms/Форма/Ext/Form/Module.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/CommonForms.\320\244\320\276\321\200\320\274\320\260_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonForms.\320\244\320\276\321\200\320\274\320\260_edt.json" index 9f01d78d2..288522d11 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonForms.\320\244\320\276\321\200\320\274\320\260_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonForms.\320\244\320\276\321\200\320\274\320\260_edt.json" @@ -20,7 +20,9 @@ "moduleTypes": [ [ "FormModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonForms/Форма/Module.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonForms/Форма/Module.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" index 994014465..193ac2f37 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Глобальны_Общи_Модуль/Ext/Module.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Глобальны_Общи_Модуль/Ext/Module.bsl" + ] ] ], "name": "ГлобальныйОбщийМодуль", diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" index 606b5e5fe..0ea1cd28b 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Глобальны_Общи_Модуль/Module.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Глобальны_Общи_Модуль/Module.bsl" + ] ] ], "name": "ГлобальныйОбщийМодуль", diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260.json" index b1b384e02..632a62b0c 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульВызовСервера/Ext/Module.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульВызовСервера/Ext/Module.bsl" + ] ] ], "name": "ОбщийМодульВызовСервера", diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260_edt.json" index 0e29bb5c7..61de10cbd 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260_edt.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульВызовСервера/Module.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульВызовСервера/Module.bsl" + ] ] ], "name": "ОбщийМодульВызовСервера", diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262.json" index 41295be1e..a2ce9783d 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульПовтИспВызов/Ext/Module.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульПовтИспВызов/Ext/Module.bsl" + ] ] ], "name": "ОбщийМодульПовтИспВызов", diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262_edt.json" index 7f59987e9..d6e94bb22 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262_edt.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульПовтИспВызов/Module.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульПовтИспВызов/Module.bsl" + ] ] ], "name": "ОбщийМодульПовтИспВызов", diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201.json" index 4e5fe7bab..641eb0617 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульПовтИспСеанс/Ext/Module.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульПовтИспСеанс/Ext/Module.bsl" + ] ] ], "name": "ОбщийМодульПовтИспСеанс", diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201_edt.json" index 0916ebf8f..daa239925 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201_edt.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульПовтИспСеанс/Module.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульПовтИспСеанс/Module.bsl" + ] ] ], "name": "ОбщийМодульПовтИспСеанс", diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260.json" index d1f4ad60a..07294e653 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульПолны_еПрава/Ext/Module.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульПолны_еПрава/Ext/Module.bsl" + ] ] ], "name": "ОбщийМодульПолныйеПрава", diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260_edt.json" index ed273d4e9..f6081a039 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260_edt.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульПолны_еПрава/Module.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульПолны_еПрава/Module.bsl" + ] ] ], "name": "ОбщийМодульПолныйеПрава", diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" index d426da907..0e562b658 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Просто_Общи_Модуль/Ext/Module.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Просто_Общи_Модуль/Ext/Module.bsl" + ] ] ], "name": "ПростойОбщийМодуль", diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" index 14b1b369e..b60f49f9c 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Просто_Общи_Модуль/Module.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Просто_Общи_Модуль/Module.bsl" + ] ] ], "name": "ПростойОбщийМодуль", diff --git a/src/test/resources/fixtures/mdclasses/Configuration.json b/src/test/resources/fixtures/mdclasses/Configuration.json index a5b2e0ef2..0cba799de 100644 --- a/src/test/resources/fixtures/mdclasses/Configuration.json +++ b/src/test/resources/fixtures/mdclasses/Configuration.json @@ -1837,16 +1837,22 @@ "modalityUseMode": "USE", "moduleTypes": [ [ - "ExternalConnectionModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Ext/ExternalConnectionModule.bsl" + "SessionModule", + [ + 1 + ] ], [ - "SessionModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Ext/SessionModule.bsl" + "ExternalConnectionModule", + [ + 1 + ] ], [ "ManagedApplicationModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Ext/ManagedApplicationModule.bsl" + [ + 1 + ] ] ], "modules": [ diff --git a/src/test/resources/fixtures/mdclasses/Configuration_edt.json b/src/test/resources/fixtures/mdclasses/Configuration_edt.json index 9c5c534ad..5cb8204b0 100644 --- a/src/test/resources/fixtures/mdclasses/Configuration_edt.json +++ b/src/test/resources/fixtures/mdclasses/Configuration_edt.json @@ -1832,16 +1832,22 @@ "modalityUseMode": "USE", "moduleTypes": [ [ - "ExternalConnectionModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Configuration/ExternalConnectionModule.bsl" + "SessionModule", + [ + 1 + ] ], [ - "SessionModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Configuration/SessionModule.bsl" + "ExternalConnectionModule", + [ + 1 + ] ], [ "ManagedApplicationModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Configuration/ManagedApplicationModule.bsl" + [ + 1 + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.json" "b/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.json" index e21b677d6..c20186008 100644 --- "a/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.json" @@ -13,11 +13,15 @@ "moduleTypes": [ [ "ValueManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Constants/Константа1/Ext/ValueManagerModule.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/Constants/Константа1/Ext/ValueManagerModule.bsl" + ] ], [ "ManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Constants/Константа1/Ext/ManagerModule.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/Constants/Константа1/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601_edt.json" "b/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601_edt.json" index 463f1dde7..c02462f45 100644 --- "a/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Constants.\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601_edt.json" @@ -13,11 +13,15 @@ "moduleTypes": [ [ "ValueManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Constants/Константа1/ValueManagerModule.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/Constants/Константа1/ValueManagerModule.bsl" + ] ], [ "ManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Constants/Константа1/ManagerModule.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/Constants/Константа1/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621.json" "b/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621.json" index f74addb79..524839ef1 100644 --- "a/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621.json" +++ "b/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621.json" @@ -55,7 +55,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/DocumentJournals/ЖурналДокументов1/Ext/ManagerModule.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/DocumentJournals/ЖурналДокументов1/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621_edt.json" "b/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621_edt.json" index 6c4de2477..5ee998f8d 100644 --- "a/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621_edt.json" @@ -55,7 +55,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/DocumentJournals/ЖурналДокументов1/ManagerModule.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/DocumentJournals/ЖурналДокументов1/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.json" "b/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.json" index f5c640e1b..74c25a248 100644 --- "a/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.json" +++ "b/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.json" @@ -1168,12 +1168,16 @@ "mdoType": "DOCUMENT", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021_edt.json" "b/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021_edt.json" index fc97c295d..f989e7dd5 100644 --- "a/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021_edt.json" @@ -1168,12 +1168,16 @@ "mdoType": "DOCUMENT", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651.json" "b/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651.json" index 848ed7fdf..88ff662fe 100644 --- "a/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651.json" +++ "b/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651.json" @@ -162,7 +162,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Enums/Перечисление1/Ext/ManagerModule.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/Enums/Перечисление1/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651_edt.json" "b/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651_edt.json" index 52a0f571e..d8e4ceb58 100644 --- "a/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Enums.\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651_edt.json" @@ -162,7 +162,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Enums/Перечисление1/ManagerModule.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/Enums/Перечисление1/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601.json" "b/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601.json" index 5755a8c03..db5cac44a 100644 --- "a/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601.json" @@ -478,7 +478,9 @@ "moduleTypes": [ [ "ObjectModule", - "src/test/resources/ext/designer/mdclasses/src/cf/ExchangePlans/ПланОбмена1/Ext/ObjectModule.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/ExchangePlans/ПланОбмена1/Ext/ObjectModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601_edt.json" "b/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601_edt.json" index 5450abab8..20b8ce73c 100644 --- "a/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/ExchangePlans.\320\237\320\273\320\260\320\275\320\236\320\261\320\274\320\265\320\275\320\2601_edt.json" @@ -478,7 +478,9 @@ "moduleTypes": [ [ "ObjectModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/ExchangePlans/ПланОбмена1/ObjectModule.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/ExchangePlans/ПланОбмена1/ObjectModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601.json" "b/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601.json" index 1aff5c634..8cddc5318 100644 --- "a/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601.json" @@ -30,7 +30,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/FilterCriteria/Критери_Отбора1/Ext/ManagerModule.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/FilterCriteria/Критери_Отбора1/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601_edt.json" "b/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601_edt.json" index 91464eb9f..c5cc5e205 100644 --- "a/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601_edt.json" @@ -30,7 +30,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/FilterCriteria/Критери_Отбора1/ManagerModule.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/FilterCriteria/Критери_Отбора1/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/HTTPServices.HTTP\320\241\320\265\321\200\320\262\320\270\321\2011.json" "b/src/test/resources/fixtures/mdclasses/HTTPServices.HTTP\320\241\320\265\321\200\320\262\320\270\321\2011.json" index b536eaced..88cab2fd5 100644 --- "a/src/test/resources/fixtures/mdclasses/HTTPServices.HTTP\320\241\320\265\321\200\320\262\320\270\321\2011.json" +++ "b/src/test/resources/fixtures/mdclasses/HTTPServices.HTTP\320\241\320\265\321\200\320\262\320\270\321\2011.json" @@ -10,7 +10,9 @@ "moduleTypes": [ [ "HTTPServiceModule", - "src/test/resources/ext/designer/mdclasses/src/cf/HTTPServices/HTTPСервис1/Ext/Module.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/HTTPServices/HTTPСервис1/Ext/Module.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/HTTPServices.HTTP\320\241\320\265\321\200\320\262\320\270\321\2011_edt.json" "b/src/test/resources/fixtures/mdclasses/HTTPServices.HTTP\320\241\320\265\321\200\320\262\320\270\321\2011_edt.json" index 2a9edc839..5a667525c 100644 --- "a/src/test/resources/fixtures/mdclasses/HTTPServices.HTTP\320\241\320\265\321\200\320\262\320\270\321\2011_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/HTTPServices.HTTP\320\241\320\265\321\200\320\262\320\270\321\2011_edt.json" @@ -10,7 +10,9 @@ "moduleTypes": [ [ "HTTPServiceModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/HTTPServices/HTTPСервис1/Module.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/HTTPServices/HTTPСервис1/Module.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.json" "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.json" index 85379b521..532d75a81 100644 --- "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.json" +++ "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.json" @@ -287,7 +287,9 @@ "moduleTypes": [ [ "RecordSetModule", - "src/test/resources/ext/designer/mdclasses/src/cf/InformationRegisters/РегистрСведени_1/Ext/RecordSetModule.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/InformationRegisters/РегистрСведени_1/Ext/RecordSetModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711_edt.json" "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711_edt.json" index 8e26fba0f..bd8ed7d16 100644 --- "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711_edt.json" @@ -287,7 +287,9 @@ "moduleTypes": [ [ "RecordSetModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/InformationRegisters/РегистрСведени_1/RecordSetModule.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/InformationRegisters/РегистрСведени_1/RecordSetModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021.json" "b/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021.json" index ae7bd2b0b..3c2d26e03 100644 --- "a/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021.json" +++ "b/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021.json" @@ -15,12 +15,16 @@ "mdoType": "REPORT", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021_edt.json" "b/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021_edt.json" index 308c5b261..ff025e06e 100644 --- "a/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021_edt.json" @@ -15,12 +15,16 @@ "mdoType": "REPORT", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141.json" "b/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141.json" index c1939c313..2a353227c 100644 --- "a/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141.json" +++ "b/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141.json" @@ -78,7 +78,9 @@ "moduleTypes": [ [ "RecordSetModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Sequences/Последовательность1/Ext/RecordSetModule.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/Sequences/Последовательность1/Ext/RecordSetModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141_edt.json" "b/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141_edt.json" index 6167b6724..dfd9c3b2b 100644 --- "a/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141_edt.json" @@ -78,7 +78,9 @@ "moduleTypes": [ [ "RecordSetModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Sequences/Последовательность1/RecordSetModule.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/Sequences/Последовательность1/RecordSetModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/WebServices.Web\320\241\320\265\321\200\320\262\320\270\321\2011.json" "b/src/test/resources/fixtures/mdclasses/WebServices.Web\320\241\320\265\321\200\320\262\320\270\321\2011.json" index 2096d249f..c111b6094 100644 --- "a/src/test/resources/fixtures/mdclasses/WebServices.Web\320\241\320\265\321\200\320\262\320\270\321\2011.json" +++ "b/src/test/resources/fixtures/mdclasses/WebServices.Web\320\241\320\265\321\200\320\262\320\270\321\2011.json" @@ -11,7 +11,9 @@ "moduleTypes": [ [ "WEBServiceModule", - "src/test/resources/ext/designer/mdclasses/src/cf/WebServices/WebСервис1/Ext/Module.bsl" + [ + "src/test/resources/ext/designer/mdclasses/src/cf/WebServices/WebСервис1/Ext/Module.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses/WebServices.Web\320\241\320\265\321\200\320\262\320\270\321\2011_edt.json" "b/src/test/resources/fixtures/mdclasses/WebServices.Web\320\241\320\265\321\200\320\262\320\270\321\2011_edt.json" index da0988870..1e0bfcf02 100644 --- "a/src/test/resources/fixtures/mdclasses/WebServices.Web\320\241\320\265\321\200\320\262\320\270\321\2011_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/WebServices.Web\320\241\320\265\321\200\320\262\320\270\321\2011_edt.json" @@ -11,7 +11,9 @@ "moduleTypes": [ [ "WEBServiceModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/WebServices/WebСервис1/Module.bsl" + [ + "src/test/resources/ext/edt/mdclasses/configuration/src/WebServices/WebСервис1/Module.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses_3_18/Bots.\320\221\320\276\321\2021.json" "b/src/test/resources/fixtures/mdclasses_3_18/Bots.\320\221\320\276\321\2021.json" index 3c26f07ff..2fa472ae8 100644 --- "a/src/test/resources/fixtures/mdclasses_3_18/Bots.\320\221\320\276\321\2021.json" +++ "b/src/test/resources/fixtures/mdclasses_3_18/Bots.\320\221\320\276\321\2021.json" @@ -10,7 +10,9 @@ "moduleTypes": [ [ "BotModule", - "src/test/resources/ext/designer/mdclasses_3_18/src/cf/Bots/Бот1/Ext/Module.bsl" + [ + "src/test/resources/ext/designer/mdclasses_3_18/src/cf/Bots/Бот1/Ext/Module.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses_3_18/Bots.\320\221\320\276\321\2021_edt.json" "b/src/test/resources/fixtures/mdclasses_3_18/Bots.\320\221\320\276\321\2021_edt.json" index e778220ab..c1aa69e3c 100644 --- "a/src/test/resources/fixtures/mdclasses_3_18/Bots.\320\221\320\276\321\2021_edt.json" +++ "b/src/test/resources/fixtures/mdclasses_3_18/Bots.\320\221\320\276\321\2021_edt.json" @@ -10,7 +10,9 @@ "moduleTypes": [ [ "BotModule", - "src/test/resources/ext/edt/mdclasses_3_18/configuration/src/Bots/Бот1/Module.bsl" + [ + "src/test/resources/ext/edt/mdclasses_3_18/configuration/src/Bots/Бот1/Module.bsl" + ] ] ], "modules": [ diff --git a/src/test/resources/fixtures/mdclasses_3_18/Configuration.json b/src/test/resources/fixtures/mdclasses_3_18/Configuration.json index fe462ad0a..cebb7516b 100644 --- a/src/test/resources/fixtures/mdclasses_3_18/Configuration.json +++ b/src/test/resources/fixtures/mdclasses_3_18/Configuration.json @@ -363,7 +363,9 @@ "moduleTypes": [ [ "ManagedApplicationModule", - "src/test/resources/ext/designer/mdclasses_3_18/src/cf/Ext/ManagedApplicationModule.bsl" + [ + 1 + ] ] ], "modules": [ diff --git a/src/test/resources/fixtures/mdclasses_3_18/Configuration_edt.json b/src/test/resources/fixtures/mdclasses_3_18/Configuration_edt.json index 7d4dca64a..0e3b7e8ac 100644 --- a/src/test/resources/fixtures/mdclasses_3_18/Configuration_edt.json +++ b/src/test/resources/fixtures/mdclasses_3_18/Configuration_edt.json @@ -363,7 +363,9 @@ "moduleTypes": [ [ "ManagedApplicationModule", - "src/test/resources/ext/edt/mdclasses_3_18/configuration/src/Configuration/ManagedApplicationModule.bsl" + [ + 1 + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses_3_18/IntegrationServices.\320\241\320\265\321\200\320\262\320\270\321\201\320\230\320\275\321\202\320\265\320\263\321\200\320\260\321\206\320\270\320\2701.json" "b/src/test/resources/fixtures/mdclasses_3_18/IntegrationServices.\320\241\320\265\321\200\320\262\320\270\321\201\320\230\320\275\321\202\320\265\320\263\321\200\320\260\321\206\320\270\320\2701.json" index c33ba096e..d94bf565c 100644 --- "a/src/test/resources/fixtures/mdclasses_3_18/IntegrationServices.\320\241\320\265\321\200\320\262\320\270\321\201\320\230\320\275\321\202\320\265\320\263\321\200\320\260\321\206\320\270\320\2701.json" +++ "b/src/test/resources/fixtures/mdclasses_3_18/IntegrationServices.\320\241\320\265\321\200\320\262\320\270\321\201\320\230\320\275\321\202\320\265\320\263\321\200\320\260\321\206\320\270\320\2701.json" @@ -58,7 +58,9 @@ "moduleTypes": [ [ "IntegrationServiceModule", - "src/test/resources/ext/designer/mdclasses_3_18/src/cf/IntegrationServices/СервисИнтеграции1/Ext/Module.bsl" + [ + "src/test/resources/ext/designer/mdclasses_3_18/src/cf/IntegrationServices/СервисИнтеграции1/Ext/Module.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses_3_18/IntegrationServices.\320\241\320\265\321\200\320\262\320\270\321\201\320\230\320\275\321\202\320\265\320\263\321\200\320\260\321\206\320\270\320\2701_edt.json" "b/src/test/resources/fixtures/mdclasses_3_18/IntegrationServices.\320\241\320\265\321\200\320\262\320\270\321\201\320\230\320\275\321\202\320\265\320\263\321\200\320\260\321\206\320\270\320\2701_edt.json" index 55af459ae..cf4e47ac6 100644 --- "a/src/test/resources/fixtures/mdclasses_3_18/IntegrationServices.\320\241\320\265\321\200\320\262\320\270\321\201\320\230\320\275\321\202\320\265\320\263\321\200\320\260\321\206\320\270\320\2701_edt.json" +++ "b/src/test/resources/fixtures/mdclasses_3_18/IntegrationServices.\320\241\320\265\321\200\320\262\320\270\321\201\320\230\320\275\321\202\320\265\320\263\321\200\320\260\321\206\320\270\320\2701_edt.json" @@ -58,7 +58,9 @@ "moduleTypes": [ [ "IntegrationServiceModule", - "src/test/resources/ext/edt/mdclasses_3_18/configuration/src/IntegrationServices/СервисИнтеграции1/Module.bsl" + [ + "src/test/resources/ext/edt/mdclasses_3_18/configuration/src/IntegrationServices/СервисИнтеграции1/Module.bsl" + ] ] ], "modules": [ diff --git a/src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json b/src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json index e95d71436..f083d67a8 100644 --- a/src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json +++ b/src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json @@ -1827,16 +1827,22 @@ "modalityUseMode": "USE_WITH_WARNINGS", "moduleTypes": [ [ - "ExternalConnectionModule", - "src/test/resources/ext/edt/mdclasses_3_24/configuration/src/Configuration/ExternalConnectionModule.bsl" + "SessionModule", + [ + 1 + ] ], [ - "SessionModule", - "src/test/resources/ext/edt/mdclasses_3_24/configuration/src/Configuration/SessionModule.bsl" + "ExternalConnectionModule", + [ + 1 + ] ], [ "ManagedApplicationModule", - "src/test/resources/ext/edt/mdclasses_3_24/configuration/src/Configuration/ManagedApplicationModule.bsl" + [ + 1 + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses_3_27/WebSocketClient.WebSocket\320\232\320\273\320\270\320\265\320\275\321\2021.json" "b/src/test/resources/fixtures/mdclasses_3_27/WebSocketClient.WebSocket\320\232\320\273\320\270\320\265\320\275\321\2021.json" index 5e68d27ec..97fbad009 100644 --- "a/src/test/resources/fixtures/mdclasses_3_27/WebSocketClient.WebSocket\320\232\320\273\320\270\320\265\320\275\321\2021.json" +++ "b/src/test/resources/fixtures/mdclasses_3_27/WebSocketClient.WebSocket\320\232\320\273\320\270\320\265\320\275\321\2021.json" @@ -11,7 +11,9 @@ "moduleTypes": [ [ "WEBSocketClientModule", - "src/test/resources/ext/designer/mdclasses_3_27/src/cf/WebSocketClients/WebSocketКлиент1/Ext/Module.bsl" + [ + "src/test/resources/ext/designer/mdclasses_3_27/src/cf/WebSocketClients/WebSocketКлиент1/Ext/Module.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/mdclasses_3_27/WebSocketClient.WebSocket\320\232\320\273\320\270\320\265\320\275\321\2021_edt.json" "b/src/test/resources/fixtures/mdclasses_3_27/WebSocketClient.WebSocket\320\232\320\273\320\270\320\265\320\275\321\2021_edt.json" index 962d1b79c..c9034df86 100644 --- "a/src/test/resources/fixtures/mdclasses_3_27/WebSocketClient.WebSocket\320\232\320\273\320\270\320\265\320\275\321\2021_edt.json" +++ "b/src/test/resources/fixtures/mdclasses_3_27/WebSocketClient.WebSocket\320\232\320\273\320\270\320\265\320\275\321\2021_edt.json" @@ -11,7 +11,9 @@ "moduleTypes": [ [ "WEBSocketClientModule", - "src/test/resources/ext/edt/mdclasses_3_27/configuration/src/WebSocketClients/WebSocketКлиент1/Module.bsl" + [ + "src/test/resources/ext/edt/mdclasses_3_27/configuration/src/WebSocketClients/WebSocketКлиент1/Module.bsl" + ] ] ], "modules": [ diff --git a/src/test/resources/fixtures/mdclasses_5_1/Configuration.json b/src/test/resources/fixtures/mdclasses_5_1/Configuration.json index 32489d012..0fb231421 100644 --- a/src/test/resources/fixtures/mdclasses_5_1/Configuration.json +++ b/src/test/resources/fixtures/mdclasses_5_1/Configuration.json @@ -363,7 +363,9 @@ "moduleTypes": [ [ "ManagedApplicationModule", - "src/test/resources/ext/designer/mdclasses_5_1/src/cf/Ext/ManagedApplicationModule.bsl" + [ + 1 + ] ] ], "modules": [ diff --git a/src/test/resources/fixtures/mdclasses_unknown/Configuration_edt.json b/src/test/resources/fixtures/mdclasses_unknown/Configuration_edt.json index f0512ca5f..48beb1af9 100644 --- a/src/test/resources/fixtures/mdclasses_unknown/Configuration_edt.json +++ b/src/test/resources/fixtures/mdclasses_unknown/Configuration_edt.json @@ -99,7 +99,9 @@ "moduleTypes": [ [ "ManagedApplicationModule", - "src/test/resources/ext/edt/mdclasses_unknown/configuration/src/Configuration/ManagedApplicationModule.bsl" + [ + 1 + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" "b/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" index e9a99efa7..36dd58217 100644 --- "a/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" +++ "b/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" @@ -5296,12 +5296,16 @@ "mdoType": "BUSINESS_PROCESS", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Ext/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Ext/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Ext/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" "b/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" index 28e5b6bcd..ced70c101 100644 --- "a/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" @@ -5258,12 +5258,16 @@ "mdoType": "BUSINESS_PROCESS", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262.json" "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262.json" index f75d45e48..da9a49f43 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262.json" @@ -2968,12 +2968,16 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/ВерсииФа_лов/Ext/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/ВерсииФа_лов/Ext/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/ВерсииФа_лов/Ext/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/ВерсииФа_лов/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262_edt.json" index 77bc14de2..5fc7c90d1 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\222\320\265\321\200\321\201\320\270\320\270\320\244\320\260\320\271\320\273\320\276\320\262_edt.json" @@ -2968,12 +2968,16 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/ВерсииФа_лов/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/ВерсииФа_лов/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/ВерсииФа_лов/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/ВерсииФа_лов/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" index 320f21b12..c00d475a5 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" @@ -2375,12 +2375,16 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/Заметки/Ext/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/Заметки/Ext/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/Заметки/Ext/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/Catalogs/Заметки/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" index fd125cafa..3cecafefc 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" @@ -2347,12 +2347,16 @@ "mdoType": "CATALOG", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/Заметки/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/Заметки/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/Заметки/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Catalogs/Заметки/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" "b/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" index 2ca86ab9f..ec1b92af1 100644 --- "a/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" @@ -6030,12 +6030,16 @@ "mdoType": "CHART_OF_CHARACTERISTIC_TYPES", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Ext/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Ext/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Ext/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" index 115aa703c..c772d3a77 100644 --- "a/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" @@ -6006,12 +6006,16 @@ "mdoType": "CHART_OF_CHARACTERISTIC_TYPES", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/CommonCommands.\320\236\321\202\320\277\321\200\320\260\320\262\320\270\321\202\321\214\320\237\320\270\321\201\321\214\320\274\320\276.json" "b/src/test/resources/fixtures/ssl_3_1/CommonCommands.\320\236\321\202\320\277\321\200\320\260\320\262\320\270\321\202\321\214\320\237\320\270\321\201\321\214\320\274\320\276.json" index 8c7fa9d63..fec8d73b3 100644 --- "a/src/test/resources/fixtures/ssl_3_1/CommonCommands.\320\236\321\202\320\277\321\200\320\260\320\262\320\270\321\202\321\214\320\237\320\270\321\201\321\214\320\274\320\276.json" +++ "b/src/test/resources/fixtures/ssl_3_1/CommonCommands.\320\236\321\202\320\277\321\200\320\260\320\262\320\270\321\202\321\214\320\237\320\270\321\201\321\214\320\274\320\276.json" @@ -10,7 +10,9 @@ "moduleTypes": [ [ "CommandModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/CommonCommands/ОтправитьПисьмо/Ext/CommandModule.bsl" + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/CommonCommands/ОтправитьПисьмо/Ext/CommandModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/CommonCommands.\320\236\321\202\320\277\321\200\320\260\320\262\320\270\321\202\321\214\320\237\320\270\321\201\321\214\320\274\320\276_edt.json" "b/src/test/resources/fixtures/ssl_3_1/CommonCommands.\320\236\321\202\320\277\321\200\320\260\320\262\320\270\321\202\321\214\320\237\320\270\321\201\321\214\320\274\320\276_edt.json" index 9e432ee70..5a0e82882 100644 --- "a/src/test/resources/fixtures/ssl_3_1/CommonCommands.\320\236\321\202\320\277\321\200\320\260\320\262\320\270\321\202\321\214\320\237\320\270\321\201\321\214\320\274\320\276_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/CommonCommands.\320\236\321\202\320\277\321\200\320\260\320\262\320\270\321\202\321\214\320\237\320\270\321\201\321\214\320\274\320\276_edt.json" @@ -10,7 +10,9 @@ "moduleTypes": [ [ "CommandModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/CommonCommands/ОтправитьПисьмо/CommandModule.bsl" + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/CommonCommands/ОтправитьПисьмо/CommandModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201.json" "b/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201.json" index c8f583a4c..e029b3aac 100644 --- "a/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201.json" +++ "b/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201.json" @@ -327,7 +327,9 @@ "moduleTypes": [ [ "FormModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/CommonForms/Вопрос/Ext/Form/Module.bsl" + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/CommonForms/Вопрос/Ext/Form/Module.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201_edt.json" "b/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201_edt.json" index a00ccc779..ffa7135ff 100644 --- "a/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/CommonForms.\320\222\320\276\320\277\321\200\320\276\321\201_edt.json" @@ -327,7 +327,9 @@ "moduleTypes": [ [ "FormModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/CommonForms/Вопрос/Module.bsl" + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/CommonForms/Вопрос/Module.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/CommonModules.\320\220\320\262\321\202\320\276\320\275\320\276\320\274\320\275\320\260\321\217\320\240\320\260\320\261\320\276\321\202\320\260.json" "b/src/test/resources/fixtures/ssl_3_1/CommonModules.\320\220\320\262\321\202\320\276\320\275\320\276\320\274\320\275\320\260\321\217\320\240\320\260\320\261\320\276\321\202\320\260.json" index 4ad936665..dfef8bbef 100644 --- "a/src/test/resources/fixtures/ssl_3_1/CommonModules.\320\220\320\262\321\202\320\276\320\275\320\276\320\274\320\275\320\260\321\217\320\240\320\260\320\261\320\276\321\202\320\260.json" +++ "b/src/test/resources/fixtures/ssl_3_1/CommonModules.\320\220\320\262\321\202\320\276\320\275\320\276\320\274\320\275\320\260\321\217\320\240\320\260\320\261\320\276\321\202\320\260.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/CommonModules/АвтономнаяРабота/Ext/Module.bsl" + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/CommonModules/АвтономнаяРабота/Ext/Module.bsl" + ] ] ], "name": "АвтономнаяРабота", diff --git "a/src/test/resources/fixtures/ssl_3_1/CommonModules.\320\220\320\262\321\202\320\276\320\275\320\276\320\274\320\275\320\260\321\217\320\240\320\260\320\261\320\276\321\202\320\260_edt.json" "b/src/test/resources/fixtures/ssl_3_1/CommonModules.\320\220\320\262\321\202\320\276\320\275\320\276\320\274\320\275\320\260\321\217\320\240\320\260\320\261\320\276\321\202\320\260_edt.json" index f5179078f..2a1b586a3 100644 --- "a/src/test/resources/fixtures/ssl_3_1/CommonModules.\320\220\320\262\321\202\320\276\320\275\320\276\320\274\320\275\320\260\321\217\320\240\320\260\320\261\320\276\321\202\320\260_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/CommonModules.\320\220\320\262\321\202\320\276\320\275\320\276\320\274\320\275\320\260\321\217\320\240\320\260\320\261\320\276\321\202\320\260_edt.json" @@ -15,7 +15,9 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/CommonModules/АвтономнаяРабота/Module.bsl" + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/CommonModules/АвтономнаяРабота/Module.bsl" + ] ] ], "name": "АвтономнаяРабота", diff --git "a/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" "b/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" index 4edd36dd8..6e2c0feb2 100644 --- "a/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" +++ "b/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" @@ -1960,12 +1960,16 @@ "mdoType": "DATA_PROCESSOR", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Ext/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Ext/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Ext/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/DataProcessors/ЗагрузкаКурсовВалют/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" "b/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" index 39cbf4f74..3973176f3 100644 --- "a/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" @@ -1960,12 +1960,16 @@ "mdoType": "DATA_PROCESSOR", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/DataProcessors/ЗагрузкаКурсовВалют/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" "b/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" index 71a3935bf..261db998c 100644 --- "a/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" @@ -8545,7 +8545,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Ext/ManagerModule.bsl" + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" index ec34727eb..b81ae2b14 100644 --- "a/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" @@ -8545,7 +8545,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/ManagerModule.bsl" + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" "b/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" index cd7e76249..8a7cb56d8 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" @@ -2482,12 +2482,16 @@ "mdoType": "DOCUMENT", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/Documents/Анкета/Ext/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/Documents/Анкета/Ext/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/Documents/Анкета/Ext/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/Documents/Анкета/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" index f1ef5a399..0bfacee81 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" @@ -2474,12 +2474,16 @@ "mdoType": "DOCUMENT", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217.json" "b/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217.json" index 564fc3c42..4bdba587d 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217.json" @@ -292,7 +292,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/Enums/СтатусыОбработчиковОбновления/Ext/ManagerModule.bsl" + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/Enums/СтатусыОбработчиковОбновления/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217_edt.json" index d27f88c42..4a6cfd125 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Enums.\320\241\321\202\320\260\321\202\321\203\321\201\321\213\320\236\320\261\321\200\320\260\320\261\320\276\321\202\321\207\320\270\320\272\320\276\320\262\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217_edt.json" @@ -292,7 +292,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Enums/СтатусыОбработчиковОбновления/ManagerModule.bsl" + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Enums/СтатусыОбработчиковОбновления/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" "b/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" index c29f05789..eea8b687a 100644 --- "a/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" +++ "b/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" @@ -3325,12 +3325,16 @@ "mdoType": "EXCHANGE_PLAN", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" "b/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" index 01a3d3d02..9f203477e 100644 --- "a/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" @@ -3325,12 +3325,16 @@ "mdoType": "EXCHANGE_PLAN", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" index adf10304e..7fae8e3cc 100644 --- "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" +++ "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" @@ -357,7 +357,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/InformationRegisters/ЭлектронныеПодписи/Ext/ManagerModule.bsl" + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/InformationRegisters/ЭлектронныеПодписи/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" index 3128484d9..cddf83312 100644 --- "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" @@ -357,7 +357,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/InformationRegisters/ЭлектронныеПодписи/ManagerModule.bsl" + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/InformationRegisters/ЭлектронныеПодписи/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" "b/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" index 7da2c688f..46698c5f5 100644 --- "a/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" +++ "b/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" @@ -9460,7 +9460,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Ext/ManagerModule.bsl" + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" "b/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" index 5e7978833..74a9d4ee4 100644 --- "a/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" @@ -9460,7 +9460,9 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/ManagerModule.bsl" + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" "b/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" index e01aa1a7e..a05581fed 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" @@ -7136,12 +7136,16 @@ "mdoType": "TASK", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ManagerModule.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" index 95ae76464..7434fe9ff 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" @@ -7119,12 +7119,16 @@ "mdoType": "TASK", "moduleTypes": [ [ - "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ManagerModule.bsl" + "ObjectModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ObjectModule.bsl" + ] ], [ - "ObjectModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ObjectModule.bsl" + "ManagerModule", + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ManagerModule.bsl" + ] ] ], "modules": [ diff --git a/src/test/resources/fixtures/ssl_3_1/WebServices.EnterpriseDataExchange_1_0_1_1.json b/src/test/resources/fixtures/ssl_3_1/WebServices.EnterpriseDataExchange_1_0_1_1.json index 4749f0f1b..a9c9cace2 100644 --- a/src/test/resources/fixtures/ssl_3_1/WebServices.EnterpriseDataExchange_1_0_1_1.json +++ b/src/test/resources/fixtures/ssl_3_1/WebServices.EnterpriseDataExchange_1_0_1_1.json @@ -11,7 +11,9 @@ "moduleTypes": [ [ "WEBServiceModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/WebServices/EnterpriseDataExchange_1_0_1_1/Ext/Module.bsl" + [ + "src/test/resources/ext/designer/ssl_3_1/src/cf/WebServices/EnterpriseDataExchange_1_0_1_1/Ext/Module.bsl" + ] ] ], "modules": [ diff --git a/src/test/resources/fixtures/ssl_3_1/WebServices.EnterpriseDataExchange_1_0_1_1_edt.json b/src/test/resources/fixtures/ssl_3_1/WebServices.EnterpriseDataExchange_1_0_1_1_edt.json index a6c12d8cd..3dc3d6b23 100644 --- a/src/test/resources/fixtures/ssl_3_1/WebServices.EnterpriseDataExchange_1_0_1_1_edt.json +++ b/src/test/resources/fixtures/ssl_3_1/WebServices.EnterpriseDataExchange_1_0_1_1_edt.json @@ -11,7 +11,9 @@ "moduleTypes": [ [ "WEBServiceModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/WebServices/EnterpriseDataExchange_1_0_1_1/Module.bsl" + [ + "src/test/resources/ext/edt/ssl_3_1/configuration/src/WebServices/EnterpriseDataExchange_1_0_1_1/Module.bsl" + ] ] ], "modules": [ diff --git "a/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/.project" "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/.project" new file mode 100644 index 000000000..8650c2ab7 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/.project" @@ -0,0 +1,18 @@ + + + Конфигурация + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + + org.eclipse.xtext.ui.shared.xtextNature + com._1c.g5.v8.dt.core.V8ConfigurationNature + + diff --git "a/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/DT-INF/PROJECT.PMF" "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/DT-INF/PROJECT.PMF" new file mode 100644 index 000000000..6192698a7 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/DT-INF/PROJECT.PMF" @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 +Runtime-Version: 8.3.27 diff --git "a/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.mdo" "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.mdo" new file mode 100644 index 000000000..c37b32278 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.mdo" @@ -0,0 +1,33 @@ + + + + + + + + + + Справочник1 + + ru + Справочник1 + + true + Catalog.Справочник1.StandardAttribute.Code + Catalog.Справочник1.StandardAttribute.Description + DontUse + Use + Managed + Use + 2 + true + 9 + 25 + String + Variable + true + true + AsDescription + InDialog + BothWays + diff --git "a/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" new file mode 100644 index 000000000..b871efc06 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" @@ -0,0 +1,164 @@ + + + + Код + 1 + true + true + + true + + + Объект.Code + + + КодРасширеннаяПодсказка + 3 + Label + true + true + + Left + + + + КодКонтекстноеМеню + 2 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Наименование + 4 + true + true + + true + + + Объект.Description + + + НаименованиеРасширеннаяПодсказка + 6 + Label + true + true + + Left + + + + НаименованиеКонтекстноеМеню + 5 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Реквизит + 7 + true + true + + true + + + Объект.Реквизит + + + РеквизитРасширеннаяПодсказка + 9 + Label + true + true + + Left + + + + РеквизитКонтекстноеМеню + 8 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + ФормаКоманднаяПанель + -1 + Left + true + + LockOwnerWindow + true + true + true + Vertical + true + true + true + true + true + + Объект + 1 + + CatalogObject.Справочник2 + + + true + + + true + +
true
+ true + + + + + + + + OnWriteAtServer + ПриЗаписиНаСервере + + + diff --git "a/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" new file mode 100644 index 000000000..43553ac86 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" @@ -0,0 +1,5 @@ + +&НаСервере +Процедура ПриЗаписиНаСервере(Отказ, ТекущийОбъект, ПараметрыЗаписи) + //TODO: Вставить содержимое обработчика +КонецПроцедуры diff --git "a/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722.mdo" "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722.mdo" new file mode 100644 index 000000000..e915b2408 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722.mdo" @@ -0,0 +1,61 @@ + + + + + + + + + + Справочник2 + + ru + Справочник2 + + true + Catalog.Справочник2.StandardAttribute.Code + Catalog.Справочник2.StandardAttribute.Description + DontUse + Use + Managed + Use + 2 + true + 9 + 25 + String + Variable + true + true + AsDescription + InDialog + BothWays + Catalog.Справочник2.Form.ФормаЭлемента + + Реквизит + + ru + Реквизит + + + String + + 10 + + + + + + Use + Use + + + ФормаЭлемента + + ru + Форма элемента + + PersonalComputer + MobileDevice + + diff --git "a/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/CommandInterface.cmi" "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/CommandInterface.cmi" new file mode 100644 index 000000000..0cf6de8a4 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/CommandInterface.cmi" @@ -0,0 +1,2 @@ + + diff --git "a/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/Configuration.mdo" "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/Configuration.mdo" new file mode 100644 index 000000000..4db1a8b3a --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/Configuration.mdo" @@ -0,0 +1,45 @@ + + + Конфигурация + + ru + Конфигурация + + + + + + + + + ManagedApplication + PersonalComputer + Russian + + + true + + + OSBackup + true + + + Language.Русский + Managed + NotAutoFree + DontUse + DontUse + 8.3.27 + + Русский + + ru + Русский + + ru + + Catalog.Справочник1 + Catalog.Справочник2 + Document.Документ1 + Enum.Перечисление1 + diff --git "a/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/MainSectionCommandInterface.cmi" "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/MainSectionCommandInterface.cmi" new file mode 100644 index 000000000..0cf6de8a4 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/MainSectionCommandInterface.cmi" @@ -0,0 +1,2 @@ + + diff --git "a/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/ManagedApplicationModule.bsl" "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/ManagedApplicationModule.bsl" new file mode 100644 index 000000000..383216233 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/ManagedApplicationModule.bsl" @@ -0,0 +1,9 @@ + +Процедура ПриЗавершенииРаботыСистемы() + //TODO: Вставить содержимое обработчика +КонецПроцедуры + +Процедура ПередНачаломРаботыСистемы(Отказ) + //TODO: Вставить содержимое обработчика +КонецПроцедуры + diff --git "a/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/SessionModule.bsl" "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Configuration/SessionModule.bsl" new file mode 100644 index 000000000..e69de29bb diff --git "a/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.mdo" "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.mdo" new file mode 100644 index 000000000..a3e6f81a5 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.mdo" @@ -0,0 +1,28 @@ + + + + + + + + + + Документ1 + + ru + Документ1 + + true + Document.Документ1.StandardAttribute.Number + DontUse + Use + Managed + Use + String + 9 + Variable + true + true + true + true + diff --git "a/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Enums/\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651/\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651.mdo" "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Enums/\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651/\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651.mdo" new file mode 100644 index 000000000..e289da21d --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\232\320\276\320\275\321\204\320\270\320\263\321\203\321\200\320\260\321\206\320\270\321\217/src/Enums/\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651/\320\237\320\265\321\200\320\265\321\207\320\270\321\201\320\273\320\265\320\275\320\270\320\2651.mdo" @@ -0,0 +1,15 @@ + + + + + + + + Перечисление1 + + ru + Перечисление1 + + true + BothWays + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.project" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.project" new file mode 100644 index 000000000..bc2277ad2 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.project" @@ -0,0 +1,18 @@ + + + Расширение1 + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + + org.eclipse.xtext.ui.shared.xtextNature + com._1c.g5.v8.dt.core.V8ExtensionNature + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/DT-INF/PROJECT.PMF" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/DT-INF/PROJECT.PMF" new file mode 100644 index 000000000..341bde6e5 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/DT-INF/PROJECT.PMF" @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Runtime-Version: 8.3.27 +Base-Project: Конфигурация diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" new file mode 100644 index 000000000..faa0238e4 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" @@ -0,0 +1,366 @@ + + + + Код + 1 + true + true + + true + + + Объект.Code + + + КодРасширеннаяПодсказка + 3 + Label + true + true + + Left + + + + КодКонтекстноеМеню + 2 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Наименование + 4 + true + true + + true + + + Объект.Description + + + НаименованиеРасширеннаяПодсказка + 6 + Label + true + true + + Left + + + + НаименованиеКонтекстноеМеню + 5 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Реквизит + 7 + true + true + + true + + + Объект.Реквизит + + + РеквизитРасширеннаяПодсказка + 9 + Label + true + true + + Left + + + + РеквизитКонтекстноеМеню + 8 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + ТабличнаяЧасть1 + 10 + true + true + + true + + + Объект.ТабличнаяЧасть1 + + None + + ТабличнаяЧасть1НомерСтроки + 23 + true + true + + true + + + Объект.ТабличнаяЧасть1.LineNumber + + + ТабличнаяЧасть1НомерСтрокиРасширеннаяПодсказка + 25 + Label + true + true + + Left + + + + ТабличнаяЧасть1НомерСтрокиКонтекстноеМеню + 24 + true + + LabelField + EnterOnInput + true + Left + true + + true + true + + + + ТабличнаяЧасть1Реквизит1 + 26 + true + true + + true + + + Объект.ТабличнаяЧасть1.Реквизит1 + + + ТабличнаяЧасть1Реквизит1РасширеннаяПодсказка + 28 + Label + true + true + + Left + + + + ТабличнаяЧасть1Реквизит1КонтекстноеМеню + 27 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + ТабличнаяЧасть1КоманднаяПанель + 12 + Left + true + + + ТабличнаяЧасть1СтрокаПоиска + 14 + + ТабличнаяЧасть1СтрокаПоискаРасширеннаяПодсказка + 16 + Label + true + true + + Left + + + + ТабличнаяЧасть1СтрокаПоискаКонтекстноеМеню + 15 + true + + ТабличнаяЧасть1 + + true + + + + ТабличнаяЧасть1СостояниеПросмотра + 17 + + ТабличнаяЧасть1СостояниеПросмотраРасширеннаяПодсказка + 19 + Label + true + true + + Left + + + + ТабличнаяЧасть1СостояниеПросмотраКонтекстноеМеню + 18 + true + + ViewStatusAddition + ТабличнаяЧасть1 + + true + + + + ТабличнаяЧасть1УправлениеПоиском + 20 + + ТабличнаяЧасть1УправлениеПоискомРасширеннаяПодсказка + 22 + Label + true + true + + Left + + + + ТабличнаяЧасть1УправлениеПоискомКонтекстноеМеню + 21 + true + + SearchControlAddition + ТабличнаяЧасть1 + + true + + + + ТабличнаяЧасть1РасширеннаяПодсказка + 13 + Label + true + true + + Left + + + + ТабличнаяЧасть1КонтекстноеМеню + 11 + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + true + Auto + Auto + true + true + true + true + AsFileRef + + + ФормаКоманднаяПанель + -1 + Left + true + + LockOwnerWindow + true + true + true + Vertical + true + true + true + true + true + + Объект + 1 + + CatalogObject.Расш1_Справочник3 + + + true + + + true + +
true
+ true + + + + + + + + OnWriteAtServer + ПриЗаписиНаСервере + + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" new file mode 100644 index 000000000..43553ac86 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" @@ -0,0 +1,5 @@ + +&НаСервере +Процедура ПриЗаписиНаСервере(Отказ, ТекущийОбъект, ПараметрыЗаписи) + //TODO: Вставить содержимое обработчика +КонецПроцедуры diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723.mdo" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723.mdo" new file mode 100644 index 000000000..32126d24f --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723.mdo" @@ -0,0 +1,89 @@ + + + + + + + + + + Расш1_Справочник3 + + ru + Справочник3 + + true + Catalog.Расш1_Справочник3.StandardAttribute.Code + Catalog.Расш1_Справочник3.StandardAttribute.Description + DontUse + Use + Use + 2 + true + 9 + 25 + String + Variable + true + true + AsDescription + InDialog + BothWays + Catalog.Расш1_Справочник3.Form.ФормаЭлемента + + Реквизит + + ru + Реквизит + + + String + + 10 + + + + + + Use + Use + + + + + + + ТабличнаяЧасть1 + + ru + Табличная часть1 + + + Реквизит1 + + ru + Реквизит1 + + + String + + 10 + + + + + Use + Use + + 9 + + + ФормаЭлемента + + ru + Форма элемента + + PersonalComputer + MobileDevice + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/CommandInterface.cmi" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/CommandInterface.cmi" new file mode 100644 index 000000000..0cf6de8a4 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/CommandInterface.cmi" @@ -0,0 +1,2 @@ + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/Configuration.mdo" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/Configuration.mdo" new file mode 100644 index 000000000..6c3316f58 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/Configuration.mdo" @@ -0,0 +1,49 @@ + + + Расширение1 + + ru + Расширение1 + + Adopted + + Checked + Checked + Extended + Extended + Checked + Checked + Checked + Extended + Extended + + + + + + + + + true + Расш1_ + 8.3.27 + Customization + ManagedApplication + PersonalComputer + Russian + Role.Расш1_ОсновнаяРоль + Language.Русский + 8.3.27 + + Русский + Adopted + + Checked + + ru + + Role.Расш1_ОсновнаяРоль + Constant.Расш1_Константа1 + Catalog.Расш1_Справочник3 + Document.Документ1 + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/MainSectionCommandInterface.cmi" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/MainSectionCommandInterface.cmi" new file mode 100644 index 000000000..0cf6de8a4 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/MainSectionCommandInterface.cmi" @@ -0,0 +1,2 @@ + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Constants/\320\240\320\260\321\201\321\2101_\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601/\320\240\320\260\321\201\321\2101_\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.mdo" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Constants/\320\240\320\260\321\201\321\2101_\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601/\320\240\320\260\321\201\321\2101_\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.mdo" new file mode 100644 index 000000000..7cf5aaa19 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Constants/\320\240\320\260\321\201\321\2101_\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601/\320\240\320\260\321\201\321\2101_\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.mdo" @@ -0,0 +1,23 @@ + + + + + + + + Расш1_Константа1 + + ru + Константа1 + + + String + + 10 + + + true + + + Managed + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/Forms/\320\240\320\260\321\201\321\2101_\320\244\320\276\321\200\320\274\320\260\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\260/Form.form" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/Forms/\320\240\320\260\321\201\321\2101_\320\244\320\276\321\200\320\274\320\260\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\260/Form.form" new file mode 100644 index 000000000..02eff1f8c --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/Forms/\320\240\320\260\321\201\321\2101_\320\244\320\276\321\200\320\274\320\260\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\260/Form.form" @@ -0,0 +1,127 @@ + + + + Номер + 1 + true + true + + true + + + Объект.Number + + + НомерРасширеннаяПодсказка + 3 + Label + true + true + + Left + + + + НомерКонтекстноеМеню + 2 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Дата + 4 + true + true + + true + + + Объект.Date + + + ДатаРасширеннаяПодсказка + 6 + Label + true + true + + Left + + + + ДатаКонтекстноеМеню + 5 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + ФормаКоманднаяПанель + -1 + Left + true + + true + true + true + Vertical + true + true + true + true + true + + Объект + 1 + + DocumentObject.Документ1 + + + true + + + true + + + Объект.RegisterRecords + +
true
+ true + + + + + + + + OnWriteAtServer + ПриЗаписиНаСервере + + true + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/Forms/\320\240\320\260\321\201\321\2101_\320\244\320\276\321\200\320\274\320\260\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\260/Module.bsl" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/Forms/\320\240\320\260\321\201\321\2101_\320\244\320\276\321\200\320\274\320\260\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\260/Module.bsl" new file mode 100644 index 000000000..43553ac86 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/Forms/\320\240\320\260\321\201\321\2101_\320\244\320\276\321\200\320\274\320\260\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\260/Module.bsl" @@ -0,0 +1,5 @@ + +&НаСервере +Процедура ПриЗаписиНаСервере(Отказ, ТекущийОбъект, ПараметрыЗаписи) + //TODO: Вставить содержимое обработчика +КонецПроцедуры diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.mdo" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.mdo" new file mode 100644 index 000000000..8e23df1cf --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.mdo" @@ -0,0 +1,27 @@ + + + + + + + + + + Документ1 + Adopted + + Checked + Extended + + true + Document.Документ1.Form.Расш1_ФормаДокумента + + Расш1_ФормаДокумента + + ru + Форма документа + + PersonalComputer + MobileDevice + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Roles/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/Rights.rights" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Roles/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/Rights.rights" new file mode 100644 index 000000000..11a60b5ae --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Roles/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/Rights.rights" @@ -0,0 +1,6 @@ + + + true + true + false + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Roles/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214.mdo" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Roles/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214.mdo" new file mode 100644 index 000000000..1134c1c9f --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Roles/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214.mdo" @@ -0,0 +1,8 @@ + + + Расш1_ОсновнаяРоль + + ru + Основная роль + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.project" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.project" new file mode 100644 index 000000000..13a0df047 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.project" @@ -0,0 +1,18 @@ + + + Расширение2 + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + + org.eclipse.xtext.ui.shared.xtextNature + com._1c.g5.v8.dt.core.V8ExtensionNature + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/DT-INF/PROJECT.PMF" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/DT-INF/PROJECT.PMF" new file mode 100644 index 000000000..341bde6e5 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/DT-INF/PROJECT.PMF" @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Runtime-Version: 8.3.27 +Base-Project: Конфигурация diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/BaseForm/Form.form" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/BaseForm/Form.form" new file mode 100644 index 000000000..ab5a5d399 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/BaseForm/Form.form" @@ -0,0 +1,135 @@ + + + + Код + 1 + true + true + + true + + + КодРасширеннаяПодсказка + 3 + Label + true + true + + Left + + + + КодКонтекстноеМеню + 2 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Наименование + 4 + true + true + + true + + + НаименованиеРасширеннаяПодсказка + 6 + Label + true + true + + Left + + + + НаименованиеКонтекстноеМеню + 5 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Реквизит + 7 + true + true + + true + + + РеквизитРасширеннаяПодсказка + 9 + Label + true + true + + Left + + + + РеквизитКонтекстноеМеню + 8 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + ФормаКоманднаяПанель + -1 + Left + true + + LockOwnerWindow + true + true + true + Vertical + true + true + true + true + true + + + + + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" new file mode 100644 index 000000000..946ffc59d --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" @@ -0,0 +1,140 @@ + + + + Код + 1 + true + true + + true + + + КодРасширеннаяПодсказка + 3 + Label + true + true + + Left + + + + КодКонтекстноеМеню + 2 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Наименование + 4 + true + true + + true + + + НаименованиеРасширеннаяПодсказка + 6 + Label + true + true + + Left + + + + НаименованиеКонтекстноеМеню + 5 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Реквизит + 7 + true + true + + true + + + РеквизитРасширеннаяПодсказка + 9 + Label + true + true + + Left + + + + РеквизитКонтекстноеМеню + 8 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + ФормаКоманднаяПанель + -1 + Left + true + + + BeforeClose + Расш2_ПередЗакрытиемПосле + After + + LockOwnerWindow + true + true + true + Vertical + true + true + true + true + true + + + + + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" new file mode 100644 index 000000000..23c026162 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" @@ -0,0 +1,5 @@ + +&НаКлиенте +Процедура Расш2_ПередЗакрытиемПосле(Отказ, ЗавершениеРаботы, ТекстПредупреждения, СтандартнаяОбработка) + //TODO: Вставить содержимое обработчика +КонецПроцедуры diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722.mdo" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722.mdo" new file mode 100644 index 000000000..a317c22c4 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722.mdo" @@ -0,0 +1,25 @@ + + + + + + + + + + Справочник2 + Adopted + + Checked + + true + true + + ФормаЭлемента + Adopted + + Checked +
Extended
+ + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/CommandInterface.cmi" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/CommandInterface.cmi" new file mode 100644 index 000000000..0cf6de8a4 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/CommandInterface.cmi" @@ -0,0 +1,2 @@ + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/Configuration.mdo" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/Configuration.mdo" new file mode 100644 index 000000000..315910aa6 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/Configuration.mdo" @@ -0,0 +1,39 @@ + + + Расширение2 + + ru + Расширение2 + + Adopted + + Checked + Checked + Extended + Extended + Extended + Checked + Checked + Extended + Extended + + + + + + + + + true + Расш2_ + 8.3.27 + Customization + ManagedApplication + PersonalComputer + Russian + Role.Расш2_ОсновнаяРоль + 8.3.27 + Role.Расш2_ОсновнаяРоль + Catalog.Справочник2 + DataProcessor.Расш2_Обработка1 + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/MainSectionCommandInterface.cmi" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/MainSectionCommandInterface.cmi" new file mode 100644 index 000000000..0cf6de8a4 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/MainSectionCommandInterface.cmi" @@ -0,0 +1,2 @@ + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/SessionModule.bsl" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/SessionModule.bsl" new file mode 100644 index 000000000..73b10ca89 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/SessionModule.bsl" @@ -0,0 +1,5 @@ + +&После("УстановкаПараметровСеанса") +Процедура Расш2_УстановкаПараметровСеанса(ТребуемыеПараметры) + //TODO: Вставить содержимое обработчика +КонецПроцедуры diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/DataProcessors/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601/Forms/\320\244\320\276\321\200\320\274\320\260/Form.form" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/DataProcessors/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601/Forms/\320\244\320\276\321\200\320\274\320\260/Form.form" new file mode 100644 index 000000000..fb03109f7 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/DataProcessors/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601/Forms/\320\244\320\276\321\200\320\274\320\260/Form.form" @@ -0,0 +1,37 @@ + + + + ФормаКоманднаяПанель + -1 + Left + true + + true + true + true + Vertical + true + true + true + true + true + + Объект + 1 + + DataProcessorObject.Расш2_Обработка1 + + + true + + + true + +
true
+ + + + + + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/DataProcessors/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601.mdo" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/DataProcessors/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601.mdo" new file mode 100644 index 000000000..856f604f3 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/DataProcessors/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601.mdo" @@ -0,0 +1,23 @@ + + + + + + + Расш2_Обработка1 + + ru + Обработка1 + + true + DataProcessor.Расш2_Обработка1.Form.Форма + + Форма + + ru + Форма + + PersonalComputer + MobileDevice + + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Roles/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/Rights.rights" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Roles/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/Rights.rights" new file mode 100644 index 000000000..11a60b5ae --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Roles/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/Rights.rights" @@ -0,0 +1,6 @@ + + + true + true + false + diff --git "a/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Roles/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214.mdo" "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Roles/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214.mdo" new file mode 100644 index 000000000..d2f882442 --- /dev/null +++ "b/src/test/resources/solutions/sol1/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Roles/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214.mdo" @@ -0,0 +1,4 @@ + + + Расш2_ОсновнаяРоль + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.project" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.project" new file mode 100644 index 000000000..bc2277ad2 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.project" @@ -0,0 +1,18 @@ + + + Расширение1 + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + + org.eclipse.xtext.ui.shared.xtextNature + com._1c.g5.v8.dt.core.V8ExtensionNature + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.settings/com.e1c.v8codestyle.autosort.prefs" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.settings/com.e1c.v8codestyle.autosort.prefs" new file mode 100644 index 000000000..23b062502 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.settings/com.e1c.v8codestyle.autosort.prefs" @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +topObjects=true diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.settings/com.e1c.v8codestyle.bsl.prefs" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.settings/com.e1c.v8codestyle.bsl.prefs" new file mode 100644 index 000000000..ac5ba5253 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.settings/com.e1c.v8codestyle.bsl.prefs" @@ -0,0 +1,3 @@ +addModuleStrictTypesAnnotation=false +createModuleStructure=false +eclipse.preferences.version=1 diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.settings/com.e1c.v8codestyle.prefs" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.settings/com.e1c.v8codestyle.prefs" new file mode 100644 index 000000000..9e9b57e54 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.settings/com.e1c.v8codestyle.prefs" @@ -0,0 +1,3 @@ +commonChecks=true +eclipse.preferences.version=1 +standardChecks=true diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.settings/org.eclipse.core.resources.prefs" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.settings/org.eclipse.core.resources.prefs" new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/.settings/org.eclipse.core.resources.prefs" @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/DT-INF/PROJECT.PMF" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/DT-INF/PROJECT.PMF" new file mode 100644 index 000000000..341bde6e5 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/DT-INF/PROJECT.PMF" @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Runtime-Version: 8.3.27 +Base-Project: Конфигурация diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" new file mode 100644 index 000000000..faa0238e4 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" @@ -0,0 +1,366 @@ + + + + Код + 1 + true + true + + true + + + Объект.Code + + + КодРасширеннаяПодсказка + 3 + Label + true + true + + Left + + + + КодКонтекстноеМеню + 2 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Наименование + 4 + true + true + + true + + + Объект.Description + + + НаименованиеРасширеннаяПодсказка + 6 + Label + true + true + + Left + + + + НаименованиеКонтекстноеМеню + 5 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Реквизит + 7 + true + true + + true + + + Объект.Реквизит + + + РеквизитРасширеннаяПодсказка + 9 + Label + true + true + + Left + + + + РеквизитКонтекстноеМеню + 8 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + ТабличнаяЧасть1 + 10 + true + true + + true + + + Объект.ТабличнаяЧасть1 + + None + + ТабличнаяЧасть1НомерСтроки + 23 + true + true + + true + + + Объект.ТабличнаяЧасть1.LineNumber + + + ТабличнаяЧасть1НомерСтрокиРасширеннаяПодсказка + 25 + Label + true + true + + Left + + + + ТабличнаяЧасть1НомерСтрокиКонтекстноеМеню + 24 + true + + LabelField + EnterOnInput + true + Left + true + + true + true + + + + ТабличнаяЧасть1Реквизит1 + 26 + true + true + + true + + + Объект.ТабличнаяЧасть1.Реквизит1 + + + ТабличнаяЧасть1Реквизит1РасширеннаяПодсказка + 28 + Label + true + true + + Left + + + + ТабличнаяЧасть1Реквизит1КонтекстноеМеню + 27 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + ТабличнаяЧасть1КоманднаяПанель + 12 + Left + true + + + ТабличнаяЧасть1СтрокаПоиска + 14 + + ТабличнаяЧасть1СтрокаПоискаРасширеннаяПодсказка + 16 + Label + true + true + + Left + + + + ТабличнаяЧасть1СтрокаПоискаКонтекстноеМеню + 15 + true + + ТабличнаяЧасть1 + + true + + + + ТабличнаяЧасть1СостояниеПросмотра + 17 + + ТабличнаяЧасть1СостояниеПросмотраРасширеннаяПодсказка + 19 + Label + true + true + + Left + + + + ТабличнаяЧасть1СостояниеПросмотраКонтекстноеМеню + 18 + true + + ViewStatusAddition + ТабличнаяЧасть1 + + true + + + + ТабличнаяЧасть1УправлениеПоиском + 20 + + ТабличнаяЧасть1УправлениеПоискомРасширеннаяПодсказка + 22 + Label + true + true + + Left + + + + ТабличнаяЧасть1УправлениеПоискомКонтекстноеМеню + 21 + true + + SearchControlAddition + ТабличнаяЧасть1 + + true + + + + ТабличнаяЧасть1РасширеннаяПодсказка + 13 + Label + true + true + + Left + + + + ТабличнаяЧасть1КонтекстноеМеню + 11 + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + true + Auto + Auto + true + true + true + true + AsFileRef + + + ФормаКоманднаяПанель + -1 + Left + true + + LockOwnerWindow + true + true + true + Vertical + true + true + true + true + true + + Объект + 1 + + CatalogObject.Расш1_Справочник3 + + + true + + + true + +
true
+ true + + + + + + + + OnWriteAtServer + ПриЗаписиНаСервере + + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" new file mode 100644 index 000000000..43553ac86 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" @@ -0,0 +1,5 @@ + +&НаСервере +Процедура ПриЗаписиНаСервере(Отказ, ТекущийОбъект, ПараметрыЗаписи) + //TODO: Вставить содержимое обработчика +КонецПроцедуры diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723.mdo" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723.mdo" new file mode 100644 index 000000000..32126d24f --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Catalogs/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723/\320\240\320\260\321\201\321\2101_\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2723.mdo" @@ -0,0 +1,89 @@ + + + + + + + + + + Расш1_Справочник3 + + ru + Справочник3 + + true + Catalog.Расш1_Справочник3.StandardAttribute.Code + Catalog.Расш1_Справочник3.StandardAttribute.Description + DontUse + Use + Use + 2 + true + 9 + 25 + String + Variable + true + true + AsDescription + InDialog + BothWays + Catalog.Расш1_Справочник3.Form.ФормаЭлемента + + Реквизит + + ru + Реквизит + + + String + + 10 + + + + + + Use + Use + + + + + + + ТабличнаяЧасть1 + + ru + Табличная часть1 + + + Реквизит1 + + ru + Реквизит1 + + + String + + 10 + + + + + Use + Use + + 9 + + + ФормаЭлемента + + ru + Форма элемента + + PersonalComputer + MobileDevice + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/CommandInterface.cmi" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/CommandInterface.cmi" new file mode 100644 index 000000000..0cf6de8a4 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/CommandInterface.cmi" @@ -0,0 +1,2 @@ + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/Configuration.mdo" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/Configuration.mdo" new file mode 100644 index 000000000..6c3316f58 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/Configuration.mdo" @@ -0,0 +1,49 @@ + + + Расширение1 + + ru + Расширение1 + + Adopted + + Checked + Checked + Extended + Extended + Checked + Checked + Checked + Extended + Extended + + + + + + + + + true + Расш1_ + 8.3.27 + Customization + ManagedApplication + PersonalComputer + Russian + Role.Расш1_ОсновнаяРоль + Language.Русский + 8.3.27 + + Русский + Adopted + + Checked + + ru + + Role.Расш1_ОсновнаяРоль + Constant.Расш1_Константа1 + Catalog.Расш1_Справочник3 + Document.Документ1 + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/MainSectionCommandInterface.cmi" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/MainSectionCommandInterface.cmi" new file mode 100644 index 000000000..0cf6de8a4 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Configuration/MainSectionCommandInterface.cmi" @@ -0,0 +1,2 @@ + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Constants/\320\240\320\260\321\201\321\2101_\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601/\320\240\320\260\321\201\321\2101_\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.mdo" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Constants/\320\240\320\260\321\201\321\2101_\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601/\320\240\320\260\321\201\321\2101_\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.mdo" new file mode 100644 index 000000000..7cf5aaa19 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Constants/\320\240\320\260\321\201\321\2101_\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601/\320\240\320\260\321\201\321\2101_\320\232\320\276\320\275\321\201\321\202\320\260\320\275\321\202\320\2601.mdo" @@ -0,0 +1,23 @@ + + + + + + + + Расш1_Константа1 + + ru + Константа1 + + + String + + 10 + + + true + + + Managed + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/Forms/\320\240\320\260\321\201\321\2101_\320\244\320\276\321\200\320\274\320\260\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\260/Form.form" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/Forms/\320\240\320\260\321\201\321\2101_\320\244\320\276\321\200\320\274\320\260\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\260/Form.form" new file mode 100644 index 000000000..02eff1f8c --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/Forms/\320\240\320\260\321\201\321\2101_\320\244\320\276\321\200\320\274\320\260\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\260/Form.form" @@ -0,0 +1,127 @@ + + + + Номер + 1 + true + true + + true + + + Объект.Number + + + НомерРасширеннаяПодсказка + 3 + Label + true + true + + Left + + + + НомерКонтекстноеМеню + 2 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Дата + 4 + true + true + + true + + + Объект.Date + + + ДатаРасширеннаяПодсказка + 6 + Label + true + true + + Left + + + + ДатаКонтекстноеМеню + 5 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + ФормаКоманднаяПанель + -1 + Left + true + + true + true + true + Vertical + true + true + true + true + true + + Объект + 1 + + DocumentObject.Документ1 + + + true + + + true + + + Объект.RegisterRecords + +
true
+ true + + + + + + + + OnWriteAtServer + ПриЗаписиНаСервере + + true + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/Forms/\320\240\320\260\321\201\321\2101_\320\244\320\276\321\200\320\274\320\260\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\260/Module.bsl" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/Forms/\320\240\320\260\321\201\321\2101_\320\244\320\276\321\200\320\274\320\260\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\260/Module.bsl" new file mode 100644 index 000000000..43553ac86 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/Forms/\320\240\320\260\321\201\321\2101_\320\244\320\276\321\200\320\274\320\260\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\260/Module.bsl" @@ -0,0 +1,5 @@ + +&НаСервере +Процедура ПриЗаписиНаСервере(Отказ, ТекущийОбъект, ПараметрыЗаписи) + //TODO: Вставить содержимое обработчика +КонецПроцедуры diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.mdo" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.mdo" new file mode 100644 index 000000000..8e23df1cf --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Documents/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021/\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.mdo" @@ -0,0 +1,27 @@ + + + + + + + + + + Документ1 + Adopted + + Checked + Extended + + true + Document.Документ1.Form.Расш1_ФормаДокумента + + Расш1_ФормаДокумента + + ru + Форма документа + + PersonalComputer + MobileDevice + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Roles/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/Rights.rights" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Roles/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/Rights.rights" new file mode 100644 index 000000000..11a60b5ae --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Roles/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/Rights.rights" @@ -0,0 +1,6 @@ + + + true + true + false + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Roles/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214.mdo" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Roles/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214.mdo" new file mode 100644 index 000000000..1134c1c9f --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2651/src/Roles/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/\320\240\320\260\321\201\321\2101_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214.mdo" @@ -0,0 +1,8 @@ + + + Расш1_ОсновнаяРоль + + ru + Основная роль + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.project" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.project" new file mode 100644 index 000000000..13a0df047 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.project" @@ -0,0 +1,18 @@ + + + Расширение2 + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + + org.eclipse.xtext.ui.shared.xtextNature + com._1c.g5.v8.dt.core.V8ExtensionNature + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.settings/com.e1c.v8codestyle.autosort.prefs" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.settings/com.e1c.v8codestyle.autosort.prefs" new file mode 100644 index 000000000..23b062502 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.settings/com.e1c.v8codestyle.autosort.prefs" @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +topObjects=true diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.settings/com.e1c.v8codestyle.bsl.prefs" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.settings/com.e1c.v8codestyle.bsl.prefs" new file mode 100644 index 000000000..ac5ba5253 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.settings/com.e1c.v8codestyle.bsl.prefs" @@ -0,0 +1,3 @@ +addModuleStrictTypesAnnotation=false +createModuleStructure=false +eclipse.preferences.version=1 diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.settings/com.e1c.v8codestyle.prefs" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.settings/com.e1c.v8codestyle.prefs" new file mode 100644 index 000000000..9e9b57e54 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.settings/com.e1c.v8codestyle.prefs" @@ -0,0 +1,3 @@ +commonChecks=true +eclipse.preferences.version=1 +standardChecks=true diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.settings/org.eclipse.core.resources.prefs" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.settings/org.eclipse.core.resources.prefs" new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/.settings/org.eclipse.core.resources.prefs" @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/DT-INF/PROJECT.PMF" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/DT-INF/PROJECT.PMF" new file mode 100644 index 000000000..341bde6e5 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/DT-INF/PROJECT.PMF" @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Runtime-Version: 8.3.27 +Base-Project: Конфигурация diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/BaseForm/Form.form" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/BaseForm/Form.form" new file mode 100644 index 000000000..ab5a5d399 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/BaseForm/Form.form" @@ -0,0 +1,135 @@ + + + + Код + 1 + true + true + + true + + + КодРасширеннаяПодсказка + 3 + Label + true + true + + Left + + + + КодКонтекстноеМеню + 2 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Наименование + 4 + true + true + + true + + + НаименованиеРасширеннаяПодсказка + 6 + Label + true + true + + Left + + + + НаименованиеКонтекстноеМеню + 5 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Реквизит + 7 + true + true + + true + + + РеквизитРасширеннаяПодсказка + 9 + Label + true + true + + Left + + + + РеквизитКонтекстноеМеню + 8 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + ФормаКоманднаяПанель + -1 + Left + true + + LockOwnerWindow + true + true + true + Vertical + true + true + true + true + true + + + + + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" new file mode 100644 index 000000000..946ffc59d --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Form.form" @@ -0,0 +1,140 @@ + + + + Код + 1 + true + true + + true + + + КодРасширеннаяПодсказка + 3 + Label + true + true + + Left + + + + КодКонтекстноеМеню + 2 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Наименование + 4 + true + true + + true + + + НаименованиеРасширеннаяПодсказка + 6 + Label + true + true + + Left + + + + НаименованиеКонтекстноеМеню + 5 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + Реквизит + 7 + true + true + + true + + + РеквизитРасширеннаяПодсказка + 9 + Label + true + true + + Left + + + + РеквизитКонтекстноеМеню + 8 + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true + + + + ФормаКоманднаяПанель + -1 + Left + true + + + BeforeClose + Расш2_ПередЗакрытиемПосле + After + + LockOwnerWindow + true + true + true + Vertical + true + true + true + true + true + + + + + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" new file mode 100644 index 000000000..23c026162 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Module.bsl" @@ -0,0 +1,5 @@ + +&НаКлиенте +Процедура Расш2_ПередЗакрытиемПосле(Отказ, ЗавершениеРаботы, ТекстПредупреждения, СтандартнаяОбработка) + //TODO: Вставить содержимое обработчика +КонецПроцедуры diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722.mdo" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722.mdo" new file mode 100644 index 000000000..a317c22c4 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2722.mdo" @@ -0,0 +1,25 @@ + + + + + + + + + + Справочник2 + Adopted + + Checked + + true + true + + ФормаЭлемента + Adopted + + Checked +
Extended
+ + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/CommandInterface.cmi" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/CommandInterface.cmi" new file mode 100644 index 000000000..0cf6de8a4 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/CommandInterface.cmi" @@ -0,0 +1,2 @@ + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/Configuration.mdo" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/Configuration.mdo" new file mode 100644 index 000000000..315910aa6 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/Configuration.mdo" @@ -0,0 +1,39 @@ + + + Расширение2 + + ru + Расширение2 + + Adopted + + Checked + Checked + Extended + Extended + Extended + Checked + Checked + Extended + Extended + + + + + + + + + true + Расш2_ + 8.3.27 + Customization + ManagedApplication + PersonalComputer + Russian + Role.Расш2_ОсновнаяРоль + 8.3.27 + Role.Расш2_ОсновнаяРоль + Catalog.Справочник2 + DataProcessor.Расш2_Обработка1 + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/MainSectionCommandInterface.cmi" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/MainSectionCommandInterface.cmi" new file mode 100644 index 000000000..0cf6de8a4 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/MainSectionCommandInterface.cmi" @@ -0,0 +1,2 @@ + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/SessionModule.bsl" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/SessionModule.bsl" new file mode 100644 index 000000000..73b10ca89 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Configuration/SessionModule.bsl" @@ -0,0 +1,5 @@ + +&После("УстановкаПараметровСеанса") +Процедура Расш2_УстановкаПараметровСеанса(ТребуемыеПараметры) + //TODO: Вставить содержимое обработчика +КонецПроцедуры diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/DataProcessors/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601/Forms/\320\244\320\276\321\200\320\274\320\260/Form.form" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/DataProcessors/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601/Forms/\320\244\320\276\321\200\320\274\320\260/Form.form" new file mode 100644 index 000000000..fb03109f7 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/DataProcessors/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601/Forms/\320\244\320\276\321\200\320\274\320\260/Form.form" @@ -0,0 +1,37 @@ + + + + ФормаКоманднаяПанель + -1 + Left + true + + true + true + true + Vertical + true + true + true + true + true + + Объект + 1 + + DataProcessorObject.Расш2_Обработка1 + + + true + + + true + +
true
+ + + + + + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/DataProcessors/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601.mdo" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/DataProcessors/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601.mdo" new file mode 100644 index 000000000..856f604f3 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/DataProcessors/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601/\320\240\320\260\321\201\321\2102_\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\2601.mdo" @@ -0,0 +1,23 @@ + + + + + + + Расш2_Обработка1 + + ru + Обработка1 + + true + DataProcessor.Расш2_Обработка1.Form.Форма + + Форма + + ru + Форма + + PersonalComputer + MobileDevice + + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Roles/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/Rights.rights" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Roles/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/Rights.rights" new file mode 100644 index 000000000..11a60b5ae --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Roles/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/Rights.rights" @@ -0,0 +1,6 @@ + + + true + true + false + diff --git "a/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Roles/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214.mdo" "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Roles/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214.mdo" new file mode 100644 index 000000000..d2f882442 --- /dev/null +++ "b/src/test/resources/solutions/sol2/\320\240\320\260\321\201\321\210\320\270\321\200\320\265\320\275\320\270\320\2652/src/Roles/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214/\320\240\320\260\321\201\321\2102_\320\236\321\201\320\275\320\276\320\262\320\275\320\260\321\217\320\240\320\276\320\273\321\214.mdo" @@ -0,0 +1,4 @@ + + + Расш2_ОсновнаяРоль +