--- old/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java	2018-06-25 10:54:23.857751038 +0200
+++ new/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java	2018-06-25 10:54:23.758751214 +0200
@@ -664,6 +664,9 @@
         // properties aren't named setA* or getA*
         private final Pattern pattern = Pattern.compile("[sg]et\\p{Upper}.*");
         private boolean isPropertyMethod(MethodDoc method) {
+            if (!configuration.javafx) {
+               return false;
+            }
             if (!method.name().endsWith("Property")) {
                 return false;
             }
@@ -675,7 +678,9 @@
             if (pattern.matcher(method.name()).matches()) {
                 return false;
             }
-
+            if (method.typeParameters().length > 0) {
+                return false;
+            }
             return 0 == method.parameters().length
                     && !"void".equals(method.returnType().simpleTypeName());
         }