From 8fdc74f9795201e78047d24202ae1d5f2bc65cfc Mon Sep 17 00:00:00 2001
From: Neil C Smith <neilcsmith@apache.org>
Date: Wed, 9 Nov 2022 11:17:54 +0000
Subject: [PATCH] Fix GradleCliEditorKit not being registered.

---
 extide/gradle.editor/manifest.mf              |  1 +
 .../netbeans/modules/gradle/editor/layer.xml  | 35 +++++++++++++++++++
 .../src/org/netbeans/modules/gradle/layer.xml |  7 ----
 3 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 extide/gradle.editor/src/org/netbeans/modules/gradle/editor/layer.xml

diff --git a/extide/gradle.editor/manifest.mf b/extide/gradle.editor/manifest.mf
index 47d1710b22a9..57017fab65dd 100644
--- a/extide/gradle.editor/manifest.mf
+++ b/extide/gradle.editor/manifest.mf
@@ -1,5 +1,6 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.netbeans.modules.gradle.editor
+OpenIDE-Module-Layer: org/netbeans/modules/gradle/editor/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/editor/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.0
diff --git a/extide/gradle.editor/src/org/netbeans/modules/gradle/editor/layer.xml b/extide/gradle.editor/src/org/netbeans/modules/gradle/editor/layer.xml
new file mode 100644
index 000000000000..47e33df4b730
--- /dev/null
+++ b/extide/gradle.editor/src/org/netbeans/modules/gradle/editor/layer.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
+<filesystem>
+  <folder name="Editors">
+    <folder name="text">
+      <folder name="x-gradle-cli">
+        <file name="EditorKit.instance">
+          <attr name="instanceClass" stringvalue="org.netbeans.modules.gradle.editor.cli.GradleCliEditorKit"/>
+          <attr name="instanceOf" stringvalue="javax.swing.text.EditorKit,org.netbeans.modules.gradle.editor.cli.GradleCliEditorKit"/>
+          <attr name="beaninfo" boolvalue="false"/>
+        </file>
+      </folder>
+    </folder>
+  </folder>
+</filesystem>
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/layer.xml b/extide/gradle/src/org/netbeans/modules/gradle/layer.xml
index 97bd3ec7d05c..427637e08771 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/layer.xml
+++ b/extide/gradle/src/org/netbeans/modules/gradle/layer.xml
@@ -158,13 +158,6 @@
                     </file>
                 </folder>
             </folder>
-            <folder name="x-gradle-cli">
-                <file name="EditorKit.instance">
-                    <attr name="instanceClass" stringvalue="org.netbeans.modules.gradle.execute.GradleCliEditorKit"/>
-                    <attr name="instanceOf" stringvalue="javax.swing.text.EditorKit,org.netbeans.modules.gradle.execute.GradleCliEditorKit"/>
-                    <attr name="beaninfo" boolvalue="false"/>
-                </file>
-            </folder>
         </folder>
     </folder>
 </filesystem>