apache · mbien · Mar 5, 2026 · Mar 4, 2026
diff --git a/ide/languages.jflex/src/org/netbeans/modules/languages/jflex/resources/layer.xml b/ide/languages.jflex/src/org/netbeans/modules/languages/jflex/resources/layer.xml
@@ -68,7 +68,7 @@
     <folder name="Templates">
         <folder name="Grammar">
             <!--less priority than XML-->
-            <attr name="position" intvalue="1800"/>
+            <attr name="position" intvalue="1840"/>
          </folder>
     </folder>
 </filesystem>
diff --git a/ide/languages.toml/nbproject/project.properties b/ide/languages.toml/nbproject/project.properties
@@ -14,7 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-javac.source=1.8
-javac.target=1.8
-
-
+javac.release=17
diff --git a/ide/languages.toml/nbproject/project.xml b/ide/languages.toml/nbproject/project.xml
@@ -25,6 +25,14 @@
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
             <code-name-base>org.netbeans.modules.languages.toml</code-name-base>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>org.netbeans.api.templates</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.40</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.core.multiview</code-name-base>
                     <build-prerequisite/>

diff --git a/ide/languages.toml/src/org/netbeans/modules/languages/toml/Bundle.properties b/ide/languages.toml/src/org/netbeans/modules/languages/toml/Bundle.properties
@@ -21,6 +21,7 @@ OpenIDE-Module-Short-Description=Support for editing TOML files.
 OpenIDE-Module-Long-Description=Support for editing TOML files.
 
 Editors/text/x-toml=TOML
+Templates/Other/TomlFileTemplate.toml=TOML File
 
 boolean=Boolean
 comment=Comment

diff --git a/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlFileDescription.html b/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlFileDescription.html
@@ -0,0 +1,28 @@
+<!--
+
+    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.
+
+-->
+
+<html>
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+</head>
+<BODY>
+Creates an empty TOML file.
+</BODY></HTML>
diff --git a/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlFileTemplate.toml b/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlFileTemplate.toml
@@ -0,0 +1,3 @@
+# TOML document
+
+title = "Hello World"
diff --git a/ide/languages.toml/src/org/netbeans/modules/languages/toml/package-info.java b/ide/languages.toml/src/org/netbeans/modules/languages/toml/package-info.java
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+@TemplateRegistration(
+    folder = "Other",
+    content = "TomlFileTemplate.toml",
+    displayName = "#Templates/Other/TomlFileTemplate.toml",
+    targetName = "EmptyTOML",
+    position = 840,
+    requireProject = false,
+    category = "simple-files",
+    description = "TomlFileDescription.html"
+)
+package org.netbeans.modules.languages.toml;
+
+import org.netbeans.api.templates.TemplateRegistration;
diff --git a/ide/languages.yaml/nbproject/project.xml b/ide/languages.yaml/nbproject/project.xml
@@ -25,6 +25,14 @@
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
             <code-name-base>org.netbeans.modules.languages.yaml</code-name-base>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>org.netbeans.api.templates</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.40</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.core.multiview</code-name-base>
                     <build-prerequisite/>

diff --git a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/EmptyYAMLFileDescription.html b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/EmptyYAMLFileDescription.html
@@ -24,7 +24,5 @@
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 </head>
 <BODY>
-Creates an empty YAML file. You can edit the file in the IDE's Source Editor.
-To change this template, choose Tools | Template Manager
-and open the template in the editor.
+Creates an empty YAML file.
 </BODY></HTML>
diff --git a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/layer.xml b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/layer.xml
@@ -70,18 +70,6 @@
             </folder>
         </folder>
     </folder>
-    <folder name="Templates">
-        <folder name="Other">
-            <file name="EmptyYAML.yml" url="EmptyYAML.yml">
-                <attr name="position" intvalue="850"/>
-                <attr name="template" boolvalue="true"/>
-                <attr name="templateCategory" stringvalue="simple-files"/>
-                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.languages.yaml.Bundle"/>
-                <attr name="templateWizardURL" urlvalue="nbresloc:/org/netbeans/modules/languages/yaml/EmptyYAMLFileDescription.html"/>
-                <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/languages/yaml/yaml_files_16.png"/>
-            </file>
-        </folder>
-    </folder>
     <folder name="Loaders">
         <folder name="text">
             <folder name="x-yaml">

diff --git a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/package-info.java b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/package-info.java
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+@TemplateRegistration(
+    folder = "Other",
+    content = "EmptyYAML.yml",
+    displayName = "#Templates/Other/EmptyYAML.yml",
+    targetName = "EmptyYAML",
+    position = 850,
+    requireProject = false,
+    category = "simple-files",
+    description = "EmptyYAMLFileDescription.html"
+)
+package org.netbeans.modules.languages.yaml;
+
+import org.netbeans.api.templates.TemplateRegistration;