From 0e43af0e68980958ce0a27c05f76d9c80b2aec91 Mon Sep 17 00:00:00 2001 From: Marco Zanon Date: Wed, 9 Aug 2023 19:49:10 +0000 Subject: [PATCH] Replaced constant. --- 8.x/src/main/java/com/marcozanon/macaco/MConstants.java | 5 ++++- .../com/marcozanon/macaco/logging/MLogPlainTextFile.java | 5 +---- 8.x/src/main/java/com/marcozanon/macaco/text/MText.java | 4 ++-- .../main/java/com/marcozanon/macaco/text/MTranslator.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) 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 52c6e38..e3d474b 100644 --- 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 38756c2..f61471e 100644 --- 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 be32c80..943b722 100644 --- 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("", MConstants.TEXT_ENCODING)); + fakeXhtmlPageContent.append(String.format("", MConstants.DEFAULT_CHARSET)); fakeXhtmlPageContent.append(""); fakeXhtmlPageContent.append(""); fakeXhtmlPageContent.append("</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 114da26..f55bd5d 100644 --- 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; -- 2.30.2