diff --git a/Viral_Load_Assay/build.gradle b/Viral_Load_Assay/build.gradle index 848d92a2f..17d617b4a 100644 --- a/Viral_Load_Assay/build.gradle +++ b/Viral_Load_Assay/build.gradle @@ -1,6 +1,7 @@ import org.labkey.gradle.util.BuildUtils; dependencies { + external "org.apache.commons:commons-math3:${commonsMath3Version}" BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile") BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:laboratory", depProjectConfig: "apiJarFile") } diff --git a/Viral_Load_Assay/resources/credits/jars.txt b/Viral_Load_Assay/resources/credits/jars.txt new file mode 100644 index 000000000..a401aa5a9 --- /dev/null +++ b/Viral_Load_Assay/resources/credits/jars.txt @@ -0,0 +1,4 @@ +{table} +Filename|Component|Version|Source|License|Purpose +commons-math3-3.6.1.jar|Commons Math|3.6.1|{link:Apache|http://commons.apache.org/math/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|Lightweight, self-contained mathematics and statistics components +{table} diff --git a/ehr/api-src/org/labkey/api/ehr/dataentry/DefaultDataEntryFormFactory.java b/ehr/api-src/org/labkey/api/ehr/dataentry/DefaultDataEntryFormFactory.java index a9fa61db2..e4c06e657 100644 --- a/ehr/api-src/org/labkey/api/ehr/dataentry/DefaultDataEntryFormFactory.java +++ b/ehr/api-src/org/labkey/api/ehr/dataentry/DefaultDataEntryFormFactory.java @@ -18,9 +18,9 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.labkey.api.module.Module; -import javax.annotation.Nullable; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.List; @@ -42,7 +42,8 @@ public DefaultDataEntryFormFactory(@NotNull Class clazz _module = module; } - @Nullable @Override + @Nullable + @Override public DataEntryForm createForm(DataEntryFormContext ctx) { try