few changes

This commit is contained in:
Mateusz Kowalczyk 2019-12-08 18:02:36 +01:00
parent b29dcc30da
commit 72088b96c8
7 changed files with 60 additions and 9 deletions

31
ftp-sar.iml Normal file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-controls:11" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-controls:linux:11" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:11" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:linux:11" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-base:11" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-base:linux:11" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:11" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:linux:11" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.5.2" level="project" />
</component>
</module>

View File

@ -15,7 +15,7 @@ public class Main extends Application {
Parent root = FXMLLoader.load(loader.getResource("main_page.fxml"));
primaryStage.setTitle("FTP SAR");
primaryStage.setScene(new Scene(root));
primaryStage.setResizable(false);
// primaryStage.setResizable(false);
primaryStage.show();
}

View File

@ -2,8 +2,10 @@ package ftp.sar.controller;
import ftp.sar.builder.FilePaneBuilder;
import ftp.sar.server.Server;
import javafx.event.Event;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.layout.FlowPane;
@ -20,7 +22,18 @@ public class ServerPanelController implements Initializable {
Label serverIp;
@FXML
FlowPane fileContainer;
@FXML
Button refreshButton;
@FXML
public void refreshList(Event e) {
System.out.println("refresh");
}
@FXML
public void closeConnection(Event e) {
System.out.println("Close");
}
public void setData(Server server) {
this.server = server;

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.FlowPane?>
<?import javafx.scene.layout.Pane?>
@ -11,5 +12,7 @@
<Label layoutX="200.0" layoutY="6.0" text="Port:" />
<Label fx:id="serverPort" layoutX="236.0" layoutY="6.0" text="xxxx" />
<FlowPane fx:id="fileContainer" layoutY="30.0" maxWidth="1.7976931348623157E308" minWidth="-Infinity" prefWidth="780.0" />
<Button fx:id="refreshButton" layoutX="640.0" layoutY="0" mnemonicParsing="false" onAction="#refreshList" text="Refresh" />
<Button fx:id="closeButton" layoutX="720.0" layoutY="0" mnemonicParsing="false" onAction="#closeConnection" text="Close" />
</children>
</Pane>

Binary file not shown.

View File

@ -1,10 +1,12 @@
ftp/sar/validator/Validator.class
ftp/sar/PropertiesLoader.class
ftp/sar/server/ServerFactory.class
ftp/sar/view/mainPage/MainPageController.class
ftp/sar/view/ResourceLoader.class
ftp/sar/validator/IpValidator.class
ftp/sar/controller/ServerPanelController.class
ftp/sar/ResourceLoader.class
ftp/sar/exception/CannotConnectException.class
ftp/sar/server/ServerConnector.class
ftp/sar/server/Server.class
ftp/sar/server/ServerFactory.class
ftp/sar/validator/IpValidator.class
ftp/sar/server/ServerConnector.class
ftp/sar/controller/MainPageController.class
ftp/sar/builder/FilePaneBuilder.class
ftp/sar/Main.class

View File

@ -1,10 +1,12 @@
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/view/ResourceLoader.java
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/ResourceLoader.java
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/server/ServerFactory.java
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/Main.java
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/controller/MainPageController.java
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/PropertiesLoader.java
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/controller/ServerPanelController.java
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/server/Server.java
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/builder/FilePaneBuilder.java
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/validator/Validator.java
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/view/mainPage/MainPageController.java
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/validator/IpValidator.java
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/server/ServerConnector.java
/home/mkdrwal/project/ZSIK_Projekt/src/main/java/ftp/sar/exception/CannotConnectException.java