projects / Macaco / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 42a2705)
Replaced constant.
authorMarco Zanon <info@marcozanon.com>
Wed, 9 Aug 2023 19:49:10 +0000 (19:49 +0000)
committerMarco Zanon <info@marcozanon.com>
Wed, 9 Aug 2023 19:49:10 +0000 (19:49 +0000)
8.x/src/main/java/com/marcozanon/macaco/MConstants.java patch | blob | history
8.x/src/main/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java patch | blob | history
8.x/src/main/java/com/marcozanon/macaco/text/MText.java patch | blob | history
8.x/src/main/java/com/marcozanon/macaco/text/MTranslator.java patch | blob | history

diff --git a/8.x/src/main/java/com/marcozanon/macaco/MConstants.java b/8.x/src/main/java/com/marcozanon/macaco/MConstants.java
index 52c6e38077f30be09114eb1f580444480bb66672..e3d474b433d502b6a86492a5a23fafb95866ad4d 100644 (file)
--- a/8.x/src/main/java/com/marcozanon/macaco/MConstants.java
+++ b/8.x/src/main/java/com/marcozanon/macaco/MConstants.java
@@ -6,6 +6,9 @@
 
 package com.marcozanon.macaco;
 
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
 public class MConstants extends MObject {
 
     /* Generic information. */
@@ -14,7 +17,7 @@ public class MConstants extends MObject {
 
     /* Environment configuration. */
 
-    public static final String TEXT_ENCODING = "UTF-8";
+    public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;;
 
     /* Threads. */
 
diff --git a/8.x/src/main/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java b/8.x/src/main/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java
index 38756c245e725668131275cbf71077d58f6529f8..f61471ebb08628be59357c7aeb71018e20ebc813 100644 (file)
--- a/8.x/src/main/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java
+++ b/8.x/src/main/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java
@@ -13,7 +13,6 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
 import java.nio.file.Path;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -35,13 +34,11 @@ public class MLogPlainTextFile extends MLogTarget {
         //
         this.file = file;
         try {
-            this.buffer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(this.getFile().toFile(), true), MConstants.TEXT_ENCODING));
+            this.buffer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(this.getFile().toFile(), true), MConstants.DEFAULT_CHARSET));
         }
         catch (FileNotFoundException exception) {
             throw new MLoggingException("Could not open file.", exception);
         }
-        catch (UnsupportedEncodingException exception) { // cannot happen
-        }
     }
 
     @Override
diff --git a/8.x/src/main/java/com/marcozanon/macaco/text/MText.java b/8.x/src/main/java/com/marcozanon/macaco/text/MText.java
index be32c80347e5c449a187b589128c80c321119c3a..943b7223d229f91f9a49983bf29754c28cba65a7 100644 (file)
--- a/8.x/src/main/java/com/marcozanon/macaco/text/MText.java
+++ b/8.x/src/main/java/com/marcozanon/macaco/text/MText.java
@@ -415,7 +415,7 @@ public class MText extends MObject {
         String text = x;
         //
         StringBuilder fakeXhtmlPageContent = new StringBuilder("");
-        fakeXhtmlPageContent.append(String.format("<?xml version=\"1.0\" encoding=\"%s\" ?>", MConstants.TEXT_ENCODING));
+        fakeXhtmlPageContent.append(String.format("<?xml version=\"1.0\" encoding=\"%s\" ?>", MConstants.DEFAULT_CHARSET));
         fakeXhtmlPageContent.append("<!DOCTYPE html SYSTEM \"fake-dtd\" >");
         fakeXhtmlPageContent.append("<html xmlns=\"http://www.w3.org/1999/xhtml\">");
         fakeXhtmlPageContent.append("<head><title /></head>");
@@ -470,7 +470,7 @@ public class MText extends MObject {
 
             });
             //
-            reader.parse(new InputSource(new ByteArrayInputStream(fakeXhtmlPageContent.toString().getBytes(MConstants.TEXT_ENCODING))));
+            reader.parse(new InputSource(new ByteArrayInputStream(fakeXhtmlPageContent.toString().getBytes(MConstants.DEFAULT_CHARSET))));
         }
         catch (ParserConfigurationException exception) { // cannot happen
         }
diff --git a/8.x/src/main/java/com/marcozanon/macaco/text/MTranslator.java b/8.x/src/main/java/com/marcozanon/macaco/text/MTranslator.java
index 114da265c9452224c1a722ba820039d55612a211..f55bd5d18662f87d89a7250f133ede0a43197fdb 100644 (file)
--- a/8.x/src/main/java/com/marcozanon/macaco/text/MTranslator.java
+++ b/8.x/src/main/java/com/marcozanon/macaco/text/MTranslator.java
@@ -71,7 +71,7 @@ public class MTranslator extends MObject {
         }
         //
         try (
-            LineNumberReader buffer = new LineNumberReader(new InputStreamReader(new FileInputStream(file.toFile()), MConstants.TEXT_ENCODING));
+            LineNumberReader buffer = new LineNumberReader(new InputStreamReader(new FileInputStream(file.toFile()), MConstants.DEFAULT_CHARSET));
         ) {
             String message = null;
             String line = null;
Unnamed repository; edit this file 'description' to name the repository.