File tree Expand file tree Collapse file tree 2 files changed +16
-23
lines changed
src/main/java/com/github/_1c_syntax/bsl
reader/designer/converter Expand file tree Collapse file tree 2 files changed +16
-23
lines changed Original file line number Diff line number Diff line change @@ -96,7 +96,7 @@ public boolean isUnknown() {
96
96
public static FormElementType fromString (String value ) {
97
97
var result = KEYS .getOrDefault (value , UNKNOWN );
98
98
if (result .isUnknown ()) {
99
- LOGGER .info ( value );
99
+ LOGGER .warn ( "Unknown form element type: {}" , value );
100
100
}
101
101
102
102
return KEYS .getOrDefault (value , UNKNOWN );
Original file line number Diff line number Diff line change @@ -63,36 +63,29 @@ private static String readValue(HierarchicalStreamReader reader) {
63
63
var value = "" ;
64
64
65
65
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 );
77
67
case USE_NODE_NAME -> {
78
68
reader .moveDown ();
79
69
value = reader .getValue ();
80
70
reader .moveUp ();
81
71
}
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 );
93
73
default -> value = reader .getValue ();
94
74
}
95
75
96
76
return value ;
97
77
}
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
+ }
98
91
}
You can’t perform that action at this time.
0 commit comments