bartek/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for inflating nested class component using "-" operator

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-03-19 14:09:57 +01:00
parent 32f7a8d164
commit 8fb4e7a08e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/DefaultInflater.java
View File

@@ -96,7 +96,10 @@ public class DefaultInflater implements Inflater {
name = uri + "." + name; name = uri + "." + name;
} }
var canonicalName = name.replaceAll("\\*", "").replaceAll("\\.+", "."); var canonicalName = name
.replaceAll("\\*", "")
.replaceAll("\\.+", ".")
.replaceAll("-+", "\\$");
var windowClass = loader.loadClass(canonicalName); var windowClass = loader.loadClass(canonicalName);
@@ -177,7 +180,10 @@ public class DefaultInflater implements Inflater {
name = uri + "." + name; name = uri + "." + name;
} }
var canonicalName = name.replaceAll("\\*", "").replaceAll("\\.+", "."); var canonicalName = name
.replaceAll("\\*", "")
.replaceAll("\\.+", ".")
.replaceAll("-+", "\\$");
var componentClass = loader.loadClass(canonicalName); var componentClass = loader.loadClass(canonicalName);
var component = createComponent(componentClass, node.getAttributes(), refs, context, gui); var component = createComponent(componentClass, node.getAttributes(), refs, context, gui);