From 86997c29ceeb714bac7f7edb6b237ae3a78a698c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Pirkl?= <pirkl.theo@gmail.com>
Date: Sun, 3 Feb 2019 15:39:00 +0100
Subject: [PATCH] Begins LeftJourney handling
---
src/main/java/ch/hepia/config/AppConfig.java | 2 +-
src/main/java/ch/hepia/ui/MainWindowController.java | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/ch/hepia/config/AppConfig.java b/src/main/java/ch/hepia/config/AppConfig.java
index 47571bf..a9e352d 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 49ff72a..c7b960c 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));
});
});
}
--
GitLab