Skip to content
Snippets Groups Projects
Commit f82a9005 authored by Alexis Durgnat's avatar Alexis Durgnat :milky_way:
Browse files

Merge branch 'devel' of ssh://ssh.hesge.ch:10572/pirkl-poo-2018/tp-4 into devel

parents 55dbc4d6 4140738b
No related branches found
No related tags found
1 merge request!21*poof* final version
...@@ -22,7 +22,7 @@ public final class AppConfig { ...@@ -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 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( public static List<String> CHAT_COMMANDS = List.of(
"help", "help",
......
...@@ -340,7 +340,7 @@ public class MainWindowController implements Initializable { ...@@ -340,7 +340,7 @@ public class MainWindowController implements Initializable {
*/ */
@Override @Override
public void initialize(URL url, ResourceBundle resourceBundle) { 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. startStopLabel.setText(""); // No text should be visible when no journey has been selected.
messageTextBox.textProperty().addListener((ov, oldValue, newValue) -> { messageTextBox.textProperty().addListener((ov, oldValue, newValue) -> {
if (messageTextBox.getText().length() > 60) { if (messageTextBox.getText().length() > 60) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment