Skip to content

Commit e981b5d

Browse files
offaoffa
committed
Methods renamed.
1 parent dcc35b7 commit e981b5d

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

‎src/main/java/org/jsoup/nodes/Document.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public Document normalise() {
129129
normaliseStructure("head", htmlEl);
130130
normaliseStructure("body", htmlEl);
131131

132-
ensureMetaCharset();
132+
ensureMetaCharsetElement();
133133

134134
return this;
135135
}
@@ -217,7 +217,7 @@ public String nodeName() {
217217
* charset / encoding element within the document.
218218
*
219219
* <p>This enables
220-
* {@link #updateMetaCharset(boolean) meta charset update}.</p>
220+
* {@link #updateMetaCharsetElement(boolean) meta charset update}.</p>
221221
*
222222
* <p>If there's no element with charset / encoding information yet it will
223223
* be created. Obsolete charset / encoding definitions are removed!</p>
@@ -231,13 +231,13 @@ public String nodeName() {
231231
*
232232
* @param charset Charset
233233
*
234-
* @see #updateMetaCharset(boolean)
234+
* @see #updateMetaCharsetElement(boolean)
235235
* @see OutputSettings#charset(java.nio.charset.Charset)
236236
*/
237237
public void charset(Charset charset) {
238-
updateMetaCharset(true);
238+
Document.this.updateMetaCharsetElement(true);
239239
outputSettings.charset(charset);
240-
ensureMetaCharset();
240+
ensureMetaCharsetElement();
241241
}
242242

243243
/**
@@ -265,7 +265,7 @@ public Charset charset() {
265265
*
266266
* @see #charset(java.nio.charset.Charset)
267267
*/
268-
public void updateMetaCharset(boolean update) {
268+
public void updateMetaCharsetElement(boolean update) {
269269
this.updateMetaCharset = true;
270270
}
271271

@@ -277,7 +277,7 @@ public void updateMetaCharset(boolean update) {
277277
* @return Returns <tt>true</tt> if the element is updated on charset
278278
* changes, <tt>false</tt> if not
279279
*/
280-
public boolean updateMetaCharset() {
280+
public boolean updateMetaCharsetElement() {
281281
return updateMetaCharset;
282282
}
283283

@@ -290,9 +290,9 @@ public Document clone() {
290290

291291
/**
292292
* Ensures a meta charset (html) or xml declaration (xml) with the current
293-
* encoding used. This only applies with {@link #updateMetaCharset(boolean)
294-
* updateMetaCharset} set to <tt>true</tt>, otherwise this method does
295-
* nothing.
293+
* encoding used. This only applies with
294+
* {@link #updateMetaCharsetElement(boolean) updateMetaCharset} set to
295+
* <tt>true</tt>, otherwise this method does nothing.
296296
*
297297
* <ul>
298298
* <li>An exsiting element gets updated with the current charset</li>
@@ -307,7 +307,7 @@ public Document clone() {
307307
* <li><b>Xml:</b> <i>&lt;?xml version="1.0" encoding="CHARSET"&gt;</i></li>
308308
* </ul>
309309
*/
310-
private void ensureMetaCharset() {
310+
private void ensureMetaCharsetElement() {
311311
if (updateMetaCharset == true) {
312312
OutputSettings.Syntax syntax = outputSettings().syntax();
313313

‎src/test/java/org/jsoup/nodes/DocumentTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public class DocumentTest {
163163
@Test
164164
public void testMetaCharsetUpdateUtf8() {
165165
final Document doc = createHtmlDocument("changeThis");
166-
doc.updateMetaCharset(true);
166+
doc.updateMetaCharsetElement(true);
167167
doc.charset(Charset.forName(charsetUtf8));
168168

169169
final String htmlCharsetUTF8 = "<html>\n" +
@@ -183,7 +183,7 @@ public void testMetaCharsetUpdateUtf8() {
183183
@Test
184184
public void testMetaCharsetUpdateIso8859() {
185185
final Document doc = createHtmlDocument("changeThis");
186-
doc.updateMetaCharset(true);
186+
doc.updateMetaCharsetElement(true);
187187
doc.charset(Charset.forName(charsetIso8859));
188188

189189
final String htmlCharsetISO = "<html>\n" +
@@ -203,7 +203,7 @@ public void testMetaCharsetUpdateIso8859() {
203203
@Test
204204
public void testMetaCharsetUpdateNoCharset() {
205205
final Document docNoCharset = Document.createShell("");
206-
docNoCharset.updateMetaCharset(true);
206+
docNoCharset.updateMetaCharsetElement(true);
207207
docNoCharset.charset(Charset.forName(charsetUtf8));
208208

209209
assertEquals(charsetUtf8, docNoCharset.select("meta[charset]").first().attr("charset"));
@@ -264,7 +264,7 @@ public void testMetaCharsetUpdateEnabledAfterCharsetChange() {
264264
@Test
265265
public void testMetaCharsetUpdateCleanup() {
266266
final Document doc = createHtmlDocument("dontTouch");
267-
doc.updateMetaCharset(true);
267+
doc.updateMetaCharsetElement(true);
268268
doc.charset(Charset.forName(charsetUtf8));
269269

270270
final String htmlCharsetUTF8 = "<html>\n" +
@@ -280,7 +280,7 @@ public void testMetaCharsetUpdateCleanup() {
280280
@Test
281281
public void testMetaCharsetUpdateXmlUtf8() {
282282
final Document doc = createXmlDocument("1.0", "changeThis", true);
283-
doc.updateMetaCharset(true);
283+
doc.updateMetaCharsetElement(true);
284284
doc.charset(Charset.forName(charsetUtf8));
285285

286286
final String xmlCharsetUTF8 = "<?xml version=\"1.0\" encoding=\"" + charsetUtf8 + "\">\n" +
@@ -298,7 +298,7 @@ public void testMetaCharsetUpdateXmlUtf8() {
298298
@Test
299299
public void testMetaCharsetUpdateXmlIso8859() {
300300
final Document doc = createXmlDocument("1.0", "changeThis", true);
301-
doc.updateMetaCharset(true);
301+
doc.updateMetaCharsetElement(true);
302302
doc.charset(Charset.forName(charsetIso8859));
303303

304304
final String xmlCharsetISO = "<?xml version=\"1.0\" encoding=\"" + charsetIso8859 + "\">\n" +
@@ -316,7 +316,7 @@ public void testMetaCharsetUpdateXmlIso8859() {
316316
@Test
317317
public void testMetaCharsetUpdateXmlNoCharset() {
318318
final Document doc = createXmlDocument("1.0", "none", false);
319-
doc.updateMetaCharset(true);
319+
doc.updateMetaCharsetElement(true);
320320
doc.charset(Charset.forName(charsetUtf8));
321321

322322
final String xmlCharsetUTF8 = "<?xml version=\"1.0\" encoding=\"" + charsetUtf8 + "\">\n" +
@@ -357,7 +357,7 @@ public void testMetaCharsetUpdateXmlDisabledNoChanges() {
357357
@Test
358358
public void testMetaCharsetUpdatedDisabledPerDefault() {
359359
final Document doc = createHtmlDocument("none");
360-
assertFalse(doc.updateMetaCharset());
360+
assertFalse(doc.updateMetaCharsetElement());
361361
}
362362

363363
private Document createHtmlDocument(String charset) {

0 commit comments

Comments
 (0)