diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlFlag.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlFlag.java index d494d3eb57ded..8e3431bc5a343 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlFlag.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlFlag.java @@ -29,7 +29,7 @@ final class XmlFlag extends XmlInput { @Override public String getOptionSyntax() { - return getName() + "=<true|false>"; + return getName() + "=<true|false>" + " (" + getContent() + ")"; } @Override diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlSelection.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlSelection.java index d3bf224047977..c451119fb1af2 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlSelection.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlSelection.java @@ -36,7 +36,15 @@ public String getOptionSyntax() { for (XmlOption option : getOptions()) { sj.add(option.getName()); } - return getName() + "=" + sj.toString(); + StringBuilder sb = new StringBuilder(); + sb.append(getName()); + sb.append("="); + sb.append(sj.toString()); + XmlOption selected = getSelected(); + if (selected != null) { + sb.append(" (").append(selected.getName()).append(")"); + } + return sb.toString(); } @Override diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlText.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlText.java index 789243d2d5fb4..4d90dd3c51ceb 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlText.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlText.java @@ -34,6 +34,14 @@ public String getOptionSyntax() { sb.append("=<"); sb.append(getContentType().orElse("text")); sb.append(">"); + sb.append(" ("); + String content = getContent(); + if (isTimespan()) { + // "20 ms" becomes "20ms" + content = content.replaceAll("\\s", ""); + } + sb.append(content); + sb.append(")"); return sb.toString(); }