diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java index 61950809d..ce1748bc8 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java @@ -45,7 +45,7 @@ import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException; import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions; import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils; import org.jackhuang.hellominecraft.util.Event; -import org.jackhuang.hellominecraft.lookandfeel.components.ConstomButton; +import org.jackhuang.hellominecraft.lookandfeel.comp.ConstomButton; import org.jackhuang.hellominecraft.util.func.Consumer; import org.jackhuang.hellominecraft.util.system.JavaProcessMonitor; import org.jackhuang.hellominecraft.util.ui.LogWindow; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java index 73579c595..254aea019 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java @@ -25,9 +25,9 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.util.ui.LogWindow; -import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager; +import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager; import org.jackhuang.hellominecraft.util.UpdateChecker; -import org.jackhuang.hellominecraft.svrmgr.views.MainWindow; +import org.jackhuang.hellominecraft.svrmgr.ui.MainWindow; import org.jackhuang.hellominecraft.util.VersionNumber; import org.jackhuang.hellominecraft.lookandfeel.HelloMinecraftLookAndFeel; import org.jackhuang.hellominecraft.util.MessageBox; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/bukkit/BukkitFormatThread.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitFormatThread.java similarity index 98% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/bukkit/BukkitFormatThread.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitFormatThread.java index 6518a3017..34c4d5cf3 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/bukkit/BukkitFormatThread.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitFormatThread.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.installer.bukkit; +package org.jackhuang.hellominecraft.svrmgr.install.bukkit; import java.io.IOException; import java.util.ArrayList; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/bukkit/BukkitVersion.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitVersion.java similarity index 93% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/bukkit/BukkitVersion.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitVersion.java index 4a33a7100..5af2e3b85 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/bukkit/BukkitVersion.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitVersion.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.installer.bukkit; +package org.jackhuang.hellominecraft.svrmgr.install.bukkit; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeFormatThread.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeFormatThread.java similarity index 98% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeFormatThread.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeFormatThread.java index 02361e77b..331f3e9e8 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeFormatThread.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeFormatThread.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.installer.cauldron; +package org.jackhuang.hellominecraft.svrmgr.install.cauldron; import java.io.IOException; import java.util.ArrayList; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeInstaller.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeInstaller.java similarity index 99% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeInstaller.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeInstaller.java index 24779f6a2..71a85ceb6 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeInstaller.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeInstaller.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.installer.cauldron; +package org.jackhuang.hellominecraft.svrmgr.install.cauldron; import com.google.gson.Gson; import java.io.BufferedOutputStream; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeVersion.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeVersion.java similarity index 95% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeVersion.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeVersion.java index 7516d0fdc..bbc1f7cd0 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/ForgeVersion.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeVersion.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.installer.cauldron; +package org.jackhuang.hellominecraft.svrmgr.install.cauldron; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/Install.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/Install.java similarity index 93% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/Install.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/Install.java index 9277627a6..8ffc68ef2 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/Install.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/Install.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.installer.cauldron; +package org.jackhuang.hellominecraft.svrmgr.install.cauldron; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/InstallProfile.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/InstallProfile.java similarity index 93% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/InstallProfile.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/InstallProfile.java index c3020867d..49da66f88 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/InstallProfile.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/InstallProfile.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.installer.cauldron; +package org.jackhuang.hellominecraft.svrmgr.install.cauldron; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/MinecraftLibrary.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/MinecraftLibrary.java similarity index 95% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/MinecraftLibrary.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/MinecraftLibrary.java index 155e20ab8..12f67e137 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/MinecraftLibrary.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/MinecraftLibrary.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.installer.cauldron; +package org.jackhuang.hellominecraft.svrmgr.install.cauldron; import java.io.File; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/MinecraftVersion.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/MinecraftVersion.java similarity index 94% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/MinecraftVersion.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/MinecraftVersion.java index 2cde2143f..87bfe3d95 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/installer/cauldron/MinecraftVersion.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/MinecraftVersion.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.installer.cauldron; +package org.jackhuang.hellominecraft.svrmgr.install.cauldron; import java.util.List; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/BukkitPlugin.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/BukkitPlugin.java similarity index 96% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/BukkitPlugin.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/BukkitPlugin.java index 60544151d..57c55af15 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/BukkitPlugin.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/BukkitPlugin.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.cbplugins; +package org.jackhuang.hellominecraft.svrmgr.plugin; import java.util.List; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/Category.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/Category.java similarity index 93% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/Category.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/Category.java index c82628817..6c535a3a4 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/Category.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/Category.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.cbplugins; +package org.jackhuang.hellominecraft.svrmgr.plugin; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginInfo.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginInfo.java similarity index 94% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginInfo.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginInfo.java index 742f4181f..530665623 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginInfo.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginInfo.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.cbplugins; +package org.jackhuang.hellominecraft.svrmgr.plugin; import java.util.List; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginInformation.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginInformation.java similarity index 93% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginInformation.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginInformation.java index f2921eb17..51c3d10ca 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginInformation.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginInformation.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.cbplugins; +package org.jackhuang.hellominecraft.svrmgr.plugin; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginManager.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginManager.java similarity index 98% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginManager.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginManager.java index 06d156271..70c4eecee 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginManager.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginManager.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.cbplugins; +package org.jackhuang.hellominecraft.svrmgr.plugin; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginVersion.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginVersion.java similarity index 94% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginVersion.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginVersion.java index ba1de49a3..0e8f3a1ad 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/cbplugins/PluginVersion.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginVersion.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.cbplugins; +package org.jackhuang.hellominecraft.svrmgr.plugin; import java.util.List; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/backups/BackupManager.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/BackupManager.java similarity index 95% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/backups/BackupManager.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/BackupManager.java index 13a94b656..1333f62fc 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/backups/BackupManager.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/BackupManager.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.server.backups; +package org.jackhuang.hellominecraft.svrmgr.server; import java.io.File; import java.io.IOException; @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.Date; import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.util.system.Compressor; -import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager; -import org.jackhuang.hellominecraft.svrmgr.utils.Utilities; +import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager; +import org.jackhuang.hellominecraft.svrmgr.util.Utilities; import org.jackhuang.hellominecraft.util.system.FileUtils; import org.jackhuang.hellominecraft.util.system.IOUtils; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ScheduleTranslator.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ScheduleTranslator.java index 5a3386038..72f22b823 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ScheduleTranslator.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ScheduleTranslator.java @@ -17,9 +17,12 @@ */ package org.jackhuang.hellominecraft.svrmgr.server; +import org.jackhuang.hellominecraft.svrmgr.server.schedule.AutoBackupSchedule; +import org.jackhuang.hellominecraft.svrmgr.server.schedule.AutoRestartSchedule; +import org.jackhuang.hellominecraft.svrmgr.server.schedule.AutoSaveSchedule; +import org.jackhuang.hellominecraft.svrmgr.server.schedule.AutoBroadcastSchedule; import java.util.TimerTask; -import org.jackhuang.hellominecraft.svrmgr.server.schedules.*; -import org.jackhuang.hellominecraft.svrmgr.settings.Schedule; +import org.jackhuang.hellominecraft.svrmgr.setting.Schedule; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java index 20ed5c1e8..aafda37a6 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java @@ -40,11 +40,11 @@ import org.jackhuang.hellominecraft.util.system.IOUtils; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.Pair; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.svrmgr.settings.Schedule; -import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager; -import org.jackhuang.hellominecraft.svrmgr.threads.MonitorThread; -import org.jackhuang.hellominecraft.svrmgr.threads.WaitForThread; -import org.jackhuang.hellominecraft.svrmgr.utils.Utilities; +import org.jackhuang.hellominecraft.svrmgr.setting.Schedule; +import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager; +import org.jackhuang.hellominecraft.svrmgr.util.MonitorThread; +import org.jackhuang.hellominecraft.svrmgr.util.WaitForThread; +import org.jackhuang.hellominecraft.svrmgr.util.Utilities; import org.jackhuang.hellominecraft.util.Event; import org.jackhuang.hellominecraft.util.EventHandler; import org.jackhuang.hellominecraft.util.func.Consumer; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/download/ServerDownloadPackage.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerDownloadPackage.java similarity index 93% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/download/ServerDownloadPackage.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerDownloadPackage.java index 9258c29e8..2cda93496 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/download/ServerDownloadPackage.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerDownloadPackage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.server.download; +package org.jackhuang.hellominecraft.svrmgr.server; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoBackupSchedule.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoBackupSchedule.java similarity index 86% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoBackupSchedule.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoBackupSchedule.java index 4af03cab4..d789b66a8 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoBackupSchedule.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoBackupSchedule.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.server.schedules; +package org.jackhuang.hellominecraft.svrmgr.server.schedule; import java.util.TimerTask; import org.jackhuang.hellominecraft.svrmgr.server.Server; -import org.jackhuang.hellominecraft.svrmgr.server.backups.BackupManager; -import org.jackhuang.hellominecraft.svrmgr.settings.Schedule; +import org.jackhuang.hellominecraft.svrmgr.server.BackupManager; +import org.jackhuang.hellominecraft.svrmgr.setting.Schedule; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoBroadcastSchedule.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoBroadcastSchedule.java similarity index 90% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoBroadcastSchedule.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoBroadcastSchedule.java index da5be419c..d64a46456 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoBroadcastSchedule.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoBroadcastSchedule.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.server.schedules; +package org.jackhuang.hellominecraft.svrmgr.server.schedule; import java.util.TimerTask; import org.jackhuang.hellominecraft.svrmgr.server.Server; -import org.jackhuang.hellominecraft.svrmgr.settings.Schedule; +import org.jackhuang.hellominecraft.svrmgr.setting.Schedule; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoExecuteSchedule.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoExecuteSchedule.java similarity index 91% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoExecuteSchedule.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoExecuteSchedule.java index 7d3ce2076..5351b40d1 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoExecuteSchedule.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoExecuteSchedule.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.server.schedules; +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.svrmgr.server.Server; -import org.jackhuang.hellominecraft.svrmgr.settings.Schedule; +import org.jackhuang.hellominecraft.svrmgr.setting.Schedule; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoRestartSchedule.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoRestartSchedule.java similarity index 89% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoRestartSchedule.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoRestartSchedule.java index 6e6afcf92..bd2025233 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoRestartSchedule.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoRestartSchedule.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.server.schedules; +package org.jackhuang.hellominecraft.svrmgr.server.schedule; import java.util.TimerTask; import org.jackhuang.hellominecraft.svrmgr.server.Server; -import org.jackhuang.hellominecraft.svrmgr.settings.Schedule; +import org.jackhuang.hellominecraft.svrmgr.setting.Schedule; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoSaveSchedule.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoSaveSchedule.java similarity index 90% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoSaveSchedule.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoSaveSchedule.java index a9b870abc..4a67aa6a5 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoSaveSchedule.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoSaveSchedule.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.server.schedules; +package org.jackhuang.hellominecraft.svrmgr.server.schedule; import java.util.TimerTask; import org.jackhuang.hellominecraft.svrmgr.server.Server; -import org.jackhuang.hellominecraft.svrmgr.settings.Schedule; +import org.jackhuang.hellominecraft.svrmgr.setting.Schedule; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoSchedule.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoSchedule.java similarity index 89% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoSchedule.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoSchedule.java index b2a8dca82..f0028e86f 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoSchedule.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoSchedule.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.server.schedules; +package org.jackhuang.hellominecraft.svrmgr.server.schedule; import java.util.TimerTask; import org.jackhuang.hellominecraft.svrmgr.server.Server; -import org.jackhuang.hellominecraft.svrmgr.settings.Schedule; +import org.jackhuang.hellominecraft.svrmgr.setting.Schedule; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoSendCommandSchedule.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoSendCommandSchedule.java similarity index 89% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoSendCommandSchedule.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoSendCommandSchedule.java index c249d6dc6..5cd72f73b 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedules/AutoSendCommandSchedule.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoSendCommandSchedule.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.server.schedules; +package org.jackhuang.hellominecraft.svrmgr.server.schedule; import org.jackhuang.hellominecraft.svrmgr.server.Server; -import org.jackhuang.hellominecraft.svrmgr.settings.Schedule; +import org.jackhuang.hellominecraft.svrmgr.setting.Schedule; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/BannedPlayers.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/BannedPlayers.java similarity index 96% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/BannedPlayers.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/BannedPlayers.java index ff0a698c7..112a86199 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/BannedPlayers.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/BannedPlayers.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.settings; +package org.jackhuang.hellominecraft.svrmgr.setting; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/Op.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/Op.java similarity index 95% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/Op.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/Op.java index cea309a58..22bdc1783 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/Op.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/Op.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.settings; +package org.jackhuang.hellominecraft.svrmgr.setting; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/PlayerList.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/PlayerList.java similarity index 96% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/PlayerList.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/PlayerList.java index 18ee86bf3..26e1c8d85 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/PlayerList.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/PlayerList.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.settings; +package org.jackhuang.hellominecraft.svrmgr.setting; import com.google.gson.Gson; import java.io.File; @@ -25,7 +25,7 @@ import java.util.UUID; import org.jackhuang.hellominecraft.util.logging.HMCLog; import org.jackhuang.hellominecraft.util.system.FileUtils; import org.jackhuang.hellominecraft.util.StrUtils; -import org.jackhuang.hellominecraft.svrmgr.settings.PlayerList.BasePlayer; +import org.jackhuang.hellominecraft.svrmgr.setting.PlayerList.BasePlayer; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/Schedule.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/Schedule.java similarity index 96% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/Schedule.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/Schedule.java index b9d9f6d5e..9f46a57fe 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/Schedule.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/Schedule.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.settings; +package org.jackhuang.hellominecraft.svrmgr.setting; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/ServerProperties.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/ServerProperties.java similarity index 99% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/ServerProperties.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/ServerProperties.java index 6f54ef095..b109b1cfb 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/ServerProperties.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/ServerProperties.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.settings; +package org.jackhuang.hellominecraft.svrmgr.setting; import java.io.File; import java.io.FileInputStream; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/Settings.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/Settings.java similarity index 96% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/Settings.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/Settings.java index 5f90e766f..faa16e026 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/Settings.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/Settings.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.settings; +package org.jackhuang.hellominecraft.svrmgr.setting; import java.util.ArrayList; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/SettingsManager.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/SettingsManager.java similarity index 97% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/SettingsManager.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/SettingsManager.java index 504d500c3..c69462bf6 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/SettingsManager.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/SettingsManager.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.settings; +package org.jackhuang.hellominecraft.svrmgr.setting; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/WhiteList.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/WhiteList.java similarity index 95% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/WhiteList.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/WhiteList.java index d97ca347c..c53b1d974 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/settings/WhiteList.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/WhiteList.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.settings; +package org.jackhuang.hellominecraft.svrmgr.setting; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/CommandsWindow.form b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/CommandsWindow.form similarity index 100% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/CommandsWindow.form rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/CommandsWindow.form diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/CommandsWindow.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/CommandsWindow.java similarity index 99% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/CommandsWindow.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/CommandsWindow.java index 1434b543c..1823beba9 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/CommandsWindow.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/CommandsWindow.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.views; +package org.jackhuang.hellominecraft.svrmgr.ui; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/InputDialog.form b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/InputDialog.form similarity index 100% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/InputDialog.form rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/InputDialog.form diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/InputDialog.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/InputDialog.java similarity index 99% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/InputDialog.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/InputDialog.java index 805180881..bc3713ac3 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/InputDialog.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/InputDialog.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.views; +package org.jackhuang.hellominecraft.svrmgr.ui; import java.awt.Dimension; import java.awt.Toolkit; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.form b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.form similarity index 100% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.form rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.form diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.java similarity index 99% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.java index 5d011dfd8..7f79fc1e9 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/MainWindow.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. */ -package org.jackhuang.hellominecraft.svrmgr.views; +package org.jackhuang.hellominecraft.svrmgr.ui; import java.awt.Dimension; import java.awt.Image; @@ -52,41 +52,41 @@ 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.svrmgr.utils.IMonitorService; +import org.jackhuang.hellominecraft.svrmgr.util.IMonitorService; import org.jackhuang.hellominecraft.util.system.IOUtils; import org.jackhuang.hellominecraft.util.MessageBox; -import org.jackhuang.hellominecraft.svrmgr.utils.ModType; -import org.jackhuang.hellominecraft.svrmgr.utils.MonitorInfoBean; -import org.jackhuang.hellominecraft.svrmgr.utils.MonitorServiceImpl; +import org.jackhuang.hellominecraft.svrmgr.util.ModType; +import org.jackhuang.hellominecraft.svrmgr.util.MonitorInfoBean; +import org.jackhuang.hellominecraft.svrmgr.util.MonitorServiceImpl; import org.jackhuang.hellominecraft.util.version.MinecraftRemoteVersions; import org.jackhuang.hellominecraft.svrmgr.Main; -import org.jackhuang.hellominecraft.svrmgr.cbplugins.BukkitPlugin; -import org.jackhuang.hellominecraft.svrmgr.cbplugins.Category; -import org.jackhuang.hellominecraft.svrmgr.cbplugins.PluginInfo; -import org.jackhuang.hellominecraft.svrmgr.cbplugins.PluginInformation; -import org.jackhuang.hellominecraft.svrmgr.cbplugins.PluginManager; -import org.jackhuang.hellominecraft.svrmgr.installer.bukkit.BukkitFormatThread; -import org.jackhuang.hellominecraft.svrmgr.installer.bukkit.BukkitVersion; -import org.jackhuang.hellominecraft.svrmgr.installer.cauldron.ForgeFormatThread; -import org.jackhuang.hellominecraft.svrmgr.installer.cauldron.ForgeInstaller; -import org.jackhuang.hellominecraft.svrmgr.installer.cauldron.ForgeVersion; +import org.jackhuang.hellominecraft.svrmgr.plugin.BukkitPlugin; +import org.jackhuang.hellominecraft.svrmgr.plugin.Category; +import org.jackhuang.hellominecraft.svrmgr.plugin.PluginInfo; +import org.jackhuang.hellominecraft.svrmgr.plugin.PluginInformation; +import org.jackhuang.hellominecraft.svrmgr.plugin.PluginManager; +import org.jackhuang.hellominecraft.svrmgr.install.bukkit.BukkitFormatThread; +import org.jackhuang.hellominecraft.svrmgr.install.bukkit.BukkitVersion; +import org.jackhuang.hellominecraft.svrmgr.install.cauldron.ForgeFormatThread; +import org.jackhuang.hellominecraft.svrmgr.install.cauldron.ForgeInstaller; +import org.jackhuang.hellominecraft.svrmgr.install.cauldron.ForgeVersion; import org.jackhuang.hellominecraft.svrmgr.server.ScheduleTranslator; import org.jackhuang.hellominecraft.svrmgr.server.Server; import org.jackhuang.hellominecraft.svrmgr.server.ServerChecker; -import org.jackhuang.hellominecraft.svrmgr.server.backups.BackupManager; -import org.jackhuang.hellominecraft.svrmgr.settings.BannedPlayers; -import org.jackhuang.hellominecraft.svrmgr.settings.Op; -import org.jackhuang.hellominecraft.svrmgr.settings.Schedule; -import org.jackhuang.hellominecraft.svrmgr.settings.ServerProperties; -import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager; -import org.jackhuang.hellominecraft.svrmgr.settings.WhiteList; -import org.jackhuang.hellominecraft.svrmgr.threads.MonitorThread; -import org.jackhuang.hellominecraft.svrmgr.utils.FolderOpener; -import org.jackhuang.hellominecraft.svrmgr.utils.IPGet; -import org.jackhuang.hellominecraft.svrmgr.utils.Utilities; +import org.jackhuang.hellominecraft.svrmgr.server.BackupManager; +import org.jackhuang.hellominecraft.svrmgr.setting.BannedPlayers; +import org.jackhuang.hellominecraft.svrmgr.setting.Op; +import org.jackhuang.hellominecraft.svrmgr.setting.Schedule; +import org.jackhuang.hellominecraft.svrmgr.setting.ServerProperties; +import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager; +import org.jackhuang.hellominecraft.svrmgr.setting.WhiteList; +import org.jackhuang.hellominecraft.svrmgr.util.MonitorThread; +import org.jackhuang.hellominecraft.svrmgr.util.FolderOpener; +import org.jackhuang.hellominecraft.svrmgr.util.IPGet; +import org.jackhuang.hellominecraft.svrmgr.util.Utilities; import org.jackhuang.hellominecraft.util.ui.SwingUtils; import org.jackhuang.hellominecraft.util.version.MinecraftRemoteVersion; -import org.jackhuang.hellominecraft.lookandfeel.components.ConstomButton; +import org.jackhuang.hellominecraft.lookandfeel.comp.ConstomButton; import org.jackhuang.hellominecraft.util.Event; import org.jackhuang.hellominecraft.util.StrUtils; @@ -2157,7 +2157,6 @@ public final class MainWindow extends javax.swing.JFrame jScrollPane19.setViewportView(lstMCPC); btnDownloadMCPC.setText(C.i18n("download")); // NOI18N - btnDownloadMCPC.setLabel("下载"); btnDownloadMCPC.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btnDownloadMCPCActionPerformed(evt); @@ -2166,7 +2165,6 @@ public final class MainWindow extends javax.swing.JFrame lstRefreshMCPC.setText(C.i18n("ui.button.refresh")); // NOI18N lstRefreshMCPC.setToolTipText(""); - lstRefreshMCPC.setLabel("刷新"); lstRefreshMCPC.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { lstRefreshMCPCActionPerformed(evt); diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/PluginInfoDialog.form b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/PluginInfoDialog.form similarity index 100% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/PluginInfoDialog.form rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/PluginInfoDialog.form diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/PluginInfoDialog.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/PluginInfoDialog.java similarity index 98% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/PluginInfoDialog.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/PluginInfoDialog.java index e3eac7e43..83cfe4aa6 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/views/PluginInfoDialog.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/PluginInfoDialog.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.views; +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.StrUtils; -import org.jackhuang.hellominecraft.svrmgr.cbplugins.PluginInfo; -import org.jackhuang.hellominecraft.svrmgr.cbplugins.PluginVersion; -import org.jackhuang.hellominecraft.svrmgr.utils.Utilities; +import org.jackhuang.hellominecraft.svrmgr.plugin.PluginInfo; +import org.jackhuang.hellominecraft.svrmgr.plugin.PluginVersion; +import org.jackhuang.hellominecraft.svrmgr.util.Utilities; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/FolderOpener.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/FolderOpener.java similarity index 97% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/FolderOpener.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/FolderOpener.java index 79b743a8c..67c88b2f7 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/FolderOpener.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/FolderOpener.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.utils; +package org.jackhuang.hellominecraft.svrmgr.util; import java.io.File; import org.jackhuang.hellominecraft.util.MessageBox; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/IMonitorService.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IMonitorService.java similarity index 95% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/IMonitorService.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IMonitorService.java index fc5852452..bcddb616e 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/IMonitorService.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IMonitorService.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.utils; +package org.jackhuang.hellominecraft.svrmgr.util; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/IPGet.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IPGet.java similarity index 97% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/IPGet.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IPGet.java index a794e5a2c..0a987031d 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/IPGet.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IPGet.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.utils; +package org.jackhuang.hellominecraft.svrmgr.util; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/ModType.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/ModType.java similarity index 98% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/ModType.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/ModType.java index 686420b4d..7cdc9be97 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/ModType.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/ModType.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.utils; +package org.jackhuang.hellominecraft.svrmgr.util; import java.io.File; import java.io.IOException; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorInfoBean.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorInfoBean.java similarity index 98% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorInfoBean.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorInfoBean.java index 93dee9e4f..a833d7456 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorInfoBean.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorInfoBean.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.utils; +package org.jackhuang.hellominecraft.svrmgr.util; /** * diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorServiceImpl.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorServiceImpl.java similarity index 99% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorServiceImpl.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorServiceImpl.java index 94572c41f..588c3895c 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/MonitorServiceImpl.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorServiceImpl.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.utils; +package org.jackhuang.hellominecraft.svrmgr.util; import java.io.BufferedReader; import java.io.IOException; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/MonitorThread.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorThread.java similarity index 97% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/MonitorThread.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorThread.java index 320f4a77a..d9d578961 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/MonitorThread.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorThread.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.threads; +package org.jackhuang.hellominecraft.svrmgr.util; import java.io.BufferedReader; import java.io.IOException; diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/Utilities.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/Utilities.java similarity index 91% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/Utilities.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/Utilities.java index fa7705284..b6264b528 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/utils/Utilities.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/Utilities.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.utils; +package org.jackhuang.hellominecraft.svrmgr.util; import java.io.File; -import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager; +import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager; import org.jackhuang.hellominecraft.util.system.IOUtils; /** diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/WaitForThread.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/WaitForThread.java similarity index 96% rename from HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/WaitForThread.java rename to HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/WaitForThread.java index 5670b00cc..85bb6672c 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/threads/WaitForThread.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/WaitForThread.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -package org.jackhuang.hellominecraft.svrmgr.threads; +package org.jackhuang.hellominecraft.svrmgr.util; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/components/ConstomButton.java b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/ConstomButton.java similarity index 95% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/components/ConstomButton.java rename to MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/ConstomButton.java index b6ff22bf0..135fb0851 100755 --- a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/components/ConstomButton.java +++ b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/ConstomButton.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. */ -package org.jackhuang.hellominecraft.lookandfeel.components; +package org.jackhuang.hellominecraft.lookandfeel.comp; import java.awt.Color; import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils; diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/components/IConstomable.java b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/IConstomable.java similarity index 92% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/components/IConstomable.java rename to MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/IConstomable.java index daae9333d..38756e3b4 100755 --- a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/components/IConstomable.java +++ b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/IConstomable.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. */ -package org.jackhuang.hellominecraft.lookandfeel.components; +package org.jackhuang.hellominecraft.lookandfeel.comp; /** * diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painters/ButtonPainter.java b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ButtonPainter.java similarity index 98% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painters/ButtonPainter.java rename to MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ButtonPainter.java index 92941f77f..ea9ec97c2 100755 --- a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painters/ButtonPainter.java +++ b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ButtonPainter.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.jackhuang.hellominecraft.lookandfeel.painters; +package org.jackhuang.hellominecraft.lookandfeel.painter; import java.awt.Color; import java.awt.Graphics; @@ -31,7 +31,7 @@ import javax.swing.plaf.synth.SynthConstants; import javax.swing.plaf.synth.SynthContext; import javax.swing.plaf.synth.SynthPainter; import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils; -import org.jackhuang.hellominecraft.lookandfeel.components.ConstomButton; +import org.jackhuang.hellominecraft.lookandfeel.comp.ConstomButton; /** * ButtonPainter - handles painting Nimbus style buttons with Java2D diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painters/ProgressPainter.java b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ProgressPainter.java similarity index 98% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painters/ProgressPainter.java rename to MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ProgressPainter.java index b6fb06de8..718de303e 100755 --- a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painters/ProgressPainter.java +++ b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ProgressPainter.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.jackhuang.hellominecraft.lookandfeel.painters; +package org.jackhuang.hellominecraft.lookandfeel.painter; import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils; diff --git a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painters/TextFieldPainter.java b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/TextFieldPainter.java similarity index 98% rename from MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painters/TextFieldPainter.java rename to MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/TextFieldPainter.java index 81721b3ed..ec3babf51 100755 --- a/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painters/TextFieldPainter.java +++ b/MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/TextFieldPainter.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.jackhuang.hellominecraft.lookandfeel.painters; +package org.jackhuang.hellominecraft.lookandfeel.painter; import javax.swing.plaf.synth.SynthContext; import javax.swing.plaf.synth.SynthPainter;