From 8fb4e7a08e11eb1e46930ccb38ee7b5c7aee30c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Fri, 19 Mar 2021 14:09:57 +0100 Subject: [PATCH] Add support for inflating nested class component using "-" operator --- .../base/engine/gui/xml/inflater/DefaultInflater.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/DefaultInflater.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/DefaultInflater.java index 99f4b54f..0e3deb54 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/DefaultInflater.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/DefaultInflater.java @@ -96,7 +96,10 @@ public class DefaultInflater implements Inflater { name = uri + "." + name; } - var canonicalName = name.replaceAll("\\*", "").replaceAll("\\.+", "."); + var canonicalName = name + .replaceAll("\\*", "") + .replaceAll("\\.+", ".") + .replaceAll("-+", "\\$"); var windowClass = loader.loadClass(canonicalName); @@ -177,7 +180,10 @@ public class DefaultInflater implements Inflater { name = uri + "." + name; } - var canonicalName = name.replaceAll("\\*", "").replaceAll("\\.+", "."); + var canonicalName = name + .replaceAll("\\*", "") + .replaceAll("\\.+", ".") + .replaceAll("-+", "\\$"); var componentClass = loader.loadClass(canonicalName); var component = createComponent(componentClass, node.getAttributes(), refs, context, gui);