Minor - favor Guava's UTF-8 charset constant; sensible -> sensitive in issue template
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package tools.messages.translation;
|
||||
|
||||
import com.google.common.base.Charsets;
|
||||
import com.google.common.io.Resources;
|
||||
import com.google.gson.Gson;
|
||||
import fr.xephi.authme.output.MessageKey;
|
||||
@@ -14,7 +15,6 @@ import tools.utils.ToolsConstants;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
||||
import java.nio.charset.Charset;
|
||||
import java.util.HashSet;
|
||||
import java.util.Scanner;
|
||||
import java.util.Set;
|
||||
@@ -56,7 +56,7 @@ public class ImportMessagesTask implements ToolTask {
|
||||
private LanguageExport getLanguageExportFromUrl(String location) {
|
||||
try {
|
||||
URL url = new URL(location);
|
||||
String json = Resources.toString(url, Charset.forName("UTF-8"));
|
||||
String json = Resources.toString(url, Charsets.UTF_8);
|
||||
return gson.fromJson(json, LanguageExport.class);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException(e);
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
package tools.utils;
|
||||
|
||||
import com.google.common.base.Charsets;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.Charset;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
import java.nio.file.StandardOpenOption;
|
||||
@@ -12,8 +13,6 @@ import java.util.List;
|
||||
*/
|
||||
public final class FileUtils {
|
||||
|
||||
private final static Charset CHARSET = Charset.forName("utf-8");
|
||||
|
||||
private FileUtils() {
|
||||
}
|
||||
|
||||
@@ -41,7 +40,7 @@ public final class FileUtils {
|
||||
|
||||
public static String readFromFile(String file) {
|
||||
try {
|
||||
return new String(Files.readAllBytes(Paths.get(file)), CHARSET);
|
||||
return new String(Files.readAllBytes(Paths.get(file)), Charsets.UTF_8);
|
||||
} catch (IOException e) {
|
||||
throw new UnsupportedOperationException("Could not read from file '" + file + "'", e);
|
||||
}
|
||||
@@ -49,7 +48,7 @@ public final class FileUtils {
|
||||
|
||||
public static List<String> readLinesFromFile(String file) {
|
||||
try {
|
||||
return Files.readAllLines(Paths.get(file), CHARSET);
|
||||
return Files.readAllLines(Paths.get(file), Charsets.UTF_8);
|
||||
} catch (IOException e) {
|
||||
throw new UnsupportedOperationException("Could not read from file '" + file + "'", e);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user