diff --git a/src/main/java/com/adobe/epubcheck/messages/LocalizedMessages.java b/src/main/java/com/adobe/epubcheck/messages/LocalizedMessages.java index 6e9fe69b4..45c66d7ed 100644 --- a/src/main/java/com/adobe/epubcheck/messages/LocalizedMessages.java +++ b/src/main/java/com/adobe/epubcheck/messages/LocalizedMessages.java @@ -1,12 +1,12 @@ package com.adobe.epubcheck.messages; -import com.google.common.base.Charsets; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; +import java.nio.charset.StandardCharsets; import java.util.EnumMap; import java.util.HashMap; import java.util.Locale; @@ -211,7 +211,7 @@ public ResourceBundle newBundle( // Only this line is changed to make it to read properties files as // UTF-8. bundle = new PropertyResourceBundle( - new BufferedReader(new InputStreamReader(stream, Charsets.UTF_8))); + new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))); } finally { stream.close(); diff --git a/src/main/java/com/adobe/epubcheck/util/Messages.java b/src/main/java/com/adobe/epubcheck/util/Messages.java index 687c6140a..f2a25029f 100644 --- a/src/main/java/com/adobe/epubcheck/util/Messages.java +++ b/src/main/java/com/adobe/epubcheck/util/Messages.java @@ -28,6 +28,7 @@ import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; +import java.nio.charset.StandardCharsets; import java.text.MessageFormat; import java.util.Locale; import java.util.MissingResourceException; @@ -35,7 +36,6 @@ import java.util.ResourceBundle; import java.util.ResourceBundle.Control; -import com.google.common.base.Charsets; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; @@ -188,7 +188,7 @@ private class UTF8Control extends Control // Only this line is changed to make it to read properties files as UTF-8. bundle = new PropertyResourceBundle( new BufferedReader( - new InputStreamReader(stream, Charsets.UTF_8))); + new InputStreamReader(stream, StandardCharsets.UTF_8))); } finally {