diff --git a/diylc/diylc-core/src/org/diylc/presenter/ComponentProcessor.java b/diylc/diylc-core/src/org/diylc/presenter/ComponentProcessor.java index 1ee1201d..61250022 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/ComponentProcessor.java +++ b/diylc/diylc-core/src/org/diylc/presenter/ComponentProcessor.java @@ -152,7 +152,10 @@ public class ComponentProcessor { for (Method getter : clazz.getMethods()) { if (getter.getName().startsWith("get")) { try { - if (getter.isAnnotationPresent(EditableProperty.class) && !getter.isAnnotationPresent(Deprecated.class)) { + if (getter.isAnnotationPresent(EditableProperty.class) && !getter.isAnnotationPresent(Deprecated.class) + // since Java 8 in generic classes we get properties of both the generic type and Object + // added this condition to skip Object property that we do not need + && getter.getReturnType() != Object.class) { EditableProperty annotation = getter.getAnnotation(EditableProperty.class); String name; if (annotation.name().equals("")) { diff --git a/diylc/diylc-swing/build.xml b/diylc/diylc-swing/build.xml index f77a7d15..dda18738 100644 --- a/diylc/diylc-swing/build.xml +++ b/diylc/diylc-swing/build.xml @@ -101,7 +101,7 @@ outputdirectory="${build.dir}" name="DIYLC" jvmrequired="1.8" - copyright="Branislav Stojkovic, a.k.a. bancika" + copyright="2020 bancika" displayname="DIY Layout Creator" identifier="org.diylc.Desktop" shortversion="${diylc.version}"