Skip to content
Snippets Groups Projects
Commit 646742a1 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

removed copy of immutable set

parent fc4b45c8
No related branches found
No related tags found
1 merge request!417removed copy of immutable set
...@@ -22,8 +22,9 @@ import java.nio.charset.StandardCharsets; ...@@ -22,8 +22,9 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.NavigableMap; import java.util.NavigableMap;
...@@ -228,14 +229,14 @@ public final class CalcConfig { ...@@ -228,14 +229,14 @@ public final class CalcConfig {
* {@code distanceFilterUpdate} flag is registered when a model loads and at * {@code distanceFilterUpdate} flag is registered when a model loads and at
* this time cannot be changed with user supplied config. * this time cannot be changed with user supplied config.
* *
* <p><b>Default:</b> false * <p><b>Default:</b> true
*/ */
public final boolean distanceFilterUpdate; public final boolean distanceFilterUpdate;
/** /**
* Whether to apply updated grid focal mechanism application. * Whether to apply updated grid focal mechanism application.
* *
* <p><b>Default:</b> false * <p><b>Default:</b> true
*/ */
public final boolean gridFocalMechUpdate; public final boolean gridFocalMechUpdate;
...@@ -779,10 +780,10 @@ public final class CalcConfig { ...@@ -779,10 +780,10 @@ public final class CalcConfig {
/** /**
* The different {@linkplain DataType types} of data to save. Note that * The different {@linkplain DataType types} of data to save. Note that
* {@link DataType#TOTAL} will <i>always</i> be included in this set, * {@link DataType#TOTAL} and {@link DataType#MAP} will <i>always</i> be
* regardless of any user settings. * included in this set, regardless of any user settings.
* *
* <p><b>Default:</b> [{@link DataType#TOTAL}] * <p><b>Default:</b> [{@link DataType#TOTAL}, {@link DataType#MAP}]
*/ */
public final Set<DataType> dataTypes; public final Set<DataType> dataTypes;
...@@ -796,7 +797,7 @@ public final class CalcConfig { ...@@ -796,7 +797,7 @@ public final class CalcConfig {
private Output(Builder b) { private Output(Builder b) {
this.directory = b.directory; this.directory = b.directory;
this.dataTypes = Collections.unmodifiableSet(b.dataTypes); this.dataTypes = b.dataTypes;
this.returnPeriods = List.copyOf(b.returnPeriods); this.returnPeriods = List.copyOf(b.returnPeriods);
} }
...@@ -815,8 +816,8 @@ public final class CalcConfig { ...@@ -815,8 +816,8 @@ public final class CalcConfig {
void copy(Output that) { void copy(Output that) {
this.directory = that.directory; this.directory = that.directory;
this.dataTypes = that.dataTypes; this.dataTypes = EnumSet.copyOf(that.dataTypes);
this.returnPeriods = that.returnPeriods; this.returnPeriods = new ArrayList<>(that.returnPeriods);
} }
void extend(Builder that) { void extend(Builder that) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment