From 3f49bd0203b4b78560f44398aedd5adb717efc88 Mon Sep 17 00:00:00 2001
From: Vhati <tvtronix@yahoo.com>
Date: Sun, 8 Sep 2013 06:34:42 -0400
Subject: [PATCH] Trivial cleanup

---
 src/main/java/net/vhati/modmanager/core/ModUtilities.java | 4 ++--
 src/main/java/net/vhati/modmanager/ui/ModXMLSandbox.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/vhati/modmanager/core/ModUtilities.java b/src/main/java/net/vhati/modmanager/core/ModUtilities.java
index b2c369a..3c5acfe 100644
--- a/src/main/java/net/vhati/modmanager/core/ModUtilities.java
+++ b/src/main/java/net/vhati/modmanager/core/ModUtilities.java
@@ -226,7 +226,7 @@ public class ModUtilities {
 		StringWriter writer = new StringWriter();
 		SloppyXMLOutputProcessor.sloppyPrint( mergedDoc, writer, encoding );
 		String mergedString = writer.toString();
-		mergedString = mergedString.replaceAll( "\r(?!\n)|(?<!\r)\n", "\r\n" );  // sloppyPrint needs normalizing!?
+		mergedString = mergedString.replaceAll( "\r(?!\n)|(?<!\r)\n|\r\n", "\r\n" );  // sloppyPrint needs normalizing!?
 
 		InputStream result = encodeText( mergedString, encoding, mainDescription+"+"+appendDescription );
 		return result;
@@ -260,7 +260,7 @@ public class ModUtilities {
 		StringWriter writer = new StringWriter();
 		SloppyXMLOutputProcessor.sloppyPrint( doc, writer, encoding );
 		String resultString = writer.toString();
-		resultString = resultString.replaceAll( "\r(?!\n)|(?<!\r)\n", "\r\n" );  // sloppyPrint needs normalizing!?
+		resultString = resultString.replaceAll( "\r(?!\n)|(?<!\r)\n|\r\n", "\r\n" );  // sloppyPrint needs normalizing!?
 
 		InputStream result = encodeText( resultString, encoding, srcDescription+" (cleaned)" );
 		return result;
diff --git a/src/main/java/net/vhati/modmanager/ui/ModXMLSandbox.java b/src/main/java/net/vhati/modmanager/ui/ModXMLSandbox.java
index 3c18da9..ea93000 100644
--- a/src/main/java/net/vhati/modmanager/ui/ModXMLSandbox.java
+++ b/src/main/java/net/vhati/modmanager/ui/ModXMLSandbox.java
@@ -337,7 +337,7 @@ public class ModXMLSandbox extends JFrame implements ActionListener {
 
 			StringWriter writer = new StringWriter();
 			SloppyXMLOutputProcessor.sloppyPrint( mainDoc, writer, null );
-			String displayedText = writer.toString().replaceAll( "\r(?!\n)|(?<!\r)\n", "\n" );  // sloppyPrint needs normalizing!?
+			String displayedText = writer.toString().replaceAll( "\r(?!\n)|(?<!\r)\n|\r\n", "\n" );  // sloppyPrint needs normalizing!?
 			mainArea.setText( displayedText );
 			mainArea.setCaretPosition( 0 );
 			areasPane.setSelectedComponent( mainScroll );
@@ -377,7 +377,7 @@ public class ModXMLSandbox extends JFrame implements ActionListener {
 
 			StringWriter writer = new StringWriter();
 			SloppyXMLOutputProcessor.sloppyPrint( resultDoc, writer, null );
-			String displayedText = writer.toString().replaceAll( "\r(?!\n)|(?<!\r)\n", "\n" );  // sloppyPrint needs normalizing!?
+			String displayedText = writer.toString().replaceAll( "\r(?!\n)|(?<!\r)\n|\r\n", "\n" );  // sloppyPrint needs normalizing!?
 			resultArea.setText( displayedText );
 			resultArea.setCaretPosition( 0 );
 			areasPane.setSelectedComponent( resultScroll );