diff --git a/fasel-jfx/src/main/java/de/vanitasvitae/fasel/sample/LoginController.java b/fasel-jfx/src/main/java/de/vanitasvitae/fasel/sample/LoginController.java index 47175f5..c26579d 100644 --- a/fasel-jfx/src/main/java/de/vanitasvitae/fasel/sample/LoginController.java +++ b/fasel-jfx/src/main/java/de/vanitasvitae/fasel/sample/LoginController.java @@ -1,60 +1,18 @@ package de.vanitasvitae.fasel.sample; -import java.io.IOException; - -import com.jfoenix.controls.JFXButton; -import com.jfoenix.controls.JFXPasswordField; -import com.jfoenix.controls.JFXTextField; -import javafx.event.ActionEvent; -import javafx.event.EventHandler; import javafx.fxml.FXML; -import javafx.fxml.FXMLLoader; -import javafx.scene.Parent; -import javafx.scene.Scene; -import javafx.scene.input.MouseEvent; -public class LoginController { +public class LoginController extends Controller { @FXML - private JFXTextField text_username; - - @FXML - private JFXPasswordField text_password; - - @FXML - private JFXButton button_login; - - private Main main; + private LoginFragmentController loginFragmentController; @FXML private void initialize() { - button_login.setOnAction(new EventHandler() { - @Override - public void handle(ActionEvent actionEvent) { - String username = text_username.getText(); - String password = text_password.getText(); - try { - switchToMainScene(); - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - - private void switchToMainScene() throws IOException { - FXMLLoader loader = new FXMLLoader(); - loader.setLocation(getClass().getResource("/fxml/sample.fxml")); - Parent root = loader.load(); - - Scene scene = new Scene(root, 1200, 741); - main.getPrimaryStage().setTitle("Hello World"); - main.getPrimaryStage().setScene(scene); - // primaryStage.show(); } public void setApplication(Main main) { - this.main = main; + loginFragmentController.setApplication(main); } } diff --git a/fasel-jfx/src/main/java/de/vanitasvitae/fasel/sample/LoginFragmentController.java b/fasel-jfx/src/main/java/de/vanitasvitae/fasel/sample/LoginFragmentController.java new file mode 100644 index 0000000..9722d4d --- /dev/null +++ b/fasel-jfx/src/main/java/de/vanitasvitae/fasel/sample/LoginFragmentController.java @@ -0,0 +1,59 @@ +package de.vanitasvitae.fasel.sample; + +import java.io.IOException; + +import com.jfoenix.controls.JFXButton; +import com.jfoenix.controls.JFXPasswordField; +import com.jfoenix.controls.JFXTextField; +import javafx.event.ActionEvent; +import javafx.event.EventHandler; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; +import javafx.scene.Scene; + +public class LoginFragmentController { + + @FXML + private JFXTextField text_username; + + @FXML + private JFXPasswordField text_password; + + @FXML + private JFXButton button_login; + + private Main main; + + @FXML + private void initialize() { + button_login.setOnAction(new EventHandler() { + @Override + public void handle(ActionEvent actionEvent) { + String username = text_username.getText(); + String password = text_password.getText(); + + try { + switchToMainScene(); + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + private void switchToMainScene() throws IOException { + FXMLLoader loader = new FXMLLoader(); + loader.setLocation(getClass().getResource("/fxml/sample.fxml")); + Parent root = loader.load(); + + Scene scene = new Scene(root, 1200, 741); + main.getPrimaryStage().setTitle("Hello World"); + main.getPrimaryStage().setScene(scene); + // primaryStage.show(); + } + + public void setApplication(Main main) { + this.main = main; + } +} diff --git a/fasel-jfx/src/main/java/de/vanitasvitae/fasel/sample/Main.java b/fasel-jfx/src/main/java/de/vanitasvitae/fasel/sample/Main.java index eae514d..459c4c3 100644 --- a/fasel-jfx/src/main/java/de/vanitasvitae/fasel/sample/Main.java +++ b/fasel-jfx/src/main/java/de/vanitasvitae/fasel/sample/Main.java @@ -15,9 +15,7 @@ public class Main extends Application { this.primaryStage = primaryStage; FXMLLoader loader = new FXMLLoader(); loader.setLocation(getClass().getResource("/fxml/layout/login.fxml")); - Parent root = loader.load(); - loader.setLocation(getClass().getResource("/fxml/fragment/login.fxml")); LoginController controller = loader.getController(); controller.setApplication(this); Scene scene = new Scene(root, 1200, 741); diff --git a/fasel-jfx/src/main/resources/fxml/fragment/login.fxml b/fasel-jfx/src/main/resources/fxml/fragment/login.fxml index 8c1c796..de56e1c 100644 --- a/fasel-jfx/src/main/resources/fxml/fragment/login.fxml +++ b/fasel-jfx/src/main/resources/fxml/fragment/login.fxml @@ -6,7 +6,7 @@ - diff --git a/fasel-jfx/src/main/resources/fxml/layout/login.fxml b/fasel-jfx/src/main/resources/fxml/layout/login.fxml index 5309258..0e3c0d0 100644 --- a/fasel-jfx/src/main/resources/fxml/layout/login.fxml +++ b/fasel-jfx/src/main/resources/fxml/layout/login.fxml @@ -3,8 +3,8 @@ - + - +