# HG changeset patch
# User dtitov
# Date 1515520270 28800
# Node ID b1006bbb925a1f11de36ee64614378e7e1e3e819
# Parent a92a5a71364acd1f5b789801381762c53432600e
8187448: 360 doc issues in jdwp-protocol.html
Reviewed-by: sspitsyn, amenkov
diff -r a92a5a71364a -r b1006bbb925a make/data/jdwp/jdwp.spec
--- a/make/data/jdwp/jdwp.spec Tue Jan 09 18:18:36 2018 +0300
+++ b/make/data/jdwp/jdwp.spec Tue Jan 09 09:51:10 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -869,7 +869,6 @@
"section in "
"The Java™ Virtual Machine Specification. "
"Since JDWP version 1.5."
- "
(Out
(referenceType refType "The reference type ID.")
)
@@ -2723,7 +2722,6 @@
"
"
"The events that are grouped in a composite event are restricted in the "
"following ways: "
- "
"
"
"
"- Only with other thread start events for the same thread:"
"
"
diff -r a92a5a71364a -r b1006bbb925a make/jdk/src/classes/build/tools/jdwpgen/AbstractCommandNode.java
--- a/make/jdk/src/classes/build/tools/jdwpgen/AbstractCommandNode.java Tue Jan 09 18:18:36 2018 +0300
+++ b/make/jdk/src/classes/build/tools/jdwpgen/AbstractCommandNode.java Tue Jan 09 09:51:10 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,8 @@
class AbstractCommandNode extends AbstractNamedNode {
void document(PrintWriter writer) {
- writer.println("");
+ writer.println("" + name +
+ " Command (" + nameNode.value() + ")
");
writer.println(comment());
writer.println("");
for (Node node : components) {
diff -r a92a5a71364a -r b1006bbb925a make/jdk/src/classes/build/tools/jdwpgen/AbstractNamedNode.java
--- a/make/jdk/src/classes/build/tools/jdwpgen/AbstractNamedNode.java Tue Jan 09 18:18:36 2018 +0300
+++ b/make/jdk/src/classes/build/tools/jdwpgen/AbstractNamedNode.java Tue Jan 09 09:51:10 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -62,8 +62,8 @@
}
void document(PrintWriter writer) {
- writer.println("");
+ writer.println("" + name +
+ " Command Set
");
for (Node node : components) {
node.document(writer);
}
diff -r a92a5a71364a -r b1006bbb925a make/jdk/src/classes/build/tools/jdwpgen/AbstractTypeListNode.java
--- a/make/jdk/src/classes/build/tools/jdwpgen/AbstractTypeListNode.java Tue Jan 09 18:18:36 2018 +0300
+++ b/make/jdk/src/classes/build/tools/jdwpgen/AbstractTypeListNode.java Tue Jan 09 09:51:10 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,11 +43,11 @@
if (components.isEmpty()) {
writer.println("- (None)");
} else {
- writer.println("
");
+ writer.println("");
for (int i = maxStructIndent; i > 0; --i) {
- writer.print("");
+ writer.print(" | ");
}
- writer.println(" | | ");
+ writer.println(" | | ");
writer.println("");
for (Node node : components) {
node.document(writer);
diff -r a92a5a71364a -r b1006bbb925a make/jdk/src/classes/build/tools/jdwpgen/CommandSetNode.java
--- a/make/jdk/src/classes/build/tools/jdwpgen/CommandSetNode.java Tue Jan 09 18:18:36 2018 +0300
+++ b/make/jdk/src/classes/build/tools/jdwpgen/CommandSetNode.java Tue Jan 09 09:51:10 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,8 @@
}
void document(PrintWriter writer) {
- writer.println("" + name +
- " Command Set (" +
+ writer.println("" + name +
+ " Command Set (" +
nameNode.value() + ")");
writer.println(comment());
for (Node node : components) {
@@ -51,11 +51,13 @@
writer.print("- ");
writer.println(name() + " Command Set (" +
nameNode.value() + ")");
- writer.println("
");
- for (Node node : components) {
- node.documentIndex(writer);
+ if (components.size() > 0) {
+ writer.println("");
+ for (Node node : components) {
+ node.documentIndex(writer);
+ }
+ writer.println(" ");
}
- writer.println(" ");
}
void genJavaClassSpecifics(PrintWriter writer, int depth) {
diff -r a92a5a71364a -r b1006bbb925a make/jdk/src/classes/build/tools/jdwpgen/ConstantSetNode.java
--- a/make/jdk/src/classes/build/tools/jdwpgen/ConstantSetNode.java Tue Jan 09 18:18:36 2018 +0300
+++ b/make/jdk/src/classes/build/tools/jdwpgen/ConstantSetNode.java Tue Jan 09 09:51:10 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -54,15 +54,15 @@
}
void document(PrintWriter writer) {
- writer.println("");
+ writer.println("" + name +
+ " Constants");
writer.println(comment());
- writer.println("");
- writer.println(" | | ");
+ writer.println("");
+ writer.println(" | | ");
ConstantNode n;
for (Node node : components) {
n = (ConstantNode)node;
- writer.println("");
+ writer.println("");
n.document(writer);
}
writer.println(" | ");
diff -r a92a5a71364a -r b1006bbb925a make/jdk/src/classes/build/tools/jdwpgen/ErrorSetNode.java
--- a/make/jdk/src/classes/build/tools/jdwpgen/ErrorSetNode.java Tue Jan 09 18:18:36 2018 +0300
+++ b/make/jdk/src/classes/build/tools/jdwpgen/ErrorSetNode.java Tue Jan 09 09:51:10 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
if (components.isEmpty()) {
writer.println("- (None)");
} else {
- writer.println("
");
+ writer.println("");
for (Node node : components) {
node.document(writer);
}
diff -r a92a5a71364a -r b1006bbb925a make/jdk/src/classes/build/tools/jdwpgen/RootNode.java
--- a/make/jdk/src/classes/build/tools/jdwpgen/RootNode.java Tue Jan 09 18:18:36 2018 +0300
+++ b/make/jdk/src/classes/build/tools/jdwpgen/RootNode.java Tue Jan 09 09:51:10 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,11 +41,22 @@
void document(PrintWriter writer) {
writer.println("");
- writer.println("" + comment() + "");
- writer.println("");
+ writer.println("");
+ writer.println("");
+ writer.println("");
+ writer.println("" + comment() + "");
+ writer.println("");
+ writer.println("");
+ writer.println("");
+ writer.println("");
for (Node node : components) {
node.documentIndex(writer);
}
+ writer.println(" ");
for (Node node : components) {
node.document(writer);
}
|
|