PTBAS-738: Refactor SearchPopup into SearchCombobox and remove unnecessary code

Author: MomdAli

src/main/java/de/doubleslash/keeptime/view/ExternalProjectsSyncController.java

@@ -25,7 +25,7 @@
 import de.doubleslash.keeptime.model.StyledMessage;
 import de.doubleslash.keeptime.model.Work;
 import de.doubleslash.keeptime.rest.integration.heimat.model.HeimatTask;
-import de.doubleslash.keeptime.viewpopup.SearchPopup;
+import de.doubleslash.keeptime.viewpopup.SearchCombobox;
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.RotateTransition;
@@ -208,10 +208,10 @@ public void initForDate(LocalDate currentReportDate, List<Work> currentWorkItems
          tasksNotInList.setPredicate(predicate);
       });
 
-      SearchPopup<HeimatTask> heimatTaskSearchPopup = new SearchPopup<>(tasksNotInList);
-      heimatTaskSearchPopup.setDisplayTextFunction(task -> task.taskHolderName() + " - " + task.name());
+      SearchCombobox<HeimatTask> heimatTaskSearchCombobox = new SearchCombobox<>(tasksNotInList);
+      heimatTaskSearchCombobox.setDisplayTextFunction(task -> task.taskHolderName() + " - " + task.name());
 
-      heimatTaskSearchPopup.setOnItemSelected((selectedTask, popup) -> {
+      heimatTaskSearchCombobox.setOnItemSelected((selectedTask, popup) -> {
          if (selectedTask == null)
             return;
          boolean alreadyExists = items.stream().anyMatch(row -> row.mapping.heimatTaskId() == selectedTask.id());
@@ -229,10 +229,10 @@ public void initForDate(LocalDate currentReportDate, List<Work> currentWorkItems
          itemsForBindings.add(addedRow); // add new row also to items2 - as it is not added automatically :(
          mappingTableView.scrollTo(items.size() - 1); // scroll to newly added row
       });
-      heimatTaskSearchPopup.setClearFieldAfterSelection(true);
+      heimatTaskSearchCombobox.setClearFieldAfterSelection(true);
 
-      heimatTaskSearchContainer.getChildren().add(heimatTaskSearchPopup.getComboBox());
-      HBox.setHgrow(heimatTaskSearchPopup.getComboBox(), Priority.ALWAYS);
+      heimatTaskSearchContainer.getChildren().add(heimatTaskSearchCombobox.getComboBox());
+      HBox.setHgrow(heimatTaskSearchCombobox.getComboBox(), Priority.ALWAYS);
    }
 
    @FXML
@@ -292,9 +292,6 @@ private HBox createRow(Color color, String text) {
             Label label = new Label(text);
             label.setTooltip(new Tooltip(text));
 
-            label.setMaxWidth(Double.MAX_VALUE);
-            HBox.setHgrow(label, Priority.ALWAYS);
-
             return new HBox(5, circle, label);
          }
       });
@@ -454,10 +451,6 @@ protected void updateItem(TableRow item, boolean empty) {
                tooltip.setText(statusForTooltip);
             }
 
-            // Fix Cell height not aligning with Textflow
-            // https://stackoverflow.com/questions/42855724/textflow-inside-tablecell-not-correct-cell-height
-            statusFlow.maxWidthProperty().bind(column.widthProperty());
-
             setGraphic(new Group(statusFlow));
 
             setTooltip(tooltip);

…lash/keeptime/viewpopup/SearchPopup.java …h/keeptime/viewpopup/SearchCombobox.javasrc/main/java/de/doubleslash/keeptime/viewpopup/SearchPopup.java renamed to src/main/java/de/doubleslash/keeptime/viewpopup/SearchCombobox.java src/main/java/de/doubleslash/keeptime/viewpopup/SearchPopup.java renamed to src/main/java/de/doubleslash/keeptime/viewpopup/SearchCombobox.java

@@ -18,7 +18,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-public class SearchPopup<T> {
+public class SearchCombobox<T> {
    private final TextField searchField = new TextField();
    private final Button showSuggestionsButton = new Button("▼");
    private final ListView<T> suggestionList = new ListView<>();
@@ -33,14 +33,10 @@ public class SearchPopup<T> {
    private String promptText = "Select item…";
    private double maxSuggestionHeight = 200;
 
-   private BiConsumer<T, SearchPopup<T>> onItemSelected = (item, popup) -> {};
+   private BiConsumer<T, SearchCombobox<T>> onItemSelected = (item, popup) -> {};
    private boolean clearFieldAfterSelection = false;
 
-   public SearchPopup() {
-      this(FXCollections.observableArrayList());
-   }
-
-   public SearchPopup(ObservableList<T> items) {
+   public SearchCombobox(ObservableList<T> items) {
       container = new HBox(searchField, showSuggestionsButton);
       container.getStyleClass().add("search-popup-container");
       container.setAlignment(Pos.CENTER_LEFT);
@@ -246,7 +242,7 @@ public Function<T, String> getDisplayTextFunction() {
       return displayTextFunction;
    }
 
-   public void setOnItemSelected(BiConsumer<T, SearchPopup<T>> handler) {
+   public void setOnItemSelected(BiConsumer<T, SearchCombobox<T>> handler) {
       this.onItemSelected = handler != null ? handler : (item, popup) -> {};
    }