diff --git a/nb-configuration.xml b/nb-configuration.xml index db65a214b01cbb1373c6b71b5c5124d499df163a..33e441e8278864cc0db17e7c047d6f8753813a93 100644 --- a/nb-configuration.xml +++ b/nb-configuration.xml @@ -13,6 +13,6 @@ You can copy and paste the single properties, into the pom.xml file and the IDE That way multiple projects can share the same settings (useful for formatting rules for example). Any value defined here will override the pom.xml file value but is only applicable to the current project. --> - <netbeans.hint.license>default_1</netbeans.hint.license> + <netbeans.hint.license>bioforsk_open_source_license.ftl</netbeans.hint.license> </properties> </project-shared-configuration> diff --git a/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java b/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java index e6ff1120ca03a7097b7875a513b45498308655c0..c85a58ab070d87175caf3b1bc99266d711882107 100644 --- a/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java +++ b/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java @@ -3,17 +3,17 @@ * * This file is part of OatFloweringModel. * OatFloweringModel is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * OatFloweringModel 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 Affero General Public License for more details. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with OatFloweringModel. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts.properties b/src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts.properties index b27e14bd3a7e0bb79f0b6c56e0b353e193a2c3f9..1626944fd8799a47afefe3742b0ee178f2bc3b67 100644 --- a/src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts.properties +++ b/src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts.properties @@ -1,19 +1,20 @@ -# Copyright (C) 2014 Bioforsk -# -# This file is part of VIPS/NaerstadModel -# -# VIPS/NaerstadModel is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# VIPS/NaerstadModel 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with VIPS/NaerstadModel. If not, see <http://www.gnu.org/licenses/>. +# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. +# +# This file is part of OatFloweringModel. +# OatFloweringModel is free software: you can redistribute it and/or modify +# it under the terms of the Bioforsk Open Source License as published by +# Bioforsk, either version 1 of the License, or (at your option) any +# later version. +# +# OatFloweringModel 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 +# Bioforsk Open Source License for more details. +# +# You should have received a copy of the Bioforsk Open Source License +# along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>. +# + name=Oat flowering model diff --git a/src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts_nb.properties b/src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts_nb.properties index 2b8dc127c5c9cfbff530a252ea2f0b74d565dfcc..3476e4ad51bfe3292538131b940a9c5290995c69 100644 --- a/src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts_nb.properties +++ b/src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts_nb.properties @@ -1,19 +1,19 @@ -# Copyright (C) 2014 Bioforsk -# -# This file is part of VIPS/NaerstadModel -# -# VIPS/NaerstadModel is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# VIPS/NaerstadModel 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with VIPS/NaerstadModel. If not, see <http://www.gnu.org/licenses/>. +# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. +# +# This file is part of OatFloweringModel. +# OatFloweringModel is free software: you can redistribute it and/or modify +# it under the terms of the Bioforsk Open Source License as published by +# Bioforsk, either version 1 of the License, or (at your option) any +# later version. +# +# OatFloweringModel 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 +# Bioforsk Open Source License for more details. +# +# You should have received a copy of the Bioforsk Open Source License +# along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>. +# name=Havreblomstringsmodell usage=TODO diff --git a/src/test/java/OatFloweringModelTest.java b/src/test/java/OatFloweringModelTest.java index b504fea7e921c81c6c8791aac0c2742efe7f3120..d41395947a012adc9c7104cdcb28a3d2c0ad593f 100644 --- a/src/test/java/OatFloweringModelTest.java +++ b/src/test/java/OatFloweringModelTest.java @@ -3,17 +3,17 @@ * * This file is part of OatFloweringModel. * OatFloweringModel is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * OatFloweringModel 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 Affero General Public License for more details. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with OatFloweringModel. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>. * */