jan-leila/Slipstream-Mod-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disabled XML escaping when reencoding to ensure invalid chars cause an error

Browse source
This commit is contained in:
Vhati 2017-12-30 03:52:28 -05:00
parent 70f49e7e98
commit 91be0845e5
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/net/vhati/modmanager/core/SloppyXMLOutputProcessor.java
View file

@ -9,6 +9,7 @@ import org.jdom2.Content;
import org.jdom2.Document;
import org.jdom2.Element;
import org.jdom2.Namespace;
import org.jdom2.output.EscapeStrategy;
import org.jdom2.output.Format;
import org.jdom2.output.LineSeparator;
import org.jdom2.output.XMLOutputter;
@ -153,6 +154,9 @@ public class SloppyXMLOutputProcessor extends AbstractXMLOutputProcessor {
* is encoding bytes to match. If encoding is null, the default
* is "UTF-8".
*
* There will be no XML character entity escaping, which would have allowed
* otherwise unmappable characters to print without errors.
*
* LineEndings will be CR-LF. Except for comments!?
*/
public static void sloppyPrint( Document doc, Writer writer, String encoding ) throws IOException {
@ -163,7 +167,16 @@ public class SloppyXMLOutputProcessor extends AbstractXMLOutputProcessor {
format.setIndent( "\t" );
format.setLineSeparator( LineSeparator.CRNL );
if ( encoding != null ) format.setEncoding( encoding );
if ( encoding != null ) {
format.setEncoding( encoding );
}
format.setEscapeStrategy(new EscapeStrategy() {
@Override
public boolean shouldEscape( char ch ) {
return false;
}
});
XMLOutputter outputter = new XMLOutputter( format, new SloppyXMLOutputProcessor() );
outputter.output( doc, writer );