Skip to content
Snippets Groups Projects

Lib work

Merged Powers, Peter M. requested to merge ghsc/users/pmpowers/nshmp-lib:lib-work into master
83 files
+ 1872
1350
Compare changes
  • Side-by-side
  • Inline
Files
83
@@ -111,7 +111,7 @@ public final class CalcConfig {
@@ -111,7 +111,7 @@ public final class CalcConfig {
public static Builder copyOf(CalcConfig config) {
public static Builder copyOf(CalcConfig config) {
Builder b = new Builder();
Builder b = new Builder();
if (config.resource.isPresent()) {
if (config.resource.isPresent()) {
b.resource = config.resource.get();
b.resource = config.resource.orElseThrow();
}
}
b.hazard.copy(config.hazard);
b.hazard.copy(config.hazard);
b.siteData.copy(config.siteData);
b.siteData.copy(config.siteData);
@@ -1237,7 +1237,7 @@ public final class CalcConfig {
@@ -1237,7 +1237,7 @@ public final class CalcConfig {
public String toString() {
public String toString() {
return new StringBuilder("Calc Config: ")
return new StringBuilder("Calc Config: ")
.append(resource.isPresent()
.append(resource.isPresent()
? resource.get().toAbsolutePath().normalize()
? resource.orElseThrow().toAbsolutePath().normalize()
: "(from defaults)")
: "(from defaults)")
.append(hazard.asString())
.append(hazard.asString())
.append(deagg.asString())
.append(deagg.asString())
Loading