diff --git a/src/main/java/ch/hepia/config/AppConfig.java b/src/main/java/ch/hepia/config/AppConfig.java index 47571bf87bcfea20a2024830c7e15c5a5b00c81d..a9e352d9b6cab88cb388c12952701bac7b59b08c 100644 --- a/src/main/java/ch/hepia/config/AppConfig.java +++ b/src/main/java/ch/hepia/config/AppConfig.java @@ -22,7 +22,7 @@ public final class AppConfig { public static final String ERROR_API_UNREACHABLE = "Impossible de contacter les services de transport Suisses."; - + public static final String DEFAULT_JOURNEY_TEXT = "Vous n'avez prévu aucun voyage pour le moment."; public static List<String> CHAT_COMMANDS = List.of( "help", diff --git a/src/main/java/ch/hepia/ui/MainWindowController.java b/src/main/java/ch/hepia/ui/MainWindowController.java index 49ff72a336a693f0d7eb4aaa5633b302ab706de4..c7b960c3896ea1dcc7456026328d7d84dc0d1665 100644 --- a/src/main/java/ch/hepia/ui/MainWindowController.java +++ b/src/main/java/ch/hepia/ui/MainWindowController.java @@ -74,6 +74,7 @@ public class MainWindowController implements Initializable { private Pane connectionContainer; private List<Connection> currentConnections; + private Connection currentConnection; /** * Shows a sad message when the API crashes. @@ -325,7 +326,7 @@ public class MainWindowController implements Initializable { */ @Override public void initialize(URL url, ResourceBundle resourceBundle) { - currentJourneyLabel.setText("Vous n'avez prévu aucun voyage pour le moment."); + currentJourneyLabel.setText(AppConfig.DEFAULT_JOURNEY_TEXT); startStopLabel.setText(""); // No text should be visible when no journey has been selected. messageTextBox.textProperty().addListener((ov, oldValue, newValue) -> { if (messageTextBox.getText().length() > 60) { @@ -358,7 +359,10 @@ public class MainWindowController implements Initializable { pane.setOnMouseClicked(e -> { Pane pnl = (Pane) e.getSource(); Integer pos = Integer.parseInt(pnl.getId()); - app.getMessageManager().sendJoinedJourney(new JoinedJourney(app.getUser().get(), currentConnections.get(pos))); + currentConnection = currentConnections.get(pos); + currentJourneyLabel.setText(""); + app.getMessageManager() + .sendJoinedJourney(new JoinedJourney(app.getUser().get(), currentConnection)); }); }); }