Change default language from zh_CN to en_US

2017-01-30 16:20:41 +08:00
parent 89efa71ced
commit 899c825813
156 changed files with 648 additions and 613 deletions
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java
@@ -21,7 +21,7 @@ import java.awt.Font;
 import java.text.ParseException;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.log.HMCLog;
 import org.jackhuang.hellominecraft.util.ui.LogWindow;
 import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager;
 import org.jackhuang.hellominecraft.util.UpdateChecker;
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitFormatThread.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitFormatThread.java
@@ -20,7 +20,7 @@ package org.jackhuang.hellominecraft.svrmgr.install.bukkit;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.log.HMCLog;
 import org.jackhuang.hellominecraft.util.func.Consumer;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeFormatThread.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeFormatThread.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.jackhuang.hellominecraft.util.func.Consumer;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.log.HMCLog;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeInstaller.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeInstaller.java
@@ -36,14 +36,14 @@ import java.util.jar.Pack200;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import javax.swing.JOptionPane;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.log.HMCLog;
 import org.jackhuang.hellominecraft.util.code.DigestUtils;
-import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.util.system.IOUtils;
+import org.jackhuang.hellominecraft.util.sys.FileUtils;
+import org.jackhuang.hellominecraft.util.sys.IOUtils;
 import org.jackhuang.hellominecraft.util.MessageBox;
 import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
-import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
+import org.jackhuang.hellominecraft.util.task.TaskWindow;
+import org.jackhuang.hellominecraft.util.net.FileDownloadTask;
 import org.tukaani.xz.XZInputStream;

 /**
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginManager.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginManager.java
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import org.ho.yaml.Yaml;
-import org.jackhuang.hellominecraft.util.NetUtils;
+import org.jackhuang.hellominecraft.util.net.NetUtils;
 import org.jackhuang.hellominecraft.util.StrUtils;

 /**
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/BackupManager.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/BackupManager.java
@@ -21,13 +21,13 @@ import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.util.system.CompressingUtils;
+import org.jackhuang.hellominecraft.util.log.HMCLog;
+import org.jackhuang.hellominecraft.util.sys.CompressingUtils;
 import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager;
 import org.jackhuang.hellominecraft.svrmgr.util.Utilities;
 import org.jackhuang.hellominecraft.util.func.Consumer;
-import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.util.system.IOUtils;
+import org.jackhuang.hellominecraft.util.sys.FileUtils;
+import org.jackhuang.hellominecraft.util.sys.IOUtils;

 /**
 *
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java
@@ -34,8 +34,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.util.system.IOUtils;
+import org.jackhuang.hellominecraft.util.log.HMCLog;
+import org.jackhuang.hellominecraft.util.sys.IOUtils;
 import org.jackhuang.hellominecraft.util.MessageBox;
 import org.jackhuang.hellominecraft.util.Pair;
 import org.jackhuang.hellominecraft.util.StrUtils;
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerChecker.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerChecker.java
@@ -20,7 +20,7 @@ package org.jackhuang.hellominecraft.svrmgr.server;
 import java.io.File;
 import java.io.IOException;
 import java.util.zip.ZipFile;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.log.HMCLog;

 /**
 *
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoExecuteSchedule.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoExecuteSchedule.java
@@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.svrmgr.server.schedule;

 import java.io.IOException;
 import java.util.TimerTask;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.log.HMCLog;
 import org.jackhuang.hellominecraft.svrmgr.server.Server;
 import org.jackhuang.hellominecraft.svrmgr.setting.Schedule;

--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/PlayerList.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/PlayerList.java
@@ -22,8 +22,8 @@ import java.io.File;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.UUID;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.util.system.FileUtils;
+import org.jackhuang.hellominecraft.util.log.HMCLog;
+import org.jackhuang.hellominecraft.util.sys.FileUtils;
 import org.jackhuang.hellominecraft.util.StrUtils;
 import org.jackhuang.hellominecraft.svrmgr.setting.PlayerList.BasePlayer;

--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/ServerProperties.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/ServerProperties.java
@@ -25,9 +25,9 @@ import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Properties;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.util.system.IOUtils;
+import org.jackhuang.hellominecraft.util.log.HMCLog;
+import org.jackhuang.hellominecraft.util.sys.FileUtils;
+import org.jackhuang.hellominecraft.util.sys.IOUtils;

 /**
 *
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/SettingsManager.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/SettingsManager.java
@@ -24,8 +24,8 @@ package org.jackhuang.hellominecraft.svrmgr.setting;
 import com.google.gson.Gson;
 import java.io.File;
 import java.io.IOException;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.util.system.FileUtils;
+import org.jackhuang.hellominecraft.util.log.HMCLog;
+import org.jackhuang.hellominecraft.util.sys.FileUtils;

 /**
 *
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.java
@@ -46,14 +46,14 @@ import javax.swing.JPopupMenu;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.table.DefaultTableModel;
 import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
-import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
-import org.jackhuang.hellominecraft.util.tasks.download.HTTPGetTask;
-import org.jackhuang.hellominecraft.util.system.FileUtils;
+import org.jackhuang.hellominecraft.util.log.HMCLog;
+import org.jackhuang.hellominecraft.util.task.Task;
+import org.jackhuang.hellominecraft.util.task.TaskWindow;
+import org.jackhuang.hellominecraft.util.net.FileDownloadTask;
+import org.jackhuang.hellominecraft.util.net.HTTPGetTask;
+import org.jackhuang.hellominecraft.util.sys.FileUtils;
 import org.jackhuang.hellominecraft.svrmgr.util.IMonitorService;
-import org.jackhuang.hellominecraft.util.system.IOUtils;
+import org.jackhuang.hellominecraft.util.sys.IOUtils;
 import org.jackhuang.hellominecraft.util.MessageBox;
 import org.jackhuang.hellominecraft.svrmgr.util.ModType;
 import org.jackhuang.hellominecraft.svrmgr.util.MonitorInfoBean;
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/PluginInfoDialog.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/PluginInfoDialog.java
@@ -19,8 +19,8 @@ package org.jackhuang.hellominecraft.svrmgr.ui;

 import java.io.File;
 import javax.swing.table.DefaultTableModel;
-import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
-import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
+import org.jackhuang.hellominecraft.util.task.TaskWindow;
+import org.jackhuang.hellominecraft.util.net.FileDownloadTask;
 import org.jackhuang.hellominecraft.util.StrUtils;
 import org.jackhuang.hellominecraft.svrmgr.plugin.PluginInfo;
 import org.jackhuang.hellominecraft.svrmgr.plugin.PluginVersion;
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IPGet.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IPGet.java
@@ -19,8 +19,8 @@ package org.jackhuang.hellominecraft.svrmgr.util;

 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.util.NetUtils;
+import org.jackhuang.hellominecraft.util.log.HMCLog;
+import org.jackhuang.hellominecraft.util.net.NetUtils;
 import org.jackhuang.hellominecraft.util.func.Consumer;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/ModType.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/ModType.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import org.jackhuang.hellominecraft.util.C;
-import org.jackhuang.hellominecraft.util.system.IOUtils;
+import org.jackhuang.hellominecraft.util.sys.IOUtils;

 /**
 * 判断mod类型
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorServiceImpl.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorServiceImpl.java
@@ -26,8 +26,8 @@ import java.lang.management.ManagementFactory;
 import java.util.StringTokenizer;
 import com.sun.management.OperatingSystemMXBean;
 import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
-import org.jackhuang.hellominecraft.util.system.IOUtils;
+import org.jackhuang.hellominecraft.util.log.HMCLog;
+import org.jackhuang.hellominecraft.util.sys.IOUtils;

 /**
 *
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorThread.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorThread.java
@@ -23,7 +23,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import org.jackhuang.hellominecraft.util.code.Charsets;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.log.HMCLog;

 /**
 *
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/Utilities.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/Utilities.java
@@ -19,7 +19,7 @@ package org.jackhuang.hellominecraft.svrmgr.util;

 import java.io.File;
 import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager;
-import org.jackhuang.hellominecraft.util.system.IOUtils;
+import org.jackhuang.hellominecraft.util.sys.IOUtils;

 /**
 *
--- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/WaitForThread.java
+++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/WaitForThread.java
@@ -18,7 +18,7 @@
 package org.jackhuang.hellominecraft.svrmgr.util;

 import org.jackhuang.hellominecraft.util.EventHandler;
-import org.jackhuang.hellominecraft.util.logging.HMCLog;
+import org.jackhuang.hellominecraft.util.log.HMCLog;

 /**
 *