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

Made encoding an arg, for appendXMLFile(), previously hardcoded utf-8

Browse source
This commit is contained in:
Vhati 2014-04-19 23:05:11 -04:00
parent 5f333f7c77
commit c544ca9934
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/net/vhati/modmanager/core/ModUtilities.java
View file

@ -168,11 +168,13 @@ public class ModUtilities {
* The returned stream is a ByteArrayInputStream * The returned stream is a ByteArrayInputStream
* which doesn't need closing. * which doesn't need closing.
* *
* The result will be UTF-8 with CR-LF line endings. * The result will have CR-LF line endings and the desired encoding.
* Note: FTL stubbornly assumes all XML is in windows-1252 encoding,
* even on Linux.
* *
* The description arguments identify the streams for log messages. * The description arguments identify the streams for log messages.
*/ */
public static InputStream appendXMLFile( InputStream srcStream, InputStream dstStream, String srcDescription, String dstDescription ) throws IOException { public static InputStream appendXMLFile( InputStream srcStream, InputStream dstStream, String encoding, String srcDescription, String dstDescription ) throws IOException {
Pattern xmlDeclPtn = Pattern.compile( "<[?]xml [^>]*?[?]>\n*" ); Pattern xmlDeclPtn = Pattern.compile( "<[?]xml [^>]*?[?]>\n*" );
String srcText = decodeText( srcStream, srcDescription ).text; String srcText = decodeText( srcStream, srcDescription ).text;
@ -183,11 +185,11 @@ public class ModUtilities {
// Concatenate, filtering the stream to standardize newlines and encode. // Concatenate, filtering the stream to standardize newlines and encode.
// //
CharsetEncoder encoder = Charset.forName( "UTF-8" ).newEncoder(); CharsetEncoder encoder = Charset.forName( encoding ).newEncoder();
ByteArrayOutputStream tmpData = new ByteArrayOutputStream(); ByteArrayOutputStream tmpData = new ByteArrayOutputStream();
Writer writer = new EOLWriter( new OutputStreamWriter( tmpData, encoder ), "\r\n" ); Writer writer = new EOLWriter( new OutputStreamWriter( tmpData, encoder ), "\r\n" );
writer.append( "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" ); writer.append( "<?xml version=\"1.0\" encoding=\""+ encoding +"\"?>\n" );
writer.append( dstText ); writer.append( dstText );
writer.append( "\n\n<!-- Appended by Slipstream -->\n\n" ); writer.append( "\n\n<!-- Appended by Slipstream -->\n\n" );
writer.append( srcText ); writer.append( srcText );