From 2affd99b366a88eab24d981da21f5a4b8795b773 Mon Sep 17 00:00:00 2001
From: lizekai-richard <lzknus@gmail.com>
Date: Thu, 29 Sep 2022 13:24:23 +0800
Subject: [PATCH] Modify code structure

---
 src/main/java/cwq/Launcher.java            | 1 +
 src/main/java/cwq/{ => Ui}/DialogBox.java  | 2 +-
 src/main/java/cwq/{ => Ui}/Main.java       | 4 +++-
 src/main/java/cwq/{ => Ui}/MainWindow.java | 2 +-
 src/main/resources/view/MainWindow.fxml    | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)
 rename src/main/java/cwq/{ => Ui}/DialogBox.java (99%)
 rename src/main/java/cwq/{ => Ui}/Main.java (97%)
 rename src/main/java/cwq/{ => Ui}/MainWindow.java (99%)

diff --git a/src/main/java/cwq/Launcher.java b/src/main/java/cwq/Launcher.java
index 85dd6a2f9a..ce5bf41f1b 100644
--- a/src/main/java/cwq/Launcher.java
+++ b/src/main/java/cwq/Launcher.java
@@ -1,5 +1,6 @@
 package cwq;
 
+import cwq.Ui.Main;
 import javafx.application.Application;
 
 /**
diff --git a/src/main/java/cwq/DialogBox.java b/src/main/java/cwq/Ui/DialogBox.java
similarity index 99%
rename from src/main/java/cwq/DialogBox.java
rename to src/main/java/cwq/Ui/DialogBox.java
index 4bcee9f77a..e664b098cd 100644
--- a/src/main/java/cwq/DialogBox.java
+++ b/src/main/java/cwq/Ui/DialogBox.java
@@ -1,4 +1,4 @@
-package cwq;
+package cwq.Ui;
 
 import java.io.IOException;
 import java.util.Collections;
diff --git a/src/main/java/cwq/Main.java b/src/main/java/cwq/Ui/Main.java
similarity index 97%
rename from src/main/java/cwq/Main.java
rename to src/main/java/cwq/Ui/Main.java
index c9c090ad4e..ff0a702114 100644
--- a/src/main/java/cwq/Main.java
+++ b/src/main/java/cwq/Ui/Main.java
@@ -1,6 +1,8 @@
-package cwq;
+package cwq.Ui;
 
 import java.io.IOException;
+
+import cwq.CWQ;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
diff --git a/src/main/java/cwq/MainWindow.java b/src/main/java/cwq/Ui/MainWindow.java
similarity index 99%
rename from src/main/java/cwq/MainWindow.java
rename to src/main/java/cwq/Ui/MainWindow.java
index 93343e943f..697de1d568 100644
--- a/src/main/java/cwq/MainWindow.java
+++ b/src/main/java/cwq/Ui/MainWindow.java
@@ -1,4 +1,4 @@
-package cwq;
+package cwq.Ui;
 
 import cwq.CWQ;
 import javafx.fxml.FXML;
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
index cad45c38b4..9b215b221d 100644
--- a/src/main/resources/view/MainWindow.fxml
+++ b/src/main/resources/view/MainWindow.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="cwq.MainWindow">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="cwq.Ui.MainWindow">
     <children>
         <TextField fx:id="userInput" layoutY="558.0" onAction="#handleUserInput" prefHeight="41.0" prefWidth="324.0" AnchorPane.bottomAnchor="1.0" />
         <Button fx:id="sendButton" layoutX="324.0" layoutY="558.0" mnemonicParsing="false" onAction="#handleUserInput" prefHeight="41.0" prefWidth="76.0" text="Send" />