Renaming controllers

src/countdownlock/config/ConfigWindow.fxml

@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.*?>
 <VBox xmlns:fx="http://javafx.com/fxml"
       xmlns="http://javafx.com/javafx"
-      fx:controller="countdownlock.config.ConfigWindow"
+      fx:controller="countdownlock.config.ConfigWindowController"
       fx:id="root"
       styleClass="vbox">
 

src/countdownlock/config/ConfigWindow.java → src/countdownlock/config/ConfigWindowController.java

@@ -1,6 +1,6 @@
 package countdownlock.config;
 
-import countdownlock.game.GameWindow;
+import countdownlock.game.GameWindowController;
 import countdownlock.generic.URLLoader;
 import countdownlock.generic.WindowController;
 import javafx.fxml.FXML;
@@ -12,7 +12,7 @@
 import java.net.URL;
 
 
-public class ConfigWindow extends WindowController {
+public class ConfigWindowController extends WindowController {
     @FXML
     private TextField words;
     @FXML
@@ -29,7 +29,7 @@ private void handleSubmitButtonAction() throws IOException {
         URL location = URLLoader.getURL("game/GameWindow.fxml");
         FXMLLoader loader = new FXMLLoader(location);
         Parent newRoot = loader.load();
-        loader.<GameWindow>getController()
+        loader.<GameWindowController>getController()
                 .initialize(words.getText().split(" "), timer.getValue(), help.isSelected(), stress.isSelected());
 
         root.getScene().setRoot(newRoot);

src/countdownlock/end/DefeatWindow.fxml

@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.VBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
       xmlns="http://javafx.com/javafx"
-      fx:controller="countdownlock.end.DefeatWindow"
+      fx:controller="countdownlock.end.DefeatWindowController"
       fx:id="root"
       styleClass="vbox">
     <Label styleClass="defeat-label"

src/countdownlock/end/DefeatWindow.java → src/countdownlock/end/DefeatWindowController.java

@@ -2,6 +2,6 @@
 
 import countdownlock.generic.WindowController;
 
-public class DefeatWindow extends WindowController {
+public class DefeatWindowController extends WindowController {
 
 }

src/countdownlock/end/VictoryWindow.fxml

@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.VBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
       xmlns="http://javafx.com/javafx"
-      fx:controller="countdownlock.end.VictoryWindow"
+      fx:controller="countdownlock.end.VictoryWindowController"
       fx:id="root"
       styleClass="vbox">
     <Label styleClass="victory-label"

src/countdownlock/end/VictoryWindow.java → src/countdownlock/end/VictoryWindowController.java

@@ -2,6 +2,6 @@
 
 import countdownlock.generic.WindowController;
 
-public class VictoryWindow extends WindowController {
+public class VictoryWindowController extends WindowController {
 
 }

src/countdownlock/game/Countdown.fxml

@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.HBox?>
 <HBox xmlns:fx="http://javafx.com/fxml"
       xmlns="http://javafx.com/javafx"
-      fx:controller="countdownlock.game.Countdown"
+      fx:controller="countdownlock.game.CountdownController"
       fx:id="root"
       styleClass="hbox, title-hbox">
 

src/countdownlock/game/Countdown.java → src/countdownlock/game/CountdownController.java

@@ -16,7 +16,7 @@
 
 import java.io.IOException;
 
-public class Countdown extends WindowController {
+public class CountdownController extends WindowController {
     @FXML
     private Label minutesLabel, secondsLabel;
     private MyIntegerProperties minutes, seconds;

src/countdownlock/game/ErrorLabel.fxml

@@ -3,7 +3,7 @@
 <?import javafx.scene.control.Label?>
 <Label xmlns:fx="http://javafx.com/fxml"
        xmlns="http://javafx.com/javafx"
-       fx:controller="countdownlock.game.ErrorLabel"
+       fx:controller="countdownlock.game.ErrorLabelController"
        fx:id="errorLabel"
        styleClass="error-label"
        text="Erreur, réesayez!"

src/countdownlock/game/ErrorLabel.java → src/countdownlock/game/ErrorLabelController.java

@@ -7,7 +7,7 @@
 import javafx.scene.control.Label;
 import javafx.util.Duration;
 
-public class ErrorLabel extends WindowController {
+public class ErrorLabelController extends WindowController {
     @FXML
     private Label errorLabel;
 

src/countdownlock/game/FieldsGrid.fxml

@@ -3,7 +3,7 @@
 <?import javafx.scene.layout.GridPane?>
 <GridPane xmlns:fx="http://javafx.com/fxml"
           xmlns="http://javafx.com/javafx"
-          fx:controller="countdownlock.game.FieldsGrid"
+          fx:controller="countdownlock.game.FieldsGridController"
           fx:id="fieldsGrid"
           styleClass="fields-grid"
           visible="false"/>

src/countdownlock/game/FieldsGrid.java → src/countdownlock/game/FieldsGridController.java

@@ -4,7 +4,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.layout.GridPane;
 
-public class FieldsGrid extends WindowController {
+public class FieldsGridController extends WindowController {
     @FXML
     private GridPane fieldsGrid;
 

src/countdownlock/game/GameWindow.fxml

@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.VBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
       xmlns="http://javafx.com/javafx"
-      fx:controller="countdownlock.game.GameWindow"
+      fx:controller="countdownlock.game.GameWindowController"
       fx:id="root"
       styleClass="vbox">
 

src/countdownlock/game/GameWindow.java → src/countdownlock/game/GameWindowController.java

@@ -11,21 +11,21 @@
 
 import java.io.IOException;
 
-public class GameWindow extends WindowController {
+public class GameWindowController extends WindowController {
     @FXML
     private Button startButton, confirmButton;
     @FXML
     private Label errorLabel;
     @FXML
-    private ErrorLabel errorLabelController;
+    private ErrorLabelController errorLabelController;
     @FXML
     private GridPane fieldsGrid;
     @FXML
-    private FieldsGrid fieldsGridController;
+    private FieldsGridController fieldsGridController;
     @FXML
     private HBox countdown;
     @FXML
-    private Countdown countdownController;
+    private CountdownController countdownController;
 
     public void initialize(String[] words, int duration, boolean help, boolean doStress) {
         countdownController.initialize(duration, doStress);