diff --git a/src/main/java/ftp/sar/Main.java b/src/main/java/ftp/sar/Main.java
index aa574e8..eb11d67 100644
--- a/src/main/java/ftp/sar/Main.java
+++ b/src/main/java/ftp/sar/Main.java
@@ -1,6 +1,5 @@
package ftp.sar;
-import ftp.sar.view.ResourceLoader;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
@@ -11,17 +10,12 @@ public class Main extends Application {
@Override
public void start(Stage primaryStage) throws Exception{
-
- Object o = getClass();
-
ResourceLoader loader = ResourceLoader.getInstance();
- Object c = loader.getResource("main_page.fxml");
- Object a = getClass().getClassLoader().getResource("resources/main_page.fxml");
- Object b = getClass().getClassLoader().getResource("main_page.fxml");
Parent root = FXMLLoader.load(loader.getResource("main_page.fxml"));
primaryStage.setTitle("FTP SAR");
primaryStage.setScene(new Scene(root));
+ primaryStage.setResizable(false);
primaryStage.show();
}
diff --git a/src/main/java/ftp/sar/PropertiesLoader.java b/src/main/java/ftp/sar/PropertiesLoader.java
index f3e95eb..6b25cdb 100644
--- a/src/main/java/ftp/sar/PropertiesLoader.java
+++ b/src/main/java/ftp/sar/PropertiesLoader.java
@@ -1,8 +1,6 @@
package ftp.sar;
-import ftp.sar.view.ResourceLoader;
-
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/main/java/ftp/sar/view/ResourceLoader.java b/src/main/java/ftp/sar/ResourceLoader.java
similarity index 96%
rename from src/main/java/ftp/sar/view/ResourceLoader.java
rename to src/main/java/ftp/sar/ResourceLoader.java
index 8d3a9d7..f7bbf1f 100644
--- a/src/main/java/ftp/sar/view/ResourceLoader.java
+++ b/src/main/java/ftp/sar/ResourceLoader.java
@@ -1,4 +1,4 @@
-package ftp.sar.view;
+package ftp.sar;
import java.io.InputStream;
import java.net.URL;
diff --git a/src/main/java/ftp/sar/controller/MainPageController.java b/src/main/java/ftp/sar/controller/MainPageController.java
new file mode 100644
index 0000000..7bf0e6e
--- /dev/null
+++ b/src/main/java/ftp/sar/controller/MainPageController.java
@@ -0,0 +1,47 @@
+package ftp.sar.controller;
+
+import ftp.sar.ResourceLoader;
+import ftp.sar.server.Server;
+import ftp.sar.server.ServerFactory;
+import javafx.event.Event;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+
+import java.awt.*;
+import java.io.IOException;
+
+public class MainPageController {
+
+ @FXML public TextField ipField;
+ @FXML public VBox serverContainer;
+
+ public MainPageController() {
+ }
+
+ @FXML
+ public void tryAddServer(Event e) {
+ ServerFactory serverFactory = new ServerFactory();
+
+ Server server = serverFactory.create(ipField.getText(), 7332);
+ ResourceLoader resourceLoader = ResourceLoader.getInstance();
+ try {
+ FXMLLoader fxmlLoader = new FXMLLoader(resourceLoader.getResource("server_panel.fxml"));
+ Pane panel = fxmlLoader.load();
+ ServerPanelController serverPanelController = fxmlLoader.getController();
+ serverPanelController.setData(server);
+ this.serverContainer.getChildren().add(panel);
+
+// FXMLLoader fxmlLoader = new FXMLLoader();
+// Pane panel = fxmlLoader.load(loader.getResource("server_panel.fxml"));
+// ServerPanelController serverPanelController = (ServerPanelController) fxmlLoader.getController();
+// serverPanelController.printHi();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+
+ }
+}
diff --git a/src/main/java/ftp/sar/controller/ServerPanelController.java b/src/main/java/ftp/sar/controller/ServerPanelController.java
new file mode 100644
index 0000000..2ed4053
--- /dev/null
+++ b/src/main/java/ftp/sar/controller/ServerPanelController.java
@@ -0,0 +1,28 @@
+package ftp.sar.controller;
+
+import ftp.sar.server.Server;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.Label;
+
+import java.net.URL;
+import java.util.ResourceBundle;
+
+public class ServerPanelController implements Initializable {
+ private Server server;
+
+ @FXML
+ Label serverPort;
+ @FXML
+ Label serverIp;
+
+ public void setData(Server server) {
+ this.server = server;
+ this.serverPort.setText(Integer.toString(server.getPort()));
+ this.serverIp.setText(server.getIp());
+ }
+
+ @Override
+ public void initialize(URL url, ResourceBundle resourceBundle) {
+ }
+}
diff --git a/src/main/java/ftp/sar/view/mainPage/MainPageController.java b/src/main/java/ftp/sar/view/mainPage/MainPageController.java
deleted file mode 100644
index 04ba4c9..0000000
--- a/src/main/java/ftp/sar/view/mainPage/MainPageController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package ftp.sar.view.mainPage;
-
-import ftp.sar.server.ServerFactory;
-import javafx.event.Event;
-import javafx.fxml.FXML;
-import javafx.scene.control.TextField;
-
-public class MainPageController {
-
- @FXML public TextField ipField;
-
- public MainPageController() {
- }
-
- @FXML
- public void tryAddServer(Event e) {
- ServerFactory serverFactory = new ServerFactory();
-
- serverFactory.create(ipField.getText(), 7332);
- }
-}
diff --git a/src/main/resources/main_page.fxml b/src/main/resources/main_page.fxml
index 583c075..edfb413 100644
--- a/src/main/resources/main_page.fxml
+++ b/src/main/resources/main_page.fxml
@@ -2,13 +2,16 @@
+
+
-