diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-04-16 15:33:22 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-04-16 15:33:22 +0200 |
commit | b013128cca1fb64d7ff8fc03bcf84a1bd45ec2f4 (patch) | |
tree | 54cbbb797ecc090ffe85e8302470b1a3cdd5b055 /vespajlib | |
parent | 7c90afed7e18ebac57ba0dd7986c1a4159f78c98 (diff) |
Revert "Merge pull request #5583 from vespa-engine/revert-5568-revert-5541-revert-5536-bratseth/dispatch-summaries-by-default"
This reverts commit 31726a59b430f571e04a1869449f678e420c7de3, reversing
changes made to 43f61854cb785763ae19564840557a7d9e758dce.
Diffstat (limited to 'vespajlib')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/text/XML.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/text/XML.java b/vespajlib/src/main/java/com/yahoo/text/XML.java index 30f30b2a270..f4cd355b0e1 100644 --- a/vespajlib/src/main/java/com/yahoo/text/XML.java +++ b/vespajlib/src/main/java/com/yahoo/text/XML.java @@ -28,17 +28,18 @@ import org.xml.sax.SAXParseException; * @author Steinar Knutsen */ public class XML { + /** * The point of this weird class and the jumble of abstract methods is * linking the scan for characters that must be quoted into the quoting * table, and making it actual work to make them go out of sync again. */ private static abstract class LegalCharacters { + // To quote http://www.w3.org/TR/REC-xml/ : // Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | // [#x10000-#x10FFFF] - final boolean isLegal(final int codepoint, final boolean escapeLow, - final int stripCodePoint, final boolean isAttribute) { + final boolean isLegal(int codepoint, boolean escapeLow, int stripCodePoint, boolean isAttribute) { if (codepoint == stripCodePoint) { return removeCodePoint(); } else if (codepoint < ' ') { @@ -75,7 +76,7 @@ public class XML { } } - private boolean quotCodePoint(final boolean isAttribute) { + private boolean quotCodePoint(boolean isAttribute) { if (isAttribute) { quoteQuot(); return false; @@ -84,7 +85,7 @@ public class XML { } } - private boolean filterCodePoint(final int codepoint) { + private boolean filterCodePoint(int codepoint) { replace(codepoint); return false; } @@ -104,7 +105,7 @@ public class XML { return false; } - private boolean ctrlEscapeCodePoint(final int codepoint) { + private boolean ctrlEscapeCodePoint(int codepoint) { ctrlEscape(codepoint); return false; } @@ -349,8 +350,7 @@ public class XML { * </ul> * with character entities. * - * @param stripCodePoint - * any occurrence of this character is removed from the string + * @param stripCodePoint any occurrence of this character is removed from the string */ public static String xmlEscape(String string, boolean isAttribute, boolean escapeLowAscii, StringBuilder buffer, int stripCodePoint) { @@ -399,8 +399,7 @@ public class XML { /** * Returns the Document of an XML file reader * - * @throws RuntimeException - * if the root Document cannot be returned + * @throws RuntimeException if the root Document cannot be returned */ public static Document getDocument(Reader reader) { try { |