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

Improve widgets' attributes parsing engine

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2022-08-25 18:23:25 +02:00
parent 43c36a30ec
commit 7d8848c6e5
6 changed files with 164 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/src/main/java/com/bartlomiejpluta/base/api/gui/Attribute.java Normal file
View File

@@ -0,0 +1,10 @@
package com.bartlomiejpluta.base.api.gui;
import java.lang.annotation.*;
@Inherited
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface Attribute {
String value();
}

42
api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseWidget.java
View File

@@ -2,10 +2,12 @@ package com.bartlomiejpluta.base.lib.gui;
import com.bartlomiejpluta.base.api.event.Event;
import com.bartlomiejpluta.base.api.event.EventType;
import com.bartlomiejpluta.base.api.gui.Attribute;
import com.bartlomiejpluta.base.api.gui.SizeMode;
import com.bartlomiejpluta.base.api.gui.Widget;
import com.bartlomiejpluta.base.lib.event.EventHandler;
import java.util.Locale;
import java.util.function.Consumer;
public abstract class BaseWidget implements Widget {
@@ -39,8 +41,8 @@ public abstract class BaseWidget implements Widget {
@Override
public float getWidth() {
return widthMode == SizeMode.RELATIVE
? (parent != null ? width * parent.getWidth() - parent.getPaddingLeft() - parent.getPaddingRight() - marginLeft - marginRight : 0)
: getActualWidth();
? (parent != null ? width * parent.getWidth() - parent.getPaddingLeft() - parent.getPaddingRight() - marginLeft - marginRight : 0)
: getActualWidth();
}
@Override
@@ -51,8 +53,8 @@ public abstract class BaseWidget implements Widget {
@Override
public float getHeight() {
return heightMode == SizeMode.RELATIVE
? (parent != null ? height * parent.getHeight() - parent.getPaddingTop() - parent.getPaddingBottom() - marginTop - marginBottom : 0)
: getActualHeight();
? (parent != null ? height * parent.getHeight() - parent.getPaddingTop() - parent.getPaddingBottom() - marginTop - marginBottom : 0)
: getActualHeight();
}
@Override
@@ -70,6 +72,36 @@ public abstract class BaseWidget implements Widget {
this.height = height;
}
@Attribute("height")
public void setHeight(String height) {
var heightLowerCased = height.toLowerCase(Locale.ROOT);
if (heightLowerCased.equals("auto")) {
this.heightMode = SizeMode.AUTO;
} else if (heightLowerCased.equals("relative")) {
this.heightMode = SizeMode.RELATIVE;
this.height = 1f;
} else {
this.heightMode = SizeMode.ABSOLUTE;
this.height = Float.parseFloat(height);
}
}
@Attribute("width")
public void setWidth(String width) {
var widthLowerCased = width.toLowerCase(Locale.ROOT);
if (widthLowerCased.equals("auto")) {
this.widthMode = SizeMode.AUTO;
} else if (widthLowerCased.equals("relative")) {
this.widthMode = SizeMode.RELATIVE;
this.width = 1f;
} else {
this.widthMode = SizeMode.ABSOLUTE;
this.width = Float.parseFloat(width);
}
}
@Override
public void setSize(Float width, Float height) {
this.width = width;
@@ -88,6 +120,7 @@ public abstract class BaseWidget implements Widget {
}
@Override
@Attribute("widthMode")
public void setWidthMode(SizeMode mode) {
this.widthMode = mode;
}
@@ -98,6 +131,7 @@ public abstract class BaseWidget implements Widget {
}
@Override
@Attribute("heightMode")
public void setHeightMode(SizeMode mode) {
this.heightMode = mode;
}

1
api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseWindow.java
View File

@@ -58,6 +58,7 @@ public abstract class BaseWindow extends BaseWidget implements Window {
}
@Override
@Attribute("windowPosition")
public void setWindowPosition(WindowPosition windowPosition) {
this.windowPosition = requireNonNull(windowPosition);
}

12
api/src/main/java/com/bartlomiejpluta/base/lib/gui/Label.java
View File

@@ -1,6 +1,7 @@
package com.bartlomiejpluta.base.lib.gui;
import com.bartlomiejpluta.base.api.context.Context;
import com.bartlomiejpluta.base.api.gui.Attribute;
import com.bartlomiejpluta.base.api.gui.Color;
import com.bartlomiejpluta.base.api.gui.GUI;
import com.bartlomiejpluta.base.api.screen.Screen;
@@ -50,8 +51,15 @@ public class Label extends BaseComponent {
return alignment;
}
public void setAlignment(Integer alignment) {
this.alignment = alignment;
@Attribute("alignment")
public void setAlignment(TextAlignment... alignment) {
byte b = 0;
for (var elem : alignment) {
b |= elem.getAlign();
}
this.alignment = b;
}
public float getRed() {

20
api/src/main/java/com/bartlomiejpluta/base/lib/gui/TextAlignment.java Normal file
View File

@@ -0,0 +1,20 @@
package com.bartlomiejpluta.base.lib.gui;
import com.bartlomiejpluta.base.api.gui.GUI;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public enum TextAlignment {
LEFT(GUI.ALIGN_LEFT),
CENTER(GUI.ALIGN_CENTER),
RIGHT(GUI.ALIGN_RIGHT),
TOP(GUI.ALIGN_TOP),
MIDDLE(GUI.ALIGN_MIDDLE),
BOTTOM(GUI.ALIGN_BOTTOM),
BASELINE(GUI.ALIGN_BASELINE);
@Getter
private final int align;
}

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

@@ -14,16 +14,14 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import java.io.File;
import java.io.InputStream;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Stream;
@org.springframework.stereotype.Component
public class DefaultInflater implements Inflater {
private static final String[] IMPORTS = Stream.of(GUI.class, SizeMode.class, WindowPosition.class)
.map(Class::getCanonicalName)
.toArray(String[]::new);
private final DocumentBuilder builder;
private final ClassLoader loader;
@@ -91,11 +89,11 @@ public class DefaultInflater implements Inflater {
}
var canonicalName = name
.replaceAll("\\*", "")
.replaceAll("\\.+", ".")
.replaceAll("-+", "\\$");
.replaceAll("\\*", "")
.replaceAll("\\.+", ".")
.replaceAll("-+", "\\$");
var windowClass = loader.loadClass(canonicalName);
var windowClass = loader.<Window>loadClass(canonicalName);
var window = (Window) windowClass.getConstructor(Context.class, GUI.class, Map.class).newInstance(context, gui, refs);
var attributes = root.getAttributes();
@@ -109,10 +107,7 @@ public class DefaultInflater implements Inflater {
continue;
}
var setterName = createSetterMethodName(attribute.getLocalName());
var value = parseValue(attribute.getNodeValue());
var setter = windowClass.getMethod(setterName, value.getClass());
setter.invoke(window, value);
setAttribute(windowClass, window, attribute);
}
// Parse window content
@@ -143,6 +138,22 @@ public class DefaultInflater implements Inflater {
return window;
}
private void setAttribute(Class<? extends Widget> clazz, Widget widget, Node attribute) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
for (var setter : clazz.getMethods()) {
if (setter.isAnnotationPresent(Attribute.class) && setter.getAnnotation(Attribute.class).value().equals(attribute.getLocalName()) && setter.getParameterCount() == 1) {
var value = parseSimpleValue(setter, attribute.getNodeValue());
setter.invoke(widget, value);
return;
}
}
var setterName = createSetterMethodName(attribute.getLocalName());
var value = parseValue(attribute.getNodeValue());
var setter = clazz.getMethod(setterName, value.getClass());
setter.invoke(widget, value);
}
private void invokeInflatableHook(Widget widget) {
if (widget instanceof Inflatable) {
((Inflatable) widget).onInflate();
@@ -187,11 +198,11 @@ public class DefaultInflater implements Inflater {
}
var canonicalName = name
.replaceAll("\\*", "")
.replaceAll("\\.+", ".")
.replaceAll("-+", "\\$");
.replaceAll("\\*", "")
.replaceAll("\\.+", ".")
.replaceAll("-+", "\\$");
var componentClass = loader.loadClass(canonicalName);
var componentClass = loader.<Component>loadClass(canonicalName);
var component = createComponent(componentClass, node.getAttributes(), refs, context, gui);
var children = node.getChildNodes();
@@ -221,7 +232,7 @@ public class DefaultInflater implements Inflater {
}
@SneakyThrows
private Component createComponent(Class<?> componentClass, NamedNodeMap attributes, Map<String, Component> refs, Context context, GUI gui) {
private Component createComponent(Class<? extends Widget> componentClass, NamedNodeMap attributes, Map<String, Component> refs, Context context, GUI gui) {
var component = (Component) componentClass.getConstructor(Context.class, GUI.class).newInstance(context, gui);
// Set attributes via setter methods
@@ -239,10 +250,7 @@ public class DefaultInflater implements Inflater {
continue;
}
var setterName = createSetterMethodName(attribute.getLocalName());
var value = parseValue(attribute.getNodeValue());
var setter = componentClass.getMethod(setterName, value.getClass());
setter.invoke(component, value);
setAttribute(componentClass, component, attribute);
}
return component;
@@ -252,10 +260,63 @@ public class DefaultInflater implements Inflater {
return "set" + name.substring(0, 1).toUpperCase() + name.substring(1);
}
private static Object parseSimpleValue(Method method, String value) {
var type = method.getParameterTypes()[0];
if (type.isArray()) {
var arrayType = type.getComponentType();
var items = value.split("\\|");
var values = Array.newInstance(arrayType, items.length);
for (int i = 0; i < items.length; ++i) {
Array.set(values, i, parseSimpleValue(arrayType, items[i].trim()));
}
return values;
}
return parseSimpleValue(type, value);
}
@SuppressWarnings("unchecked")
private static Object parseSimpleValue(Class<?> type, String value) {
if (type == String.class) {
return value;
}
if (type == Short.TYPE || type == Short.class) {
return Short.valueOf(value);
}
if (type == Integer.TYPE || type == Integer.class) {
return Integer.valueOf(value);
}
if (type == Long.TYPE || type == Long.class) {
return Long.valueOf(value);
}
if (type == Boolean.TYPE || type == Boolean.class) {
return Boolean.valueOf(value);
}
if (type == Float.TYPE || type == Float.class) {
return Float.valueOf(value);
}
if (type == Double.TYPE || type == Double.class) {
return Double.valueOf(value);
}
if (type.isEnum()) {
return Enum.valueOf((Class<? extends Enum>) type, value.toUpperCase());
}
throw new AppException("Attribute of type [" + type.getCanonicalName() + "] is not supported");
}
@SneakyThrows
private Object parseValue(String value) {
private static Object parseValue(String value) {
var evaluator = new ExpressionEvaluator();
evaluator.setDefaultImports(IMPORTS);
evaluator.cook(value);
return evaluator.evaluate();
}