Fixed #580 - CRLF Issue on Windows (#581)

* Fixed #580

* Updated examples

Author: bowring

common.gradle

@@ -6,7 +6,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 
 String mavenGroupId = 'org.cirdles'
-String mavenVersion = '1.7.2'
+String mavenVersion = '1.7.3'
 
 sourceCompatibility = '1.8'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

squidCore/src/main/java/org/cirdles/squid/core/PrawnXMLFileHandler.java

@@ -48,7 +48,7 @@
 import org.cirdles.squid.shrimp.ShrimpDataFileInterface;
 import org.cirdles.squid.shrimp.ShrimpDataLegacyFileInterface;
 import org.xml.sax.SAXException;
-import static org.cirdles.squid.utilities.fileUtilities.TextFileUtilities.writeTextFileFromListOfStrings;
+import static org.cirdles.squid.utilities.fileUtilities.TextFileUtilities.writeTextFileFromListOfStringsWithUnixLineEnd;
 
 /**
  * Handles common operations involving Prawn files.
@@ -190,7 +190,7 @@ public ShrimpDataFileInterface unmarshallPrawnFileXML(String prawnFileLocation,
             lines.add(i, headerArray[i]);
         }
 
-        File prawnDataFile = writeTextFileFromListOfStrings(lines, "tempPrawnXMLFileName", ".xml");
+        File prawnDataFile = writeTextFileFromListOfStringsWithUnixLineEnd(lines, "tempPrawnXMLFileName", ".xml");
 
         if (isPrawnLegacyFile) {
             ShrimpDataLegacyFileInterface myPrawnLegacyFile = readRawDataLegacyFile(prawnDataFile);
@@ -260,7 +260,7 @@ public void writeRawDataFileAsXML(ShrimpDataFileInterface prawnFile, String file
         lines.add(1, "<!-- SHRIMP SW PRAWN Data File -->");
         lines.add(2, "<!-- SQUID3-generated PRAWN Data File copy -->");
 
-        File updatedPrawnFile = writeTextFileFromListOfStrings(lines, "updatedPrawnFile", ".xml");
+        File updatedPrawnFile = writeTextFileFromListOfStringsWithUnixLineEnd(lines, "updatedPrawnFile", ".xml");
         Path updatedPrawnOutput = updatedPrawnFile.toPath();
         Files.copy(updatedPrawnOutput, originalPrawnOutput, StandardCopyOption.REPLACE_EXISTING);
     }

squidCore/src/main/java/org/cirdles/squid/utilities/fileUtilities/TextFileUtilities.java

@@ -49,21 +49,24 @@ public class TextFileUtilities {
      * @return
      * @throws IOException 
      */
-    public static File writeTextFileFromListOfStrings(List<String> stringLine, String targetTextFileName, String extension)
+    public static File writeTextFileFromListOfStringsWithUnixLineEnd(List<String> stringLine, String targetTextFileName, String extension)
             throws IOException {
         File targetTextFile;
 
         // detect Operating System ... we need POSIX code for use on Ubuntu Server
         String OS = System.getProperty("os.name").toLowerCase(Locale.US);
         if (OS.toLowerCase(Locale.US).contains("win")) {
+            // Feb 2021 Issue #580 force windows into suppressing CRLF for LF so Squid25 can open these files
+            System.setProperty("line.separator", "\n");
             Path pathTempXML = Paths.get(targetTextFileName + extension).toAbsolutePath();
             try (BufferedWriter writer = Files.newBufferedWriter(pathTempXML, StandardCharsets.UTF_8)) {
                 for (String line : stringLine) {
                     writer.write(line);
                     writer.newLine();
                 }
             }
-            targetTextFile = new File(targetTextFileName + extension);
+            targetTextFile = pathTempXML.toFile();
+            System.setProperty("line.separator", "\r\n");
         } else {
             // Posix attributes added to support web service on Linux
             Set<PosixFilePermission> perms = EnumSet.of(OWNER_READ, OWNER_WRITE, OWNER_EXECUTE, GROUP_READ);