--- old/make/jdk/src/classes/build/tools/jdwpgen/CommandSetNode.java	2020-03-23 19:57:51.967962146 +0100
+++ /dev/null	2020-02-11 10:29:13.086348146 +0100
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 1998, 2019, 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.io.*;
-
-class CommandSetNode extends AbstractNamedNode {
-
-    void constrainComponent(Context ctx, Node node) {
-        if (node instanceof CommandNode) {
-            node.constrain(ctx);
-        } else {
-            error("Expected 'Command' item, got: " + node);
-        }
-    }
-
-    void document(PrintWriter writer) {
-        writer.println("<h2 id=\"" + context.whereC + "\">" + name +
-                       " Command Set (" +
-                       nameNode.value() + ")</h2>");
-        writer.println(comment());
-        for (Node node : components) {
-            node.document(writer);
-        }
-    }
-
-    void documentIndex(PrintWriter writer) {
-        writer.print("<li><a href=\"#" + context.whereC + "\">");
-        writer.println(name() + "</a> Command Set (" +
-                       nameNode.value() + ")");
-        if (components.size() > 0) {
-            writer.println("<ul>");
-            for (Node node : components) {
-                node.documentIndex(writer);
-            }
-            writer.println("</ul>");
-        }
-    }
-
-    void genJavaClassSpecifics(PrintWriter writer, int depth) {
-        indent(writer, depth);
-        writer.println("static final int COMMAND_SET = " + nameNode.value() + ";");
-        indent(writer, depth);
-        writer.println("private " + name() + "() {}  // hide constructor");
-    }
-
-    void genJava(PrintWriter writer, int depth) {
-        genJavaClass(writer, depth);
-    }
-
-}
--- /dev/null	2020-02-11 10:29:13.086348146 +0100
+++ new/src/jdk.jdi/share/tools/org/openjdk/buildtools/jdwpgen/CommandSetNode.java	2020-03-23 19:57:51.599962149 +0100
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 1998, 2019, 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.io.*;
+
+class CommandSetNode extends AbstractNamedNode {
+
+    void constrainComponent(Context ctx, Node node) {
+        if (node instanceof CommandNode) {
+            node.constrain(ctx);
+        } else {
+            error("Expected 'Command' item, got: " + node);
+        }
+    }
+
+    void document(PrintWriter writer) {
+        writer.println("<h2 id=\"" + context.whereC + "\">" + name +
+                       " Command Set (" +
+                       nameNode.value() + ")</h2>");
+        writer.println(comment());
+        for (Node node : components) {
+            node.document(writer);
+        }
+    }
+
+    void documentIndex(PrintWriter writer) {
+        writer.print("<li><a href=\"#" + context.whereC + "\">");
+        writer.println(name() + "</a> Command Set (" +
+                       nameNode.value() + ")");
+        if (components.size() > 0) {
+            writer.println("<ul>");
+            for (Node node : components) {
+                node.documentIndex(writer);
+            }
+            writer.println("</ul>");
+        }
+    }
+
+    void genJavaClassSpecifics(PrintWriter writer, int depth) {
+        indent(writer, depth);
+        writer.println("static final int COMMAND_SET = " + nameNode.value() + ";");
+        indent(writer, depth);
+        writer.println("private " + name() + "() {}  // hide constructor");
+    }
+
+    void genJava(PrintWriter writer, int depth) {
+        genJavaClass(writer, depth);
+    }
+
+}