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

Revised comments

Browse source
This commit is contained in:
Vhati 2017-12-11 20:31:30 -05:00
parent 42b86d6d26
commit 699bbcf328
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -180,13 +180,13 @@ public class ModUtilities {
* *
* The result will have CR-LF line endings and the desired encoding. * The result will have CR-LF line endings and the desired encoding.
* *
* The description arguments identify the streams for log messages.
*
* FTL 1.01-1.5.13 assumes all XML is in windows-1252 encoding, even on * FTL 1.01-1.5.13 assumes all XML is in windows-1252 encoding, even on
* Linux. * Linux.
* *
* FTL 1.6.1 assumes all XML is in UTF-8 encoding. * FTL 1.6.1 assumes all XML is in UTF-8 encoding.
* *
* The description arguments identify the streams for log messages.
*
* Note: SMM 1.5 changed the order of arguments (previous releases took * Note: SMM 1.5 changed the order of arguments (previous releases took
* the source of new content to append as the first argument). * the source of new content to append as the first argument).
*/ */
@ -318,8 +318,7 @@ public class ModUtilities {
} }
// Bake XML into text, filtering the stream to standardize newlines and encode. // Bake XML into text, filtering the stream to standardize newlines and encode.
// TODO: sloppyPrint() needs EOL normalizing!?
//
CharsetEncoder encoder = Charset.forName( encoding ).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" );
@ -341,13 +340,13 @@ public class ModUtilities {
* *
* The result will have CR-LF line endings and the desired encoding. * The result will have CR-LF line endings and the desired encoding.
* *
* The description argument identifies the stream for log messages.
*
* FTL 1.01-1.5.13 assumes all XML is in windows-1252 encoding, even on * FTL 1.01-1.5.13 assumes all XML is in windows-1252 encoding, even on
* Linux. * Linux.
* *
* FTL 1.6.1 assumes all XML is in UTF-8 encoding. * FTL 1.6.1 assumes all XML is in UTF-8 encoding.
* *
* The description argument identifies the stream for log messages.
*
* @see net.vhati.modmanager.core.XMLPatcher * @see net.vhati.modmanager.core.XMLPatcher
* @see net.vhati.modmanager.core.SloppyXMLOutputProcessor * @see net.vhati.modmanager.core.SloppyXMLOutputProcessor
*/ */
@ -361,8 +360,7 @@ public class ModUtilities {
srcText = null; srcText = null;
// Bake XML into text, filtering the stream to standardize newlines and encode. // Bake XML into text, filtering the stream to standardize newlines and encode.
// TODO: sloppyPrint() needs EOL normalizing!?
//
CharsetEncoder encoder = Charset.forName( encoding ).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" );