Skip to content

Commit d46410c

Browse files
committed
8279785: JFR: 'jfr configure' should show default values
Reviewed-by: mgronlun
1 parent 2bbeae3 commit d46410c

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlFlag.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ final class XmlFlag extends XmlInput {
2929

3030
@Override
3131
public String getOptionSyntax() {
32-
return getName() + "=<true|false>";
32+
return getName() + "=<true|false>" + " (" + getContent() + ")";
3333
}
3434

3535
@Override

src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlSelection.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,15 @@ public String getOptionSyntax() {
3636
for (XmlOption option : getOptions()) {
3737
sj.add(option.getName());
3838
}
39-
return getName() + "=" + sj.toString();
39+
StringBuilder sb = new StringBuilder();
40+
sb.append(getName());
41+
sb.append("=");
42+
sb.append(sj.toString());
43+
XmlOption selected = getSelected();
44+
if (selected != null) {
45+
sb.append(" (").append(selected.getName()).append(")");
46+
}
47+
return sb.toString();
4048
}
4149

4250
@Override

src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlText.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ public String getOptionSyntax() {
3434
sb.append("=<");
3535
sb.append(getContentType().orElse("text"));
3636
sb.append(">");
37+
sb.append(" (");
38+
String content = getContent();
39+
if (isTimespan()) {
40+
// "20 ms" becomes "20ms"
41+
content = content.replaceAll("\\s", "");
42+
}
43+
sb.append(content);
44+
sb.append(")");
3745
return sb.toString();
3846
}
3947

0 commit comments

Comments
 (0)