--- old/make/jdk/src/classes/build/tools/jdwpgen/AbstractTypeNode.java	2020-03-23 19:57:42.747962214 +0100
+++ /dev/null	2020-02-11 10:29:13.086348146 +0100
@@ -1,77 +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.*;
-
-abstract class AbstractTypeNode extends AbstractNamedNode
-                                implements TypeNode {
-
-    abstract String docType();
-
-    public abstract void genJavaWrite(PrintWriter writer, int depth,
-                                      String writeLabel);
-
-    abstract String javaRead();
-
-    void document(PrintWriter writer) {
-        writer.println("<tr>");
-        writer.println("<td>" + indentElement(structIndent, docType()));
-        writer.println("<th scope=\"row\"><i>" + name() + "</i>");
-        writer.println("<td>" + comment() + "&nbsp;");
-        writer.println("</tr>");
-    }
-
-    String javaType() {
-        return docType(); // default
-    }
-
-    public void genJavaRead(PrintWriter writer, int depth,
-                            String readLabel) {
-        indent(writer, depth);
-        writer.print(readLabel);
-        writer.print(" = ");
-        writer.print(javaRead());
-        writer.println(";");
-        genJavaDebugRead(writer, depth, readLabel, debugValue(readLabel));
-    }
-
-    public void genJavaDeclaration(PrintWriter writer, int depth) {
-        writer.println();
-        genJavaComment(writer, depth);
-        indent(writer, depth);
-        writer.print("final ");
-        writer.print(javaType());
-        writer.print(" " + name);
-        writer.println(";");
-    }
-
-    public String javaParam() {
-        return javaType() + " " + name;
-    }
-}
--- /dev/null	2020-02-11 10:29:13.086348146 +0100
+++ new/src/jdk.jdi/share/tools/org/openjdk/buildtools/jdwpgen/AbstractTypeNode.java	2020-03-23 19:57:42.311962217 +0100
@@ -0,0 +1,77 @@
+/*
+ * 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.*;
+
+abstract class AbstractTypeNode extends AbstractNamedNode
+                                implements TypeNode {
+
+    abstract String docType();
+
+    public abstract void genJavaWrite(PrintWriter writer, int depth,
+                                      String writeLabel);
+
+    abstract String javaRead();
+
+    void document(PrintWriter writer) {
+        writer.println("<tr>");
+        writer.println("<td>" + indentElement(structIndent, docType()));
+        writer.println("<th scope=\"row\"><i>" + name() + "</i>");
+        writer.println("<td>" + comment() + "&nbsp;");
+        writer.println("</tr>");
+    }
+
+    String javaType() {
+        return docType(); // default
+    }
+
+    public void genJavaRead(PrintWriter writer, int depth,
+                            String readLabel) {
+        indent(writer, depth);
+        writer.print(readLabel);
+        writer.print(" = ");
+        writer.print(javaRead());
+        writer.println(";");
+        genJavaDebugRead(writer, depth, readLabel, debugValue(readLabel));
+    }
+
+    public void genJavaDeclaration(PrintWriter writer, int depth) {
+        writer.println();
+        genJavaComment(writer, depth);
+        indent(writer, depth);
+        writer.print("final ");
+        writer.print(javaType());
+        writer.print(" " + name);
+        writer.println(";");
+    }
+
+    public String javaParam() {
+        return javaType() + " " + name;
+    }
+}