1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java Fri Apr 13 18:20:32 2018 +0000 1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java Tue Jun 19 12:03:35 2018 +0200 1.3 @@ -664,6 +664,9 @@ 1.4 // properties aren't named setA* or getA* 1.5 private final Pattern pattern = Pattern.compile("[sg]et\\p{Upper}.*"); 1.6 private boolean isPropertyMethod(MethodDoc method) { 1.7 + if (!configuration.javafx) { 1.8 + return false; 1.9 + } 1.10 if (!method.name().endsWith("Property")) { 1.11 return false; 1.12 } 1.13 @@ -675,7 +678,9 @@ 1.14 if (pattern.matcher(method.name()).matches()) { 1.15 return false; 1.16 } 1.17 - 1.18 + if (method.typeParameters().length > 0) { 1.19 + return false; 1.20 + } 1.21 return 0 == method.parameters().length 1.22 && !"void".equals(method.returnType().simpleTypeName()); 1.23 }