Skip to content

Commit 5e7d2c3

Browse files
committed
Fixed issue #1.
1 parent 1d5bea9 commit 5e7d2c3

File tree

24 files changed

+207
-149
lines changed

24 files changed

+207
-149
lines changed

compiler/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-project</artifactId>
9-
<version>2.0.0</version>
9+
<version>2.0.1-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<dependencies>
13+
<dependency>
14+
<groupId>org.jvnet.jaxb2_commons</groupId>
15+
<artifactId>jaxb2-basics-runtime</artifactId>
16+
<version>0.6.5.1</version>
17+
</dependency>
1318
<dependency>
1419
<groupId>org.jvnet.jaxb2_commons</groupId>
1520
<artifactId>jaxb2-basics-tools</artifactId>
21+
<version>0.6.5.1</version>
1622
</dependency>
1723
<dependency>
1824
<groupId>com.sun.xml.bind</groupId>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,10 @@ final class CreateTypeInfoDeclarationVisitor<T, C extends T> implements
139139
private JSAssignmentExpression createTypeInfoDeclaration(
140140
MPackagedTypeInfo<T, C> info) {
141141
final JsonixModule module = this.jsonixCompiler.getModule(info);
142-
return this.codeModel.string(module.spaceName + "."
143-
+ info.getLocalName());
142+
return this.codeModel
143+
.string(module.spaceName
144+
+ "."
145+
+ info.getContainerLocalName(JsonixCompiler.DEFAULT_SCOPED_NAME_DELIMITER));
144146

145147
}
146148

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858

5959
public class JsonixCompiler<T, C extends T> {
6060

61+
public static final String DEFAULT_SCOPED_NAME_DELIMITER = ".";
62+
6163
final JSCodeModel codeModel = new CodeModelImpl();
6264

6365
private final MModelInfo<T, C> model;
@@ -171,8 +173,8 @@ public JSObjectLiteral compileClassInfo(MClassInfo<T, C> classInfo) {
171173
final JsonixModule module = getModule(classInfo);
172174
final JSObjectLiteral classInfoMapping = this.codeModel.object();
173175
classInfoMapping.append("type", this.codeModel.string("classInfo"));
174-
classInfoMapping.append("localName",
175-
this.codeModel.string(classInfo.getLocalName()));
176+
classInfoMapping.append("localName", this.codeModel.string(classInfo
177+
.getContainerLocalName(DEFAULT_SCOPED_NAME_DELIMITER)));
176178

177179
final MClassInfo<T, C> baseTypeInfo = classInfo.getBaseTypeInfo();
178180
if (baseTypeInfo != null) {

0 commit comments

Comments
 (0)