From a6a8df6ff5be1e08eddb715734fc61cd03bce8b0 Mon Sep 17 00:00:00 2001
From: lsagona <loic.sagona@edu.univ-fcomte>
Date: Wed, 2 Sep 2020 11:46:54 +0200
Subject: [PATCH] add the possibility to search an MMSI

---
 src/main/kotlin/application/App.kt                 |    2 +-
 .../application/controller/DataPanelController.kt  |    5 +---
 .../controller/VesselListPanelController.kt        |   29 ++++++++++++++++----
 src/main/resources/gui/mapPanel.fxml               |    2 +-
 src/main/resources/gui/menuBar.fxml                |    2 +-
 src/main/resources/gui/timePanel.fxml              |    2 +-
 src/main/resources/gui/vesselListPanel.fxml        |   14 +---------
 src/main/resources/gui/windows.fxml                |    2 +-
 8 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/main/kotlin/application/App.kt b/src/main/kotlin/application/App.kt
index c27eacb..6caffa3 100644
--- a/src/main/kotlin/application/App.kt
+++ b/src/main/kotlin/application/App.kt
@@ -13,6 +13,7 @@ import jfxtras.styles.jmetro.JMetro
 import jfxtras.styles.jmetro.Style
 import kotlin.system.exitProcess
 
+
 class App : Application() {
     var style: Style = Style.LIGHT
 
@@ -29,7 +30,6 @@ class App : Application() {
     }
 
     private fun closeApplication() {
-
         Platform.exit()
         exitProcess(0)
     }
diff --git a/src/main/kotlin/application/controller/DataPanelController.kt b/src/main/kotlin/application/controller/DataPanelController.kt
index 1ee21d4..adb52e7 100644
--- a/src/main/kotlin/application/controller/DataPanelController.kt
+++ b/src/main/kotlin/application/controller/DataPanelController.kt
@@ -86,7 +86,6 @@ class DataPanelController : Initializable, SelectedVesselListener {
         dataViewer.updatePlot(plotData)
         initDataList()
 
-
     }
 
     private fun plot() {
@@ -97,8 +96,6 @@ class DataPanelController : Initializable, SelectedVesselListener {
         }
     }
 
-
-
     private fun plot(data: String?) {
         if (data == null) {
             plotData.allTraces.clear()
@@ -332,7 +329,7 @@ class DataPanelController : Initializable, SelectedVesselListener {
         timeData = populateTime(vessel)
 
         if (dataListView.selectionModel.selectedItem == null) return
-//NOTE: Ajouter les nouvelles donnée à la fin
+
         when (dataListView.selectionModel.selectedItem) {
             "Latitude" -> {
                 latitude.clear()
diff --git a/src/main/kotlin/application/controller/VesselListPanelController.kt b/src/main/kotlin/application/controller/VesselListPanelController.kt
index bbab756..f8fda76 100644
--- a/src/main/kotlin/application/controller/VesselListPanelController.kt
+++ b/src/main/kotlin/application/controller/VesselListPanelController.kt
@@ -6,27 +6,32 @@ import application.model.observableSelectedVessel
 import application.model.observableVessel
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList
+import javafx.collections.transformation.FilteredList
 import javafx.fxml.FXML
 import javafx.fxml.Initializable
-import javafx.scene.control.ListCell
-import javafx.scene.control.ListView
-import javafx.scene.control.MultipleSelectionModel
-import javafx.scene.control.SelectionMode
+import javafx.scene.control.*
 import javafx.scene.input.MouseEvent
 import java.net.URL
 import java.util.*
 
 
 class VesselListPanelController : Initializable, MessageListener {
+
     @FXML
     var shipListView: ListView<String?> = ListView()
 
+    @FXML
+    var filterInput: TextField = TextField()
+
     private var shipList: ObservableList<String?> = FXCollections.observableArrayList()
 
+    private val filterMMSI = FilteredList(shipList)
+
     override fun initialize(location: URL?, resources: ResourceBundle?) {
 
 
-        shipListView.items = shipList
+        shipListView.items = filterMMSI
+
         observableVessel.listeners.add(this)
         shipListView.selectionModel.selectedItemProperty().addListener { _, _, newValue ->
             if (newValue == null) {
@@ -35,7 +40,10 @@ class VesselListPanelController : Initializable, MessageListener {
                 observableSelectedVessel.value = observableVessel.vessels[newValue]!!
             }
         }
+
+
         setCellFactory()
+        setFilterTextListener()
     }
 
     override fun onValueChanged(newValue: MutableMap<String?, Vessel>) {
@@ -43,6 +51,17 @@ class VesselListPanelController : Initializable, MessageListener {
         shipList.addAll(newValue.keys)
     }
 
+    private fun setFilterTextListener() {
+        filterInput.textProperty().addListener { _ ->
+            val filter: String = filterInput.text
+            if (filter.isEmpty()) {
+                filterMMSI.setPredicate { true }
+            } else {
+                filterMMSI.setPredicate { s: String? -> s!!.contains(filter) }
+            }
+        }
+    }
+
     private fun setCellFactory() {
         val selectionModel: MultipleSelectionModel<String?>? = shipListView.selectionModel
         selectionModel?.selectionMode = SelectionMode.SINGLE
diff --git a/src/main/resources/gui/mapPanel.fxml b/src/main/resources/gui/mapPanel.fxml
index 98b7f56..f120a28 100644
--- a/src/main/resources/gui/mapPanel.fxml
+++ b/src/main/resources/gui/mapPanel.fxml
@@ -2,7 +2,7 @@
 
 <?import javafx.scene.layout.*?>
 
-<VBox prefHeight="150.0" prefWidth="371.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.controller.MapPanelController">
+<VBox prefHeight="150.0" prefWidth="371.0" xmlns="http://javafx.com/javafx/8.0.241" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.controller.MapPanelController">
     <StackPane fx:id="map" />
     <fx:include source="timePanel.fxml" />
 </VBox>
diff --git a/src/main/resources/gui/menuBar.fxml b/src/main/resources/gui/menuBar.fxml
index 7c8e4fd..ddc43d3 100644
--- a/src/main/resources/gui/menuBar.fxml
+++ b/src/main/resources/gui/menuBar.fxml
@@ -2,7 +2,7 @@
 
 <?import javafx.scene.control.*?>
 
-<MenuBar fx:id="menuBar" prefHeight="25.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.controller.MenuBarController">
+<MenuBar fx:id="menuBar" prefHeight="25.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.241" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.controller.MenuBarController">
     <menus>
         <Menu mnemonicParsing="false" text="File">
             <items>
diff --git a/src/main/resources/gui/timePanel.fxml b/src/main/resources/gui/timePanel.fxml
index d4eb991..6b175b9 100644
--- a/src/main/resources/gui/timePanel.fxml
+++ b/src/main/resources/gui/timePanel.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<HBox alignment="CENTER" prefHeight="65.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.controller.TimePanel">
+<HBox alignment="CENTER" prefHeight="65.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.241" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.controller.TimePanel">
    <children>
       <Slider fx:id="timeSlider" prefHeight="14.0" prefWidth="538.0">
          <HBox.margin>
diff --git a/src/main/resources/gui/vesselListPanel.fxml b/src/main/resources/gui/vesselListPanel.fxml
index e2f9cdb..9f8155a 100644
--- a/src/main/resources/gui/vesselListPanel.fxml
+++ b/src/main/resources/gui/vesselListPanel.fxml
@@ -1,25 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
 
 <BorderPane prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.controller.VesselListPanelController">
     <center>
         <ListView fx:id="shipListView" prefHeight="50.0" prefWidth="200.0" />
     </center>
    <top>
-      <TextFlow prefHeight="28.0" prefWidth="200.0" style="-fx-font-weight: bold;" textAlignment="CENTER" BorderPane.alignment="CENTER">
-         <children>
-            <Text scaleX="1.5" scaleY="1.5" strokeType="OUTSIDE" strokeWidth="0.0" text="MMSI" textAlignment="CENTER" />
-         </children>
-         <BorderPane.margin>
-            <Insets />
-         </BorderPane.margin>
-         <padding>
-            <Insets top="5.0" />
-         </padding>
-      </TextFlow>
+      <TextField fx:id="filterInput" promptText="MMSI" BorderPane.alignment="CENTER" />
    </top>
 </BorderPane>
diff --git a/src/main/resources/gui/windows.fxml b/src/main/resources/gui/windows.fxml
index f10236b..1c16265 100644
--- a/src/main/resources/gui/windows.fxml
+++ b/src/main/resources/gui/windows.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.shape.*?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="900.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="900.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/8.0.241" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <fx:include source="menuBar.fxml" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
         <SplitPane dividerPositions="0.13772954924874792" layoutY="39.0" prefHeight="865.0" prefWidth="1194.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="35.0">
-- 
1.7.10.4