Skip to content

Commit 814fc7b

Browse files
theshadowcotheshadowco
committed
sq fixes
1 parent 974de17 commit 814fc7b

File tree

3 files changed

+43
-25
lines changed

3 files changed

+43
-25
lines changed

‎src/main/java/com/github/_1c_syntax/bsl/mdo/storage/form/FormAttributeValueType.java‎

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,38 +32,57 @@ public class FormAttributeValueType implements ValueType {
3232
public static final FormAttributeValueType VALUE_TABLE = new FormAttributeValueType("ValueTable", "ТаблицаЗначений");
3333
public static final FormAttributeValueType VALUE_TREE = new FormAttributeValueType("ValueTree", "ДеревоЗначений");
3434
public static final FormAttributeValueType VALUE_LIST = new FormAttributeValueType("ValueList", "СписокЗначений");
35-
public static final FormAttributeValueType ACCOUNTING_RECORD_TYPE = new FormAttributeValueType("AccountingRecordType", "ВидДвиженияБухгалтерии");
36-
public static final FormAttributeValueType ACCUMULATION_RECORD_TYPE = new FormAttributeValueType("AccumulationRecordType", "ВидДвиженияНакопления");
35+
public static final FormAttributeValueType ACCOUNTING_RECORD_TYPE = new FormAttributeValueType("AccountingRecordType",
36+
"ВидДвиженияБухгалтерии");
37+
public static final FormAttributeValueType ACCUMULATION_RECORD_TYPE = new FormAttributeValueType("AccumulationRecordType",
38+
"ВидДвиженияНакопления");
3739

38-
public static final FormAttributeValueType FORMATTED_DOCUMENT = new FormAttributeValueType("FormattedDocument", "ФорматированныйДокумент");
39-
public static final FormAttributeValueType SPREADSHEET_DOCUMENT = new FormAttributeValueType("SpreadsheetDocument", "ТабличныйДокумент");
40-
public static final FormAttributeValueType TEXT_DOCUMENT = new FormAttributeValueType("TextDocument", "ТекстовыйДокумент");
41-
public static final FormAttributeValueType GRAPHICAL_SCHEMA = new FormAttributeValueType("GraphicalSchema", "ГрафическаяСхема");
40+
public static final FormAttributeValueType FORMATTED_DOCUMENT = new FormAttributeValueType("FormattedDocument",
41+
"ФорматированныйДокумент");
42+
public static final FormAttributeValueType SPREADSHEET_DOCUMENT = new FormAttributeValueType("SpreadsheetDocument",
43+
"ТабличныйДокумент");
44+
public static final FormAttributeValueType TEXT_DOCUMENT = new FormAttributeValueType("TextDocument",
45+
"ТекстовыйДокумент");
46+
public static final FormAttributeValueType GRAPHICAL_SCHEMA = new FormAttributeValueType("GraphicalSchema",
47+
"ГрафическаяСхема");
4248
public static final FormAttributeValueType CHART = new FormAttributeValueType("Chart", "Диаграмма");
4349
public static final FormAttributeValueType GANTT_CHART = new FormAttributeValueType("GanttChart", "ДиаграммаГанта");
44-
public static final FormAttributeValueType GEOGRAPHICAL_SCHEMA = new FormAttributeValueType("GeographicalSchema", "ГеографическаяСхема");
50+
public static final FormAttributeValueType GEOGRAPHICAL_SCHEMA = new FormAttributeValueType("GeographicalSchema",
51+
"ГеографическаяСхема");
4552
public static final FormAttributeValueType PDF_DOCUMENT = new FormAttributeValueType("PDFDocument", "PDFДокумент");
4653

47-
public static final FormAttributeValueType STANDARD_PERIOD = new FormAttributeValueType("StandardPeriod", "СтандартныйПериод");
48-
public static final FormAttributeValueType FORMATTED_STRING = new FormAttributeValueType("FormattedString", "ФорматированнаяСтрока");
49-
public static final FormAttributeValueType TYPE_DESCRIPTION = new FormAttributeValueType("TypeDescription", "ОписаниеТипа");
50-
public static final FormAttributeValueType STANDARD_BEGINNING_DATE = new FormAttributeValueType("StandardBeginningDate", "СтандартнаяДатаНачала");
54+
public static final FormAttributeValueType STANDARD_PERIOD = new FormAttributeValueType("StandardPeriod",
55+
"СтандартныйПериод");
56+
public static final FormAttributeValueType FORMATTED_STRING = new FormAttributeValueType("FormattedString",
57+
"ФорматированнаяСтрока");
58+
public static final FormAttributeValueType TYPE_DESCRIPTION = new FormAttributeValueType("TypeDescription",
59+
"ОписаниеТипа");
60+
public static final FormAttributeValueType STANDARD_BEGINNING_DATE = new FormAttributeValueType("StandardBeginningDate",
61+
"СтандартнаяДатаНачала");
5162

52-
public static final FormAttributeValueType DYNAMIC_LIST = new FormAttributeValueType("DynamicList", "ДинамическийСписок");
53-
public static final FormAttributeValueType DATA_COMPOSITION_SETTINGS_COMPOSER = new FormAttributeValueType("DataCompositionSettingsComposer", "КомпоновщикНастроекКомпоновкиДанных");
54-
public static final FormAttributeValueType SETTINGS_COMPOSER = new FormAttributeValueType("SettingsComposer", "НастройкиКомпоновщика");
55-
public static final FormAttributeValueType REPORT_BUILDER = new FormAttributeValueType("ReportBuilder", "ПостроительОтчета");
56-
public static final FormAttributeValueType DATA_ANALYSIS_TIME_INTERVAL_UNIT_TYPE = new FormAttributeValueType("DataAnalysisTimeIntervalUnitType", "ТипЕдиницыИнтервалаВремениАнализаДанных");
63+
public static final FormAttributeValueType DYNAMIC_LIST = new FormAttributeValueType("DynamicList",
64+
"ДинамическийСписок");
65+
public static final FormAttributeValueType DATA_COMPOSITION_SETTINGS_COMPOSER = new FormAttributeValueType(
66+
"DataCompositionSettingsComposer", "КомпоновщикНастроекКомпоновкиДанных");
67+
public static final FormAttributeValueType SETTINGS_COMPOSER = new FormAttributeValueType("SettingsComposer",
68+
"НастройкиКомпоновщика");
69+
public static final FormAttributeValueType REPORT_BUILDER = new FormAttributeValueType("ReportBuilder",
70+
"ПостроительОтчета");
71+
public static final FormAttributeValueType DATA_ANALYSIS_TIME_INTERVAL_UNIT_TYPE = new FormAttributeValueType(
72+
"DataAnalysisTimeIntervalUnitType", "ТипЕдиницыИнтервалаВремениАнализаДанных");
5773
public static final FormAttributeValueType FILTER = new FormAttributeValueType("Filter", "Отбор");
5874
public static final FormAttributeValueType ORDER = new FormAttributeValueType("Order", "Порядок");
5975
public static final FormAttributeValueType PLANNER = new FormAttributeValueType("Planner", "Планировщик");
60-
public static final FormAttributeValueType COMPARISON_TYPE = new FormAttributeValueType("ComparisonType", "ВидСравнения");
76+
public static final FormAttributeValueType COMPARISON_TYPE = new FormAttributeValueType("ComparisonType",
77+
"ВидСравнения");
6178

6279
public static final FormAttributeValueType COLOR = new FormAttributeValueType("Color", "Цвет");
6380
public static final FormAttributeValueType FONT = new FormAttributeValueType("Font", "Шрифт");
64-
public static final FormAttributeValueType VERTICAL_ALIGN = new FormAttributeValueType("VerticalAlign", "ВертикальноеПоложение");
81+
public static final FormAttributeValueType VERTICAL_ALIGN = new FormAttributeValueType("VerticalAlign",
82+
"ВертикальноеПоложение");
6583
public static final FormAttributeValueType PICTURE = new FormAttributeValueType("Picture", "Картинка");
66-
public static final FormAttributeValueType SIZE_CHANGE_MODE = new FormAttributeValueType("SizeChangeMode", "РежимИзмененияРазмера");
84+
public static final FormAttributeValueType SIZE_CHANGE_MODE = new FormAttributeValueType("SizeChangeMode",
85+
"РежимИзмененияРазмера");
6786

6887
private static final List<ValueType> BUILTIN_TYPES = List.of(
6988
VALUE_TABLE, VALUE_TREE, VALUE_LIST, ACCOUNTING_RECORD_TYPE, ACCUMULATION_RECORD_TYPE,

‎src/main/java/com/github/_1c_syntax/bsl/mdo/support/MetadataValueType.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,8 @@ public static MetadataValueType fromString(String name) {
182182
}
183183

184184
var posDot = name.indexOf(".");
185-
var key = name;
186185
if (posDot > 0) {
187-
key = name.substring(0, posDot);
186+
var key = name.substring(0, posDot);
188187
var variant = ALL_VARIANTS.get(key.toLowerCase(Locale.ROOT));
189188
if (variant != null) {
190189
type = new MetadataValueType(variant.kind(), name, variant.nameRu() + name.substring(posDot), false);
@@ -231,11 +230,11 @@ private static MetadataValueType create(MDOType mdoType, String name, String nam
231230

232231
private static Map<String, Variant> computeAllProvidedTypesVariants() {
233232
Map<String, Variant> variants = new ConcurrentHashMap<>();
234-
builtinTypes().forEach((ValueType valueType) -> {
233+
builtinTypes().forEach((ValueType valueType) ->
235234
variants.put(valueType.getName().toLowerCase(Locale.ROOT),
236235
new Variant(valueType.getNameRu(), ((MetadataValueType) valueType).getKind()
237-
));
238-
});
236+
))
237+
);
239238

240239
variants.put(MDOType.DEFINED_TYPE.getName().toLowerCase(Locale.ROOT),
241240
new Variant(MDOType.DEFINED_TYPE.getNameRu(), MDOType.DEFINED_TYPE));

‎src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/ValueTypeDescriptionConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class ValueTypeDescriptionConverter implements ReadConverter {
4747
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
4848
List<ValueType> types = new ArrayList<>();
4949
List<Qualifier> qualifiers = new ArrayList<>();
50-
boolean composite = false;
50+
var composite = false;
5151
while (reader.hasMoreChildren()) {
5252
reader.moveDown();
5353
var nodeName = reader.getNodeName();

0 commit comments

Comments
 (0)