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 index 3f1811dfb328..9227951b4b4b 100644 --- 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 @@ - + diff --git a/ide/languages.toml/nbproject/project.properties b/ide/languages.toml/nbproject/project.properties index 256fa1936ed9..a829154e419c 100644 --- 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 index dac5b32d7122..44d192e03248 100644 --- a/ide/languages.toml/nbproject/project.xml +++ b/ide/languages.toml/nbproject/project.xml @@ -25,6 +25,14 @@ org.netbeans.modules.languages.toml + + org.netbeans.api.templates + + + + 1.40 + + org.netbeans.core.multiview 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 index 0ffa8111a3f9..02390baccfb6 100644 --- 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 new file mode 100644 index 000000000000..a49a8a7ffde6 --- /dev/null +++ b/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlFileDescription.html @@ -0,0 +1,28 @@ + + + + + + + +Creates an empty TOML file. + 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 new file mode 100644 index 000000000000..ff60b089b346 --- /dev/null +++ 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 new file mode 100644 index 000000000000..b04032d1642d --- /dev/null +++ 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 index d63462101d08..02029b2fc53d 100644 --- a/ide/languages.yaml/nbproject/project.xml +++ b/ide/languages.yaml/nbproject/project.xml @@ -25,6 +25,14 @@ org.netbeans.modules.languages.yaml + + org.netbeans.api.templates + + + + 1.40 + + org.netbeans.core.multiview 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 index 25f5fe0080ca..487bc6fbb477 100644 --- 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 @@ -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. 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 index 30d90dcb9668..f1da95fe2096 100644 --- 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 @@ - - - - - - - - - - - - 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 new file mode 100644 index 000000000000..2588f638bafe --- /dev/null +++ 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;