--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java	Tue Jun 04 16:20:42 2019 +0200
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java	Tue Jun 04 16:33:37 2019 +0200
@@ -35,7 +35,6 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
 import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.formats.html.markup.Table;
@@ -121,20 +120,9 @@
      */
     @Override
     public Content getSignature(VariableElement field) {
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        writer.addAnnotationInfo(field, pre);
-        addModifiers(field, pre);
-        Content fieldlink = writer.getLink(new LinkInfoImpl(
-                configuration, LinkInfoImpl.Kind.MEMBER, field.asType()));
-        pre.add(fieldlink);
-        pre.add(" ");
-        if (configuration.linksource) {
-            Content fieldName = new StringContent(name(field));
-            writer.addSrcLink(field, fieldName, pre);
-        } else {
-            addName(name(field), pre);
-        }
-        return pre;
+        return new MemberSignature(field)
+                .addType(field.asType())
+                .toContent();
     }
 
     /**