jatria-soft/exml
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[DEV] update from aknot

Browse Source
This commit is contained in:
Edouard DUPIN 2022-11-01 23:46:49 +01:00
parent d310c2cda8
commit 1b51e75970
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/atriasoft/exml/XmlMapper.java
View File

@ -84,7 +84,7 @@ public class XmlMapper {
final IntrospectionObject introspectionObject = (IntrospectionObject) parser.parse(data, property);
introspectionObject.generateTheObject();
final Object listRet = introspectionObject.getData();
if (listRet != null && !listRet.getClass().isArray() && listRet.getClass().componentType() == classType) {
if (listRet != null && !listRet.getClass().isArray() && listRet.getClass() == classType) {
return (T) listRet;
} else if (listRet != null && listRet.getClass().isArray() && listRet.getClass().componentType() == classType) {
final T[] tmp = (T[]) listRet;

8
src/org/atriasoft/exml/builder/IntrospectionObject.java
View File

@ -80,7 +80,7 @@ public class IntrospectionObject {
+ (this.modelInterface.isList() ? "[List]" : ""));
Log.warning(" Properties : " + this.properties.keySet());
Log.warning(" Nodes : " + this.nodes.keySet());
this.data = this.modelInterface.createObject(this.properties, this.nodes);
this.data = this.modelInterface.createObject(this.properties, this.nodes, false);
}
public Object getData() {
@ -96,7 +96,7 @@ public class IntrospectionObject {
if (beanName == null) {
throw new ExmlNodeDoesNotExist("The node '" + nodeName + "' Does not exist...");
}
return this.modelInterface.getTreeNameOfSubNode(beanName);
return this.modelInterface.getTreeNameOfSubNode(beanName, false);
}
public Class<?> getTypeOfProperty(final String nodeName) throws AknotException, ExmlNodeDoesNotExist {
@ -118,7 +118,7 @@ public class IntrospectionObject {
if (beanName == null) {
throw new ExmlNodeDoesNotExist("The node '" + nodeName + "' Does not exist...");
}
return this.modelInterface.getTypeOfSubNode(beanName);
return this.modelInterface.getTypeOfSubNode(beanName, false);
}
public Class<?> getTypeOfSubNodeSubType(final String nodeName) throws AknotException, ExmlNodeDoesNotExist {
@ -126,7 +126,7 @@ public class IntrospectionObject {
if (beanName == null) {
throw new ExmlNodeDoesNotExist("The node '" + nodeName + "' Does not exist...");
}
return this.modelInterface.getTypeOfSubNodeList(beanName);
return this.modelInterface.getTypeOfSubNodeList(beanName, false);
}
public Class<?> getTypeOfSubProperty(final String nodeName) throws AknotException, ExmlNodeDoesNotExist {