--- old/make/jdk/src/classes/build/tools/jdwpgen/AltNode.java	2020-03-23 19:57:43.603962208 +0100
+++ /dev/null	2020-02-11 10:29:13.086348146 +0100
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 1998, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.jdwpgen;
-
-import java.util.*;
-import java.io.*;
-
-class AltNode extends AbstractGroupNode implements TypeNode {
-
-    SelectNode select = null;
-
-    void constrain(Context ctx) {
-        super.constrain(ctx);
-
-        if (!(nameNode instanceof NameValueNode)) {
-            error("Alt name must have value: " + nameNode);
-        }
-        if (parent instanceof SelectNode) {
-            select = (SelectNode)parent;
-        } else {
-            error("Alt must be in Select");
-        }
-    }
-
-    void document(PrintWriter writer) {
-        writer.println("<tr>");
-        writer.println("<th colspan=\"2\" scope=\"row\">"
-                + indentElement(structIndent,
-                    "Case " + nameNode.name
-                    + " - if <i>" + ((SelectNode)parent).typeNode.name + "</i>" +
-                    " is " + nameNode.value() + ":"));
-        writer.println("<td>" + comment() + "&nbsp;");
-        writer.println("</tr>");
-
-        ++structIndent;
-        super.document(writer);
-        --structIndent;
-    }
-
-    String javaClassImplements() {
-        return " extends " + select.commonBaseClass();
-    }
-
-    void genJavaClassSpecifics(PrintWriter writer, int depth) {
-        indent(writer, depth);
-        writer.print("static final " + select.typeNode.javaType());
-        writer.println(" ALT_ID = " + nameNode.value() + ";");
-        if (context.isWritingCommand()) {
-            genJavaCreateMethod(writer, depth);
-        } else {
-            indent(writer, depth);
-            writer.println(select.typeNode.javaParam() + "() {");
-            indent(writer, depth+1);
-            writer.println("return ALT_ID;");
-            indent(writer, depth);
-            writer.println("}");
-        }
-        super.genJavaClassSpecifics(writer, depth);
-    }
-
-    void genJavaWriteMethod(PrintWriter writer, int depth) {
-        genJavaWriteMethod(writer, depth, "");
-    }
-
-    void genJavaReadsSelectCase(PrintWriter writer, int depth, String common) {
-        indent(writer, depth);
-        writer.println("case " + nameNode.value() + ":");
-        indent(writer, depth+1);
-        writer.println(common + " = new " + name + "(vm, ps);");
-        indent(writer, depth+1);
-        writer.println("break;");
-    }
-
-    void genJavaCreateMethod(PrintWriter writer, int depth) {
-        indent(writer, depth);
-        writer.print("static " + select.name() + " create(");
-        writer.print(javaParams());
-        writer.println(") {");
-        indent(writer, depth+1);
-        writer.print("return new " + select.name() + "(");
-        writer.print("ALT_ID, new " + javaClassName() + "(");
-        for (Iterator<Node> it = components.iterator(); it.hasNext();) {
-            TypeNode tn = (TypeNode)it.next();
-            writer.print(tn.name());
-            if (it.hasNext()) {
-                writer.print(", ");
-            }
-        }
-        writer.println("));");
-        indent(writer, depth);
-        writer.println("}");
-    }
-
-}
--- /dev/null	2020-02-11 10:29:13.086348146 +0100
+++ new/src/jdk.jdi/share/tools/org/openjdk/buildtools/jdwpgen/AltNode.java	2020-03-23 19:57:43.195962211 +0100
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 1998, 2013, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.openjdk.buildtools.jdwpgen;
+
+import java.util.*;
+import java.io.*;
+
+class AltNode extends AbstractGroupNode implements TypeNode {
+
+    SelectNode select = null;
+
+    void constrain(Context ctx) {
+        super.constrain(ctx);
+
+        if (!(nameNode instanceof NameValueNode)) {
+            error("Alt name must have value: " + nameNode);
+        }
+        if (parent instanceof SelectNode) {
+            select = (SelectNode)parent;
+        } else {
+            error("Alt must be in Select");
+        }
+    }
+
+    void document(PrintWriter writer) {
+        writer.println("<tr>");
+        writer.println("<th colspan=\"2\" scope=\"row\">"
+                + indentElement(structIndent,
+                    "Case " + nameNode.name
+                    + " - if <i>" + ((SelectNode)parent).typeNode.name + "</i>" +
+                    " is " + nameNode.value() + ":"));
+        writer.println("<td>" + comment() + "&nbsp;");
+        writer.println("</tr>");
+
+        ++structIndent;
+        super.document(writer);
+        --structIndent;
+    }
+
+    String javaClassImplements() {
+        return " extends " + select.commonBaseClass();
+    }
+
+    void genJavaClassSpecifics(PrintWriter writer, int depth) {
+        indent(writer, depth);
+        writer.print("static final " + select.typeNode.javaType());
+        writer.println(" ALT_ID = " + nameNode.value() + ";");
+        if (context.isWritingCommand()) {
+            genJavaCreateMethod(writer, depth);
+        } else {
+            indent(writer, depth);
+            writer.println(select.typeNode.javaParam() + "() {");
+            indent(writer, depth+1);
+            writer.println("return ALT_ID;");
+            indent(writer, depth);
+            writer.println("}");
+        }
+        super.genJavaClassSpecifics(writer, depth);
+    }
+
+    void genJavaWriteMethod(PrintWriter writer, int depth) {
+        genJavaWriteMethod(writer, depth, "");
+    }
+
+    void genJavaReadsSelectCase(PrintWriter writer, int depth, String common) {
+        indent(writer, depth);
+        writer.println("case " + nameNode.value() + ":");
+        indent(writer, depth+1);
+        writer.println(common + " = new " + name + "(vm, ps);");
+        indent(writer, depth+1);
+        writer.println("break;");
+    }
+
+    void genJavaCreateMethod(PrintWriter writer, int depth) {
+        indent(writer, depth);
+        writer.print("static " + select.name() + " create(");
+        writer.print(javaParams());
+        writer.println(") {");
+        indent(writer, depth+1);
+        writer.print("return new " + select.name() + "(");
+        writer.print("ALT_ID, new " + javaClassName() + "(");
+        for (Iterator<Node> it = components.iterator(); it.hasNext();) {
+            TypeNode tn = (TypeNode)it.next();
+            writer.print(tn.name());
+            if (it.hasNext()) {
+                writer.print(", ");
+            }
+        }
+        writer.println("));");
+        indent(writer, depth);
+        writer.println("}");
+    }
+
+}