diff --git a/src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/data/NetcdfDataHazardCurves.java b/src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/data/NetcdfDataHazardCurves.java index af9df24c6ad72820f09624a47ffae0dd24f9c11d..e144ae5476e0a74c35c0af382651830fdc5c8f8d 100644 --- a/src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/data/NetcdfDataHazardCurves.java +++ b/src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/data/NetcdfDataHazardCurves.java @@ -2,11 +2,9 @@ package gov.usgs.earthquake.nshmp.netcdf.data; import static com.google.common.base.Preconditions.checkState; -import java.util.List; import java.util.Map; import gov.usgs.earthquake.nshmp.gmm.Imt; -import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass; /** * NetCDF data for hazard curves. @@ -17,9 +15,10 @@ public class NetcdfDataHazardCurves extends NetcdfData { private final Map<Imt, double[]> imls; - NetcdfDataHazardCurves(Builder builder) { - super(builder); - imls = builder.imls; + public NetcdfDataHazardCurves(NetcdfData netcdfData, Map<Imt, double[]> imls) { + super(NetcdfData.Builder.copyOf(netcdfData)); + checkState(!imls.isEmpty(), "Must add imls"); + this.imls = imls; } /** @@ -39,63 +38,4 @@ public class NetcdfDataHazardCurves extends NetcdfData { public static Builder builder() { return new Builder(); } - - public static class Builder extends NetcdfData.Builder { - Map<Imt, double[]> imls; - - Builder() { - super(); - } - - public Builder imls(Map<Imt, double[]> imls) { - this.imls = imls; - return this; - } - - @Override - public Builder imts(List<Imt> imts) { - super.imts(imts); - return this; - } - - @Override - public Builder latitudes(double[] latitudes) { - super.latitudes(latitudes); - return this; - } - - @Override - public Builder longitudes(double[] longitudes) { - super.longitudes(longitudes); - return this; - } - - @Override - public Builder scienceBaseMetadata(ScienceBaseMetadata scienceBaseMetadata) { - super.scienceBaseMetadata(scienceBaseMetadata); - return this; - } - - @Override - public Builder siteClasses(List<NehrpSiteClass> siteClasses) { - super.siteClasses(siteClasses); - return this; - } - - @Override - public Builder vs30Map(Map<NehrpSiteClass, Double> vs30Map) { - super.vs30Map(vs30Map); - return this; - } - - public NetcdfDataHazardCurves build() { - checkBuildState(); - return new NetcdfDataHazardCurves(this); - } - - void checkBuildState() { - super.checkBuildState(); - checkState(!imls.isEmpty(), "Must add imls"); - } - } }