Skip to content

Commit bf075a2

Browse files
committed
Compact naming.
1 parent 6dc7c4c commit bf075a2

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

compiler/src/main/java/org/hisrc/jsonix/compiler/CreateTypeInfoDeclarationVisitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public JSAssignmentExpression visitList(MList<T, C> info) {
175175
if (!typeInfoDeclaration
176176
.acceptExpressionVisitor(new CheckValueStringLiteralExpressionVisitor(
177177
"String"))) {
178-
list.append(naming.typeInfo(), typeInfoDeclaration);
178+
list.append(naming.baseTypeInfo(), typeInfoDeclaration);
179179
}
180180
return list;
181181
}

compiler/src/main/java/org/hisrc/jsonix/compiler/Naming.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
public interface Naming {
44

5+
String name();
6+
7+
String defaultElementNamespaceURI();
8+
String defaultAttributeNamespaceURI();
9+
10+
String elementInfos();
11+
String typeInfos();
12+
13+
514
String type();
615
//
716
String typeInfo();
@@ -27,7 +36,6 @@ public interface Naming {
2736
String substitutionHead();
2837

2938
// propertyInfo properties
30-
String name();
3139
String collection();
3240
String wrapperElementName();
3341
String allowDom();
@@ -49,10 +57,6 @@ public interface Naming {
4957
String namespaceURI();
5058
String prefix();
5159
String localPart();
52-
String defaultElementNamespaceURI();
53-
String defaultAttributeNamespaceURI();
5460

55-
String elementInfos();
56-
String typeInfos();
5761

5862
}

0 commit comments

Comments
 (0)