diff --git a/src/main/java/somehussar/gui/GuiEditable.java b/src/main/java/somehussar/gui/GuiEditable.java index b32d4f7c4..52a8d4067 100644 --- a/src/main/java/somehussar/gui/GuiEditable.java +++ b/src/main/java/somehussar/gui/GuiEditable.java @@ -8,6 +8,17 @@ public @interface GuiEditable { @Retention(RetentionPolicy.RUNTIME) @interface Field { - String name() default ""; + String value(); + + /** + * Display order + * Higher value = higher priority. + */ + int order() default 0; + } + + @Retention(RetentionPolicy.RUNTIME) + @interface Group { + String value(); } } diff --git a/src/main/java/somehussar/gui/GuiFieldHandler.java b/src/main/java/somehussar/gui/GuiFieldHandler.java index f217e2b5a..ba5356696 100644 --- a/src/main/java/somehussar/gui/GuiFieldHandler.java +++ b/src/main/java/somehussar/gui/GuiFieldHandler.java @@ -67,12 +67,17 @@ public final class GuiFieldHandler { if (Modifier.isFinal(field.getModifiers())) return null; field.setAccessible(true); - EditableField.Builder builder = new EditableField.Builder(); - builder.name(fieldConfig.name()); - builder.type(field.getType()); - builder.getter(LOOKUP.unreflectGetter(field)); - builder.setter(LOOKUP.unreflectSetter(field)); - builder.constraints(buildConstraints(field)); + EditableField.Builder builder = new EditableField.Builder() + .name(fieldConfig.value()) + .type(field.getType()) + .getter(LOOKUP.unreflectGetter(field)) + .setter(LOOKUP.unreflectSetter(field)) + .constraints(buildConstraints(field)) + .order(fieldConfig.order()); + + GuiEditable.Group group = field.getAnnotation(GuiEditable.Group.class); + if (group != null) + builder.group(group.value()); return builder.build(); diff --git a/src/main/java/somehussar/gui/field/EditableField.java b/src/main/java/somehussar/gui/field/EditableField.java index a1a076efd..c0ace4303 100644 --- a/src/main/java/somehussar/gui/field/EditableField.java +++ b/src/main/java/somehussar/gui/field/EditableField.java @@ -11,6 +11,8 @@ public final class EditableField { private final MethodHandle getter; private final MethodHandle setter; private final FieldConstraints constraints; + private final int order; + private final String group; public String getName() { return name; @@ -42,12 +44,16 @@ public final class EditableField { return this.constraints; } + public int getOrder() { return this.order; } + EditableField(Builder b) { this.name = b.name; this.type = b.type; this.getter = b.getter; this.setter = b.setter; this.constraints = b.constraints; + this.order = b.order; + this.group = b.group; } public static class Builder { @@ -56,15 +62,19 @@ public final class EditableField { private MethodHandle getter; private MethodHandle setter; private FieldConstraints constraints; + private int order; + private String group = null; public Builder name(String v) { this.name = v; return this; } public Builder type(Class v) { this.type = v; return this; } public Builder getter(MethodHandle v) { this.getter = v; return this; } public Builder setter(MethodHandle v) { this.setter = v; return this; } public Builder constraints(FieldConstraints v) { this.constraints = v; return this; } + public Builder order(int order) { this.order = order; return this; } + public Builder group(String value) { this.group = value; return this; } public EditableField build() { - return new EditableField(this); + return new EditableField<>(this); } }