|
@@ -974,14 +974,13 @@ public class DOMInputCapsule implements InputCapsule {
|
|
ret = referencedSavables.get(reference);
|
|
ret = referencedSavables.get(reference);
|
|
} else {
|
|
} else {
|
|
String className = currentElem.getNodeName();
|
|
String className = currentElem.getNodeName();
|
|
- if (defVal != null) {
|
|
|
|
- className = defVal.getClass().getName();
|
|
|
|
- } else if (currentElem.hasAttribute("class")) {
|
|
|
|
|
|
+ if (currentElem.hasAttribute("class")) {
|
|
className = currentElem.getAttribute("class");
|
|
className = currentElem.getAttribute("class");
|
|
|
|
+ } else if (defVal != null) {
|
|
|
|
+ className = defVal.getClass().getName();
|
|
}
|
|
}
|
|
tmp = SavableClassUtil.fromName(className, null);
|
|
tmp = SavableClassUtil.fromName(className, null);
|
|
|
|
|
|
-
|
|
|
|
String versionsStr = currentElem.getAttribute("savable_versions");
|
|
String versionsStr = currentElem.getAttribute("savable_versions");
|
|
if (versionsStr != null && !versionsStr.equals("")){
|
|
if (versionsStr != null && !versionsStr.equals("")){
|
|
String[] versionStr = versionsStr.split(",");
|
|
String[] versionStr = versionsStr.split(",");
|
|
@@ -1508,4 +1507,4 @@ public class DOMInputCapsule implements InputCapsule {
|
|
? zeroStrings
|
|
? zeroStrings
|
|
: outStrings;
|
|
: outStrings;
|
|
}
|
|
}
|
|
-}
|
|
|
|
|
|
+}
|