|
15 | 15 | import java.util.Collections; |
16 | 16 | import java.util.HashMap; |
17 | 17 |
|
18 | | -import static org.jsoup.nodes.Document.OutputSettings.*; |
19 | 18 | import static org.jsoup.nodes.Entities.EscapeMode.base; |
20 | 19 | import static org.jsoup.nodes.Entities.EscapeMode.extended; |
21 | 20 |
|
@@ -167,32 +166,32 @@ public static String findPrefix(String input) { |
167 | 166 | @return the escaped string |
168 | 167 | */ |
169 | 168 | public static String escape(String data, OutputSettings out) { |
170 | | - return escapeString(data, out.escapeMode(), out.syntax(), out.charset()); |
| 169 | + return escapeString(data, out.escapeMode(), out.charset()); |
171 | 170 | } |
172 | 171 |
|
173 | 172 | /** |
174 | | - HTML escape an input string, using the default settings (UTF-8, base entities, HTML syntax). That is, {@code <} is |
| 173 | + HTML escape an input string, using the default settings (UTF-8, base entities). That is, {@code <} is |
175 | 174 | returned as {@code <}. The escaped string is suitable for use both in attributes and in text data. |
176 | 175 | @param data the un-escaped string to escape |
177 | 176 | @return the escaped string |
178 | 177 | @see #escape(String, OutputSettings) |
179 | 178 | */ |
180 | 179 | public static String escape(String data) { |
181 | | - return escapeString(data, base, Syntax.html, DataUtil.UTF_8); |
| 180 | + return escapeString(data, base, DataUtil.UTF_8); |
182 | 181 | } |
183 | 182 |
|
184 | | - private static String escapeString(String data, EscapeMode escapeMode, Syntax syntax, Charset charset) { |
| 183 | + private static String escapeString(String data, EscapeMode escapeMode, Charset charset) { |
185 | 184 | if (data == null) return ""; |
186 | 185 | StringBuilder sb = StringUtil.borrowBuilder(); |
187 | | - doEscape(data, QuietAppendable.wrap(sb), escapeMode, syntax, charset, ForText | ForAttribute); |
| 186 | + doEscape(data, QuietAppendable.wrap(sb), escapeMode, charset, ForText | ForAttribute); |
188 | 187 | return StringUtil.releaseBuilder(sb); |
189 | 188 | } |
190 | 189 |
|
191 | 190 | static void escape(QuietAppendable accum, String data, OutputSettings out, int options) { |
192 | | - doEscape(data, accum, out.escapeMode(), out.syntax(), out.charset(), options); |
| 191 | + doEscape(data, accum, out.escapeMode(), out.charset(), options); |
193 | 192 | } |
194 | 193 |
|
195 | | - private static void doEscape(String data, QuietAppendable accum, EscapeMode mode, Syntax syntax, Charset charset, int options) { |
| 194 | + private static void doEscape(String data, QuietAppendable accum, EscapeMode mode, Charset charset, int options) { |
196 | 195 | final CoreCharset coreCharset = CoreCharset.byName(charset.name()); |
197 | 196 | final CharsetEncoder fallback = encoderFor(charset); |
198 | 197 | final int length = data.length(); |
|
0 commit comments