|
33 | 33 | import java.util.Collections; |
34 | 34 | import java.util.LinkedHashSet; |
35 | 35 | import java.util.Map; |
36 | | -import java.util.Optional; |
37 | 36 | import java.util.Set; |
38 | 37 | import java.util.function.BiFunction; |
39 | 38 | import java.util.regex.Pattern; |
@@ -66,14 +65,14 @@ final class ScriptDocument { |
66 | 65 | private final String text; |
67 | 66 | private final String language; |
68 | 67 | /** Where the script runs, as its dialect says, given its file. */ |
69 | | - private final BiFunction<String, Optional<File>, Environment> where; |
| 68 | + private final BiFunction<String, File, Environment> where; |
70 | 69 | /** Number of characters prepended. */ |
71 | 70 | private final int headerLength; |
72 | 71 | private final Set<String> hiddenNames; |
73 | 72 |
|
74 | 73 | private ScriptDocument(final String original, final String text, |
75 | 74 | final String language, |
76 | | - final BiFunction<String, Optional<File>, Environment> where, |
| 75 | + final BiFunction<String, File, Environment> where, |
77 | 76 | final int headerLength, final Set<String> hiddenNames) |
78 | 77 | { |
79 | 78 | this.original = original; |
@@ -145,9 +144,9 @@ String language() { |
145 | 144 | * {@link ScriptDialect#environment}); or a blank {@link Environment}, for a |
146 | 145 | * script as it is. |
147 | 146 | * |
148 | | - * @param file The script's file, if it has one. |
| 147 | + * @param file The script's file, or null if it has none. |
149 | 148 | */ |
150 | | - Environment environment(final Optional<File> file) { |
| 149 | + Environment environment(final File file) { |
151 | 150 | return where.apply(original, file); |
152 | 151 | } |
153 | 152 |
|
|
0 commit comments