src/main/java/name/nathanmcrae/numbersstation/Main.java

@@ -67,22 +67,9 @@ public class Main extends Application {
                 primaryStage.setScene(new Scene(root));
                 primaryStage.show();
             } else {
-                FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("MainView.fxml"));
+                Parent root = FXMLLoader.load(getClass().getResource("MainView.fxml"));
-                Parent root = fxmlLoader.load();
-
-                MainController controller = fxmlLoader.getController();
-
-                primaryStage.setOnCloseRequest(e -> {
-                        if (!controller.handleCloseRequest()) {
-                            e.consume();
-                        } else {
-                            Platform.exit();
-                        }
-                });
-
                 primaryStage.setTitle("Numbers Station");
                 primaryStage.setScene(new Scene(root));
-                primaryStage.titleProperty().bindBidirectional(controller.windowTitle);
                 primaryStage.show();
                 logger.info("Application started");
             }

src/main/java/name/nathanmcrae/numbersstation/MainController.java

@@ -12,19 +12,14 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.Optional;
 import java.util.Random;
 import java.util.ResourceBundle;
-import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Alert;
-import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.ButtonType;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
@@ -46,10 +41,6 @@ public class MainController implements Initializable {
 
     private StringProperty selectedStationName = new SimpleStringProperty();
 
-    private SimpleBooleanProperty unsavedChanges = new SimpleBooleanProperty();
-
-    public StringProperty windowTitle = new SimpleStringProperty("Numbers Station");
-
     @FXML
     private Label lastRetrievedLabel;
 
@@ -109,23 +100,12 @@ public class MainController implements Initializable {
 
                 selectStationStage = new Stage();
                 selectStationStage.initModality(Modality.APPLICATION_MODAL);
-                selectStationStage.setUserData(null);
+                selectStationStage.setUserData("test");
                 selectStationStage.setTitle("Numbers Station Selection");
-
+                selectStationStage.setScene(new Scene(root));
-                Scene scene = new Scene(root);
-                scene.addEventFilter(KeyEvent.KEY_PRESSED, (e) -> controller.handleKeyPressed(e));
-                selectStationStage.setScene(scene);
                 selectStationStage.show();
                 selectStationStage.setOnHiding(event -> {
                     String newStationName = (String)selectStationStage.getUserData();
-                    if (newStationName == null) {
-                        return;
-                    }
-                    if (unsavedChanges.get()) {
-                        if (!confirmSaveChanges()) {
-                            return;
-                        }
-                    }
                     StationSettings newSelectedStation = settings.getStations().stream()
                             .filter(station -> station.getName().equals(newStationName))
                             .findFirst()
@@ -142,17 +122,12 @@ public class MainController implements Initializable {
 
     @FXML
     private void handleSetAsNextMessageButtonPress() {
-        saveMessage();
-    }
-
-    private void saveMessage() {
         try {
             if (!Files.exists(selectedStation.stationPath())) {
                 Files.createDirectories(selectedStation.stationPath());
             }
 
             Files.write(selectedStation.nextMessagePath(), messageTextArea.getText().getBytes());
-            unsavedChanges.set(false);
         } catch (IOException e) {
             String message = "Failed to write next message to " + selectedStation.nextMessagePath().toString();
             logger.log(Level.SEVERE, message, e);
@@ -235,7 +210,6 @@ public class MainController implements Initializable {
                  code == KeyCode.DIGIT7 ||
                  code == KeyCode.DIGIT8 ||
                  code == KeyCode.DIGIT9)) {
-                unsavedChanges.set(true);
 
                 if (cursorPosition < messageTextArea.getLength()) {
                     char currentChar = messageTextArea.getText().charAt(cursorPosition);
@@ -258,18 +232,6 @@ public class MainController implements Initializable {
                 splitPane.setDividerPositions(1.0);
             }
         });
-
-        unsavedChanges.addListener((obs2, wasUnsaved, isNowUnsaved) -> {
-            if (isNowUnsaved) {
-                if (!windowTitle.get().startsWith("*")) {
-                    windowTitle.set("*" + windowTitle.get());
-                }
-            } else {
-                if (windowTitle.get().startsWith("*")) {
-                    windowTitle.set(windowTitle.get().substring(1, windowTitle.get().length()));
-                }
-            }
-        });
     }
 
     private void updateStationSettings(StationSettings newStationSettings) {
@@ -334,40 +296,6 @@ public class MainController implements Initializable {
             }
         }
 
-        unsavedChanges.set(false);
         messageTextArea.setText(messageText);
     }
-
-    /**
-     * @return Whether to continue with the action that prompted the confirmation
-     */
-    public boolean confirmSaveChanges() {
-        Alert alert = new Alert(Alert.AlertType.CONFIRMATION, "Do you want to save your changes to the message?", ButtonType.YES, ButtonType.NO, ButtonType.CANCEL);
-        alert.setHeaderText(null);
-        Optional<ButtonType> result = alert.showAndWait();
-
-        if (!result.isPresent()) {
-            return false;
-        }
-
-        if (result.get() == ButtonType.YES) {
-            saveMessage();
-            return true;
-        } else if (result.get() == ButtonType.NO) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @return whether close should continue or not
-     */
-    public boolean handleCloseRequest() {
-        if (unsavedChanges.get()) {
-            return confirmSaveChanges();
-        }
-
-        return true;
-    }
 }

src/main/java/name/nathanmcrae/numbersstation/StationSelectionController.java

@@ -13,8 +13,6 @@ import javafx.scene.control.ButtonType;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.TextInputDialog;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
 import javafx.event.ActionEvent;
 import javafx.event.Event;
 import javafx.scene.Node;
@@ -98,17 +96,6 @@ public class StationSelectionController {
         stage.close();
     }
 
-    @FXML
-    public void handleKeyPressed(KeyEvent event) {
-        KeyCode code = event.getCode();
-        if (code == KeyCode.ENTER) {
-            selectHighlightedStation();
-        } else if (code == KeyCode.ESCAPE) {
-            Stage stage = (Stage) stationListView.getScene().getWindow();
-            stage.close();
-        }
-    }
-
     @FXML
     private void handleRemoveButtonPress(ActionEvent event) {
         int selectedIndex = stationListView.getSelectionModel().getSelectedIndex();
@@ -128,7 +115,15 @@ public class StationSelectionController {
 
     @FXML
     private void handleSelectButtonPress(Event e) {
-        selectHighlightedStation();
+        Node node = (Node) e.getSource();
+        Stage stage = (Stage) node.getScene().getWindow();
+        StationSettings selectedStation = stationListView.getSelectionModel().getSelectedItem();
+
+        if (selectedStation != null) {
+            stage.setUserData(selectedStation.getName());
+            System.out.println("Selected Station: " + selectedStation.getName());
+        }
+        stage.close();
     }
 
     private void onStationListChanged(ListChangeListener.Change<? extends StationSettings> change) {
@@ -160,15 +155,4 @@ public class StationSelectionController {
         settings.getStations().addAll(stationList);
         settings.save();
     }
-
-    private void selectHighlightedStation() {
-        Stage stage = (Stage) stationListView.getScene().getWindow();
-        StationSettings selectedStation = stationListView.getSelectionModel().getSelectedItem();
-
-        if (selectedStation != null) {
-            stage.setUserData(selectedStation.getName());
-            System.out.println("Selected Station: " + selectedStation.getName());
-        }
-        stage.close();
-    }
 }

src/main/java/name/nathanmcrae/numbersstation/StationSettingsController.java

@@ -499,25 +499,12 @@ public class StationSettingsController {
                 logger.log(Level.SEVERE, "SFTP connection failed", e);
             }
         } else if (messageMethod.get() == StationSettings.MessageMethod.WORDPRESS) {
-            connectionTestDescription.set("Testing connection");
-            connectionTestStatus.set(ConnectionStatus.NEUTRAL);
-
             System.setProperty("wordpress.username", username.get());
             System.setProperty("wordpress.password", password.get());
             System.setProperty("wordpress.url", stationAddress.get());
             Post post = new Post("Title of post", "content to post");
-            try {
+            WordpressClient client = new WordpressClient();
-                WordpressClient client = new WordpressClient();
+            String newPostId = client.newPost(post);
-                var postTypes = client.getPostTypes();
-
-                logger.log(Level.INFO, "Wordpress connection successful");
-                connectionTestDescription.set("Connection succeeded");
-                connectionTestStatus.set(ConnectionStatus.SUCCESS);
-            } catch (Exception e) {
-                connectionTestDescription.set("Worpress connection failed");
-                connectionTestStatus.set(ConnectionStatus.FAILURE);
-                logger.log(Level.SEVERE, "Wordpress connection failed", e);
-            }
         }
     }
 

src/main/resources/StationSettingsView.fxml

@@ -93,7 +93,7 @@
                         <PasswordField fx:id="passwordField" layoutX="444.0" layoutY="95.0" prefHeight="25.0" prefWidth="135.0" AnchorPane.rightAnchor="0.0" />
                         <TextField fx:id="externalProgramCommandField" layoutX="-2.0" layoutY="131.0" prefHeight="25.0" prefWidth="580.0" AnchorPane.leftAnchor="-2.0" AnchorPane.rightAnchor="0.0" />
                         <Button fx:id="testConnectionButton" layoutX="464.0" layoutY="7.0" mnemonicParsing="false" onAction="#handleTestConnectionButtonPress" text="Test connection" />
-                        <Label fx:id="connectionTestStatusLabel" alignment="CENTER_RIGHT" layoutX="136.0" layoutY="11.0" prefHeight="17.0" prefWidth="317.0" textAlignment="RIGHT" AnchorPane.leftAnchor="136.0" AnchorPane.rightAnchor="125.0" />
+                        <Label fx:id="connectionTestStatusLabel" layoutX="257.0" layoutY="11.0" prefHeight="17.0" prefWidth="196.0" AnchorPane.leftAnchor="257.0" AnchorPane.rightAnchor="125.0" />
                      
                    </children>
                      <VBox.margin>