From d74ab35279582bac3264c486b6127f797db30543 Mon Sep 17 00:00:00 2001
From: huangyuhui <huanghongxun2008@126.com>
Date: Sun, 2 Sep 2018 23:30:27 +0800
Subject: [PATCH] Move package

---
 HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java    | 1 +
 HMCL/src/main/java/org/jackhuang/hmcl/ui/ModItem.java        | 1 +
 .../org/jackhuang/hmcl/ui/account/AccountListItemSkin.java   | 2 +-
 .../java/org/jackhuang/hmcl/ui/account/AddAccountPane.java   | 3 +--
 .../jackhuang/hmcl/ui/{ => construct}/TwoLineListItem.java   | 2 +-
 .../org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java   | 2 +-
 .../main/java/org/jackhuang/hmcl/ui/versions/GameList.java   | 1 -
 .../org/jackhuang/hmcl/ui/versions/GameListItemSkin.java     | 2 +-
 .../hmcl/ui/{ => versions}/InstallerController.java          | 5 ++++-
 .../org/jackhuang/hmcl/ui/{ => versions}/ModController.java  | 5 ++++-
 .../org/jackhuang/hmcl/ui/{ => versions}/VersionPage.java    | 4 ++--
 .../hmcl/ui/{ => versions}/VersionSettingsPage.java          | 4 +++-
 .../main/java/org/jackhuang/hmcl/ui/versions/Versions.java   | 1 -
 HMCL/src/main/resources/assets/fxml/version/installer.fxml   | 2 +-
 HMCL/src/main/resources/assets/fxml/version/mod.fxml         | 2 +-
 HMCL/src/main/resources/assets/fxml/version/version.fxml     | 2 +-
 16 files changed, 23 insertions(+), 16 deletions(-)
 rename HMCL/src/main/java/org/jackhuang/hmcl/ui/{ => construct}/TwoLineListItem.java (99%)
 rename HMCL/src/main/java/org/jackhuang/hmcl/ui/{ => versions}/InstallerController.java (95%)
 rename HMCL/src/main/java/org/jackhuang/hmcl/ui/{ => versions}/ModController.java (97%)
 rename HMCL/src/main/java/org/jackhuang/hmcl/ui/{ => versions}/VersionPage.java (98%)
 rename HMCL/src/main/java/org/jackhuang/hmcl/ui/{ => versions}/VersionSettingsPage.java (99%)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java
index 69c3f39a7..a12b7ce7d 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java
@@ -35,6 +35,7 @@ import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.ui.decorator.DecoratorController;
 import org.jackhuang.hmcl.ui.profile.ProfileList;
 import org.jackhuang.hmcl.ui.versions.GameList;
+import org.jackhuang.hmcl.ui.versions.VersionPage;
 import org.jackhuang.hmcl.util.FutureCallback;
 import org.jackhuang.hmcl.util.JavaVersion;
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ModItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ModItem.java
index ec7362e44..27f131b00 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ModItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ModItem.java
@@ -26,6 +26,7 @@ import javafx.scene.layout.BorderPane;
 
 import org.jackhuang.hmcl.mod.ModInfo;
 import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.util.StringUtils;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java
index 2b50d2f84..26911fce3 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java
@@ -30,7 +30,7 @@ import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.ui.TwoLineListItem;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java
index 7aab8b9e4..92436bbca 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java
@@ -20,7 +20,6 @@ package org.jackhuang.hmcl.ui.account;
 import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.*;
 
-import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.fxml.FXML;
@@ -44,7 +43,7 @@ import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.TwoLineListItem;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.IconedItem;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/TwoLineListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
similarity index 99%
rename from HMCL/src/main/java/org/jackhuang/hmcl/ui/TwoLineListItem.java
rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
index 2cbcc6a79..1ad0406c5 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/TwoLineListItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.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.hmcl.ui;
+package org.jackhuang.hmcl.ui.construct;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java
index 9ec213446..841c3adaf 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java
@@ -30,7 +30,7 @@ import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.ui.TwoLineListItem;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 
 public class ProfileListItemSkin extends SkinBase<ProfileListItem> {
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java
index f07750fa9..5655cefd3 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java
@@ -30,7 +30,6 @@ import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.VersionSettingsPage;
 import org.jackhuang.hmcl.ui.download.DownloadWizardProvider;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.VersionNumber;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java
index 99b43a860..4835e544d 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java
@@ -29,7 +29,7 @@ import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.ui.TwoLineListItem;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/InstallerController.java
similarity index 95%
rename from HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerController.java
rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/InstallerController.java
index de0082e72..e4eae6aed 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerController.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/InstallerController.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.hmcl.ui;
+package org.jackhuang.hmcl.ui.versions;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.ScrollPane;
@@ -30,6 +30,9 @@ import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.InstallerItem;
 import org.jackhuang.hmcl.ui.download.InstallerWizardProvider;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ModController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModController.java
similarity index 97%
rename from HMCL/src/main/java/org/jackhuang/hmcl/ui/ModController.java
rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModController.java
index 88d1255a7..5f8425bba 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ModController.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModController.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.hmcl.ui;
+package org.jackhuang.hmcl.ui.versions;
 
 import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXSpinner;
@@ -31,6 +31,9 @@ import org.jackhuang.hmcl.mod.ModInfo;
 import org.jackhuang.hmcl.mod.ModManager;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.ModItem;
 import org.jackhuang.hmcl.util.FileUtils;
 import org.jackhuang.hmcl.util.Logging;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java
similarity index 98%
rename from HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionPage.java
rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java
index 16134dd9d..b8741055b 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.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.hmcl.ui;
+package org.jackhuang.hmcl.ui.versions;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXListView;
@@ -28,8 +28,8 @@ import javafx.scene.control.Tab;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.download.game.GameAssetIndexDownloadTask;
 import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.ui.versions.Versions;
 import org.jackhuang.hmcl.util.FileUtils;
 
 import java.io.File;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionSettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
similarity index 99%
rename from HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionSettingsPage.java
rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
index 9bd1745b2..582c5d360 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionSettingsPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.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.hmcl.ui;
+package org.jackhuang.hmcl.ui.versions;
 
 import com.jfoenix.controls.*;
 import javafx.application.Platform;
@@ -37,6 +37,8 @@ import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.ComponentList;
 import org.jackhuang.hmcl.ui.construct.ImagePickerItem;
 import org.jackhuang.hmcl.ui.construct.MultiFileItem;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java
index 949d3b0c1..3317e6ce0 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java
@@ -33,7 +33,6 @@ import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.VersionSettingsPage;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.ui.export.ExportWizardProvider;
diff --git a/HMCL/src/main/resources/assets/fxml/version/installer.fxml b/HMCL/src/main/resources/assets/fxml/version/installer.fxml
index 02df43515..e29ff41fa 100644
--- a/HMCL/src/main/resources/assets/fxml/version/installer.fxml
+++ b/HMCL/src/main/resources/assets/fxml/version/installer.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.VBox?>
 <StackPane xmlns="http://javafx.com/javafx"
            xmlns:fx="http://javafx.com/fxml"
-           fx:controller="org.jackhuang.hmcl.ui.InstallerController">
+           fx:controller="org.jackhuang.hmcl.ui.versions.InstallerController">
     <ScrollPane fx:id="scrollPane" fitToWidth="true" fitToHeight="true">
         <VBox fx:id="contentPane" spacing="10" style="-fx-padding: 20;">
 
diff --git a/HMCL/src/main/resources/assets/fxml/version/mod.fxml b/HMCL/src/main/resources/assets/fxml/version/mod.fxml
index bfc7cc8b0..aaa8d0828 100644
--- a/HMCL/src/main/resources/assets/fxml/version/mod.fxml
+++ b/HMCL/src/main/resources/assets/fxml/version/mod.fxml
@@ -8,7 +8,7 @@
 <StackPane xmlns="http://javafx.com/javafx"
            xmlns:fx="http://javafx.com/fxml"
            fx:id="rootPane"
-           fx:controller="org.jackhuang.hmcl.ui.ModController">
+           fx:controller="org.jackhuang.hmcl.ui.versions.ModController">
     <JFXSpinner fx:id="spinner" style="-fx-radius:16" styleClass="materialDesign-purple, first-spinner" />
     <StackPane fx:id="contentPane">
         <ScrollPane fx:id="scrollPane" fitToWidth="true" fitToHeight="true">
diff --git a/HMCL/src/main/resources/assets/fxml/version/version.fxml b/HMCL/src/main/resources/assets/fxml/version/version.fxml
index 54f3eea7f..bddb50096 100644
--- a/HMCL/src/main/resources/assets/fxml/version/version.fxml
+++ b/HMCL/src/main/resources/assets/fxml/version/version.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.StackPane?>
-<?import org.jackhuang.hmcl.ui.VersionSettingsPage?>
+<?import org.jackhuang.hmcl.ui.versions.VersionSettingsPage?>
 <fx:root xmlns="http://javafx.com/javafx"
          xmlns:fx="http://javafx.com/fxml"
          fx:id="rootPane"