--- old/make/jdk/netbeans/common/standard-bindings.ent	2020-04-29 12:11:46.892610420 +0200
+++ /dev/null	2020-02-11 10:29:13.086348146 +0100
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<action name="build">
-    <target>build</target>
-</action>
-<action name="clean">
-    <target>clean</target>
-</action>
-<action name="rebuild">
-    <target>clean</target>
-    <target>build</target>
-</action>
-<action name="compile.single">
-    <target>compile-single</target>
-    <property name="srcdir">${root}/src/share/classes</property>
-    <context>
-        <property>includes</property>
-        <folder>${root}/src/share/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path</format>
-        <arity>
-            <separated-files>,</separated-files>
-        </arity>
-    </context>
-</action>
-<action name="compile.single">
-    <target>compile-single</target>
-    <property name="srcdir">${root}/src/solaris/classes</property>
-    <context>
-        <property>includes</property>
-        <folder>${root}/src/solaris/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path</format>
-        <arity>
-            <separated-files>,</separated-files>
-        </arity>
-    </context>
-</action>
-<action name="compile.single">
-    <target>compile-single</target>
-    <property name="srcdir">${root}/src/windows/classes</property>
-    <context>
-        <property>includes</property>
-        <folder>${root}/src/windows/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path</format>
-        <arity>
-            <separated-files>,</separated-files>
-        </arity>
-    </context>
-</action>
-<action name="compile.single">
-    <target>compile-single</target>
-    <property name="srcdir">${root}/src/closed/share/classes</property>
-    <context>
-        <property>includes</property>
-        <folder>${root}/src/closed/share/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path</format>
-        <arity>
-            <separated-files>,</separated-files>
-        </arity>
-    </context>
-</action>
-<action name="test">
-    <target>jtreg-nb</target>
-</action>
-<action name="run.single">
-    <target>jtreg-nb</target>
-    <context>
-        <property>jtreg.tests</property>
-        <folder>${root}/test</folder>
-        <pattern>\.(java|sh)$</pattern>
-        <format>relative-path</format>
-        <arity>
-            <separated-files>,</separated-files>
-        </arity>
-    </context>
-</action>
-<action name="debug.single">
-    <target>jtreg-debug-nb</target>
-    <context>
-        <property>jtreg.tests</property>
-        <folder>${root}/test</folder>
-        <pattern>\.(java|sh)$</pattern>
-        <format>relative-path</format>
-        <arity>
-            <one-file-only/>
-        </arity>
-    </context>
-</action>
-<action name="debug.fix">
-    <target>debug-fix</target>
-    <property name="srcdir">${root}/src/share/classes</property>
-    <context>
-        <property>class</property>
-        <folder>${root}/src/share/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path-noext</format>
-        <arity>
-            <one-file-only/>
-        </arity>
-    </context>
-</action>
-<action name="debug.fix">
-    <target>debug-fix</target>
-    <property name="srcdir">${root}/src/solaris/classes</property>
-    <context>
-        <property>class</property>
-        <folder>${root}/src/solaris/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path-noext</format>
-        <arity>
-            <one-file-only/>
-        </arity>
-    </context>
-</action>
-<action name="debug.fix">
-    <target>debug-fix</target>
-    <property name="srcdir">${root}/src/windows/classes</property>
-    <context>
-        <property>class</property>
-        <folder>${root}/src/windows/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path-noext</format>
-        <arity>
-            <one-file-only/>
-        </arity>
-    </context>
-</action>
-<action name="debug.fix">
-    <target>debug-fix</target>
-    <property name="srcdir">${root}/src/closed/share/classes</property>
-    <context>
-        <property>class</property>
-        <folder>${root}/src/closed/share/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path-noext</format>
-        <arity>
-            <one-file-only/>
-        </arity>
-    </context>
-</action>
-<action name="javadoc">
-    <target>javadoc-nb</target>
-</action>
--- /dev/null	2020-02-11 10:29:13.086348146 +0100
+++ new/make/ide/netbeans/jdk/common/standard-bindings.ent	2020-04-29 12:11:46.456610423 +0200
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+   - Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+
+   - Neither the name of Oracle nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<action name="build">
+    <target>build</target>
+</action>
+<action name="clean">
+    <target>clean</target>
+</action>
+<action name="rebuild">
+    <target>clean</target>
+    <target>build</target>
+</action>
+<action name="compile.single">
+    <target>compile-single</target>
+    <property name="srcdir">${root}/src/share/classes</property>
+    <context>
+        <property>includes</property>
+        <folder>${root}/src/share/classes</folder>
+        <pattern>\.java$</pattern>
+        <format>relative-path</format>
+        <arity>
+            <separated-files>,</separated-files>
+        </arity>
+    </context>
+</action>
+<action name="compile.single">
+    <target>compile-single</target>
+    <property name="srcdir">${root}/src/solaris/classes</property>
+    <context>
+        <property>includes</property>
+        <folder>${root}/src/solaris/classes</folder>
+        <pattern>\.java$</pattern>
+        <format>relative-path</format>
+        <arity>
+            <separated-files>,</separated-files>
+        </arity>
+    </context>
+</action>
+<action name="compile.single">
+    <target>compile-single</target>
+    <property name="srcdir">${root}/src/windows/classes</property>
+    <context>
+        <property>includes</property>
+        <folder>${root}/src/windows/classes</folder>
+        <pattern>\.java$</pattern>
+        <format>relative-path</format>
+        <arity>
+            <separated-files>,</separated-files>
+        </arity>
+    </context>
+</action>
+<action name="compile.single">
+    <target>compile-single</target>
+    <property name="srcdir">${root}/src/closed/share/classes</property>
+    <context>
+        <property>includes</property>
+        <folder>${root}/src/closed/share/classes</folder>
+        <pattern>\.java$</pattern>
+        <format>relative-path</format>
+        <arity>
+            <separated-files>,</separated-files>
+        </arity>
+    </context>
+</action>
+<action name="test">
+    <target>jtreg-nb</target>
+</action>
+<action name="run.single">
+    <target>jtreg-nb</target>
+    <context>
+        <property>jtreg.tests</property>
+        <folder>${root}/test</folder>
+        <pattern>\.(java|sh)$</pattern>
+        <format>relative-path</format>
+        <arity>
+            <separated-files>,</separated-files>
+        </arity>
+    </context>
+</action>
+<action name="debug.single">
+    <target>jtreg-debug-nb</target>
+    <context>
+        <property>jtreg.tests</property>
+        <folder>${root}/test</folder>
+        <pattern>\.(java|sh)$</pattern>
+        <format>relative-path</format>
+        <arity>
+            <one-file-only/>
+        </arity>
+    </context>
+</action>
+<action name="debug.fix">
+    <target>debug-fix</target>
+    <property name="srcdir">${root}/src/share/classes</property>
+    <context>
+        <property>class</property>
+        <folder>${root}/src/share/classes</folder>
+        <pattern>\.java$</pattern>
+        <format>relative-path-noext</format>
+        <arity>
+            <one-file-only/>
+        </arity>
+    </context>
+</action>
+<action name="debug.fix">
+    <target>debug-fix</target>
+    <property name="srcdir">${root}/src/solaris/classes</property>
+    <context>
+        <property>class</property>
+        <folder>${root}/src/solaris/classes</folder>
+        <pattern>\.java$</pattern>
+        <format>relative-path-noext</format>
+        <arity>
+            <one-file-only/>
+        </arity>
+    </context>
+</action>
+<action name="debug.fix">
+    <target>debug-fix</target>
+    <property name="srcdir">${root}/src/windows/classes</property>
+    <context>
+        <property>class</property>
+        <folder>${root}/src/windows/classes</folder>
+        <pattern>\.java$</pattern>
+        <format>relative-path-noext</format>
+        <arity>
+            <one-file-only/>
+        </arity>
+    </context>
+</action>
+<action name="debug.fix">
+    <target>debug-fix</target>
+    <property name="srcdir">${root}/src/closed/share/classes</property>
+    <context>
+        <property>class</property>
+        <folder>${root}/src/closed/share/classes</folder>
+        <pattern>\.java$</pattern>
+        <format>relative-path-noext</format>
+        <arity>
+            <one-file-only/>
+        </arity>
+    </context>
+</action>
+<action name="javadoc">
+    <target>javadoc-nb</target>
+</action>