From 399d0bdd83b559d75f9adc4baadcec0c667454f1 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Sun, 19 Jul 2015 13:10:20 +0200
Subject: [PATCH] Refactoring everything Bioforsk -> NIBIO
---
nb-configuration.xml | 2 +-
pom.xml | 4 +--
.../deliaradicummodel/DeliaRadicumModel.java | 28 +++++++++----------
.../DeliaRadicumModelDataMatrix.java | 2 +-
.../DeliaRadicumModelTest.java | 8 +++---
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/nb-configuration.xml b/nb-configuration.xml
index 33e441e..7103095 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>bioforsk_open_source_license.ftl</netbeans.hint.license>
+ <netbeans.hint.license>nibio_open_source_license.ftl</netbeans.hint.license>
</properties>
</project-shared-configuration>
diff --git a/pom.xml b/pom.xml
index 1ed9dfd..270f0bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>no.bioforsk.vips</groupId>
+ <groupId>no.nibio.vips</groupId>
<artifactId>DeliaRadicumModel</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>no.bioforsk.vips.common</groupId>
+ <groupId>no.nibio.vips.common</groupId>
<artifactId>VIPSCommon</artifactId>
<version>1.0-SNAPSHOT</version>
<type>jar</type>
diff --git a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
index 48608ba..e3cf007 100644
--- a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
+++ b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
@@ -27,20 +27,20 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
-import no.bioforsk.vips.entity.ModelConfiguration;
-import no.bioforsk.vips.entity.Result;
-import no.bioforsk.vips.entity.ResultImpl;
-import no.bioforsk.vips.entity.WeatherObservation;
-import no.bioforsk.vips.i18n.I18nImpl;
-import no.bioforsk.vips.model.ConfigValidationException;
-import no.bioforsk.vips.model.Model;
-import no.bioforsk.vips.model.ModelExcecutionException;
-import no.bioforsk.vips.model.ModelId;
-import no.bioforsk.vips.util.CommonNamespaces;
-import no.bioforsk.vips.util.InvalidAggregationTypeException;
-import no.bioforsk.vips.util.WeatherElements;
-import no.bioforsk.vips.util.WeatherObservationListException;
-import no.bioforsk.vips.util.WeatherUtil;
+import no.nibio.vips.entity.ModelConfiguration;
+import no.nibio.vips.entity.Result;
+import no.nibio.vips.entity.ResultImpl;
+import no.nibio.vips.entity.WeatherObservation;
+import no.nibio.vips.i18n.I18nImpl;
+import no.nibio.vips.model.ConfigValidationException;
+import no.nibio.vips.model.Model;
+import no.nibio.vips.model.ModelExcecutionException;
+import no.nibio.vips.model.ModelId;
+import no.nibio.vips.util.CommonNamespaces;
+import no.nibio.vips.util.InvalidAggregationTypeException;
+import no.nibio.vips.util.WeatherElements;
+import no.nibio.vips.util.WeatherObservationListException;
+import no.nibio.vips.util.WeatherUtil;
/**
* Model controller for aggregated temperature model for invasion of
diff --git a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.java b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.java
index 7e89c4e..f053fd5 100644
--- a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.java
+++ b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.java
@@ -19,7 +19,7 @@
package no.nibio.vips.model.deliaradicummodel;
-import no.bioforsk.vips.util.DateMap;
+import no.nibio.vips.util.DateMap;
/**
* @copyright 2015 <a href="http://www.nibio.no/">NIBIO</a>
diff --git a/src/test/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.java b/src/test/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.java
index 97fd64b..7b3e91e 100644
--- a/src/test/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.java
+++ b/src/test/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.java
@@ -32,10 +32,10 @@ import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import static junit.framework.Assert.fail;
-import no.bioforsk.vips.entity.ModelConfiguration;
-import no.bioforsk.vips.entity.Result;
-import no.bioforsk.vips.entity.WeatherObservation;
-import no.bioforsk.vips.model.ModelId;
+import no.nibio.vips.entity.ModelConfiguration;
+import no.nibio.vips.entity.Result;
+import no.nibio.vips.entity.WeatherObservation;
+import no.nibio.vips.model.ModelId;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
--
GitLab