diff -r 3b1733fb3793 -r 0bc544b38cfa java/sql-dk/src/info/globalcode/sql/dk/InfoLister.java --- a/java/sql-dk/src/info/globalcode/sql/dk/InfoLister.java Sat Aug 15 16:15:30 2015 +0200 +++ b/java/sql-dk/src/info/globalcode/sql/dk/InfoLister.java Sun Aug 16 01:25:01 2015 +0200 @@ -188,17 +188,6 @@ } } - private PropertyDeclaration[] getPropertyDeclarations(Class formatterClass) { - PropertyDeclarations properties = formatterClass.getAnnotation(PropertyDeclarations.class); - - if (properties == null) { - PropertyDeclaration p = formatterClass.getAnnotation(PropertyDeclaration.class); - return p == null ? new PropertyDeclaration[]{} : new PropertyDeclaration[]{p}; - } else { - return properties.value(); - } - } - private void listFormatterProperties(String formatterName) throws FormatterException, ConfigurationException { FormatterDefinition fd = configurationProvider.getConfiguration().getFormatter(formatterName); try { @@ -223,7 +212,7 @@ List> hierarchy = Functions.getClassHierarchy(formatterClass, Formatter.class); Collections.reverse(hierarchy); hierarchy.stream().forEach((c) -> { - for (PropertyDeclaration p : getPropertyDeclarations(c)) { + for (PropertyDeclaration p : Functions.getPropertyDeclarations(c)) { data.put(p.name(), propertyDeclarationToRow(p, c, printDeclaredIn)); } });