Skip to content

Commit c094a3e

Browse files
committed
sq fix
1 parent 1151d21 commit c094a3e

File tree

2 files changed

+16
-23
lines changed

2 files changed

+16
-23
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public boolean isUnknown() {
9696
public static FormElementType fromString(String value) {
9797
var result = KEYS.getOrDefault(value, UNKNOWN);
9898
if (result.isUnknown()) {
99-
LOGGER.info(value);
99+
LOGGER.warn("Unknown form element type: {}", value);
100100
}
101101

102102
return KEYS.getOrDefault(value, UNKNOWN);

src/main/java/com/github/_1c_syntax/bsl/reader/designer/converter/MdoReferenceConverter.java

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,36 +63,29 @@ private static String readValue(HierarchicalStreamReader reader) {
6363
var value = "";
6464

6565
switch (nodeName) {
66-
case ITEM_NODE_NAME -> {
67-
while (reader.hasMoreChildren()) {
68-
reader.moveDown();
69-
if (METADATA_NODE_NAME.equals(reader.getNodeName())) {
70-
value = reader.getValue();
71-
reader.moveUp();
72-
break;
73-
}
74-
reader.moveUp();
75-
}
76-
}
66+
case ITEM_NODE_NAME -> value = readValue(reader, METADATA_NODE_NAME, value);
7767
case USE_NODE_NAME -> {
7868
reader.moveDown();
7969
value = reader.getValue();
8070
reader.moveUp();
8171
}
82-
case PICTURE_NODE_NAME -> {
83-
while (reader.hasMoreChildren()) {
84-
reader.moveDown();
85-
if (REF_NODE_NAME.equals(reader.getNodeName())) {
86-
value = reader.getValue();
87-
reader.moveUp();
88-
break;
89-
}
90-
reader.moveUp();
91-
}
92-
}
72+
case PICTURE_NODE_NAME -> value = readValue(reader, REF_NODE_NAME, value);
9373
default -> value = reader.getValue();
9474
}
9575

9676
return value;
9777
}
78+
79+
private static String readValue(HierarchicalStreamReader reader, String metadataNodeName, String value) {
80+
while (reader.hasMoreChildren()) {
81+
reader.moveDown();
82+
if (metadataNodeName.equals(reader.getNodeName())) {
83+
value = reader.getValue();
84+
reader.moveUp();
85+
break;
86+
}
87+
reader.moveUp();
88+
}
89+
return value;
90+
}
9891
}

0 commit comments

Comments
 (0)