Use UTF-8 as file encoder instead of the default one

Author: jan

io.sloeber.autoBuild/src/io/sloeber/autoBuild/helpers/api/AutoBuildConstants.java

@@ -1,6 +1,7 @@
 package io.sloeber.autoBuild.helpers.api;
 
 import java.io.File;
+import java.nio.charset.Charset;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
@@ -20,6 +21,7 @@ public class AutoBuildConstants {
     public static final boolean isWindows = Platform.getOS().equals(Platform.OS_WIN32);
     public static final boolean isLinux = Platform.getOS().equals(Platform.OS_LINUX);
     public static final boolean isMac = Platform.getOS().equals(Platform.OS_MACOSX);
+    public static final Charset AUTOBUILD_CONFIG_FILE_CHARSET = Charset.forName("UTF-8");
 
     public static final int PARRALLEL_BUILD_UNLIMITED_JOBS = -1;
     public static final int PARRALLEL_BUILD_OPTIMAL_JOBS = -2;

io.sloeber.autoBuild/src/io/sloeber/autoBuild/helpers/api/KeyValueTree.java

@@ -5,7 +5,6 @@
 import java.util.AbstractMap.SimpleEntry;
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -212,7 +211,7 @@ public void mergeFile(File boardsFileName) throws IOException {
 			return;
 		}
 
-		String curConfigsText = FileUtils.readFileToString(boardsFileName, Charset.defaultCharset());
+		String curConfigsText = FileUtils.readFileToString(boardsFileName, AUTOBUILD_CONFIG_FILE_CHARSET);
 		String[] lines = curConfigsText.split(NEWLINE);
 		for (String line : lines) {
 			if ((line.length() == 0) || (line.charAt(0) == '#'))

io.sloeber.autoBuild/src/io/sloeber/autoBuild/integration/AutoBuildConfigurationDescriptionProvider.java

@@ -15,6 +15,7 @@
 package io.sloeber.autoBuild.integration;
 
 
+import static io.sloeber.autoBuild.helpers.api.AutoBuildConstants.*;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -43,6 +44,7 @@ public class AutoBuildConfigurationDescriptionProvider extends CConfigurationDat
 	private static final String AUTO_BUILD_TEAM_FILE = "autoBuildProject.cfg"; //$NON-NLS-1$
 
 
+
 //	public class KeyValuePairs{
 //		private String myLinePrefix;
 //		private String myLineEnd;
@@ -151,7 +153,7 @@ public CConfigurationData applyConfiguration(ICConfigurationDescription cfgDescr
 			boolean needsWriting = true;
 			String  configText= keyValuePairs.dump();
 			if (projectFile.exists()) {
-				String curConfigsText = FileUtils.readFileToString(projectFile, Charset.defaultCharset());
+				String curConfigsText = FileUtils.readFileToString(projectFile, AUTOBUILD_CONFIG_FILE_CHARSET);
 				needsWriting = !curConfigsText.equals(configText);
 			}
 			if (needsWriting) {

io.sloeber.tests/src/io/sloeber/junit/TxtWorkAroundRegression.java

@@ -1,12 +1,12 @@
 
 package io.sloeber.junit;
 
+import static io.sloeber.autoBuild.helpers.api.AutoBuildConstants.*;
 import static io.sloeber.core.txt.WorkAround.*;
 import static org.junit.Assert.*;
 import static org.junit.Assume.*;
 
 import java.io.File;
-import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.LinkedList;
 import org.apache.commons.io.FileUtils;
@@ -81,9 +81,9 @@ public void boardsTxt() throws Exception {
             System.out.println("file does not exists " + expectedFile);
             assumeFalse(true);// skip the test
         }
-        String input = FileUtils.readFileToString(inputFile, Charset.defaultCharset());
+        String input = FileUtils.readFileToString(inputFile, AUTOBUILD_CONFIG_FILE_CHARSET);
         input = input.replace("\r\n", "\n");
-        String expected = FileUtils.readFileToString(expectedFile, Charset.defaultCharset());
+        String expected = FileUtils.readFileToString(expectedFile, AUTOBUILD_CONFIG_FILE_CHARSET);
         String actual = boardsApplyWorkArounds(input);
         String cleanedExpected = clean(expected);
         String cleanedActual = clean(actual);
@@ -108,7 +108,7 @@ public void platformTxt() throws Exception {
             System.out.println("file does not exists " + inputFile);
             assumeFalse(true);// skip the test
         }
-        String input = FileUtils.readFileToString(inputFile, Charset.defaultCharset());
+        String input = FileUtils.readFileToString(inputFile, AUTOBUILD_CONFIG_FILE_CHARSET);
         input = input.replace("\r\n", "\n");
         String currentWorkAround = platformApplyWorkArounds(input, inputFile);
         String cleanedCurrentWorkAround = clean(currentWorkAround);
@@ -119,7 +119,7 @@ public void platformTxt() throws Exception {
             assumeFalse(true);// skip the test
         }
 
-        String expected = FileUtils.readFileToString(expectedFile, Charset.defaultCharset());
+        String expected = FileUtils.readFileToString(expectedFile, AUTOBUILD_CONFIG_FILE_CHARSET);
         String cleanedExpected = clean(expected);
 
         if (!cleanedExpected.equals(cleanedCurrentWorkAround)) {
@@ -146,9 +146,9 @@ public void programmerTxt() throws Exception {
             System.out.println("file does not exists " + expectedFile);
             return;
         }
-        String input = FileUtils.readFileToString(inputFile, Charset.defaultCharset());
+        String input = FileUtils.readFileToString(inputFile, AUTOBUILD_CONFIG_FILE_CHARSET);
         input = input.replace("\r\n", "\n");
-        String expected = FileUtils.readFileToString(expectedFile, Charset.defaultCharset());
+        String expected = FileUtils.readFileToString(expectedFile,AUTOBUILD_CONFIG_FILE_CHARSET);
         String actual = programmersApplyWorkArounds(input);
         String cleanedExpected = clean(expected);
         String cleanedActual = clean(actual);