convert search worker to javafx

src/main/java/org/jabref/gui/BasePanel.java

@@ -185,7 +185,6 @@ public BasePanel(JabRefFrame frame, BasePanelPreferences preferences, BibDatabas
         this.entryEditor = new EntryEditor(this, preferences.getEntryEditorPreferences(), Globals.getFileUpdateMonitor(), dialogService, externalFileTypes, Globals.TASK_EXECUTOR);
 
         this.preview = new PreviewPanel(getBibDatabaseContext(), this, dialogService, externalFileTypes, Globals.getKeyPrefs(), preferences.getPreviewPreferences());
-        frame().getGlobalSearchBar().getSearchQueryHighlightObservable().addSearchListener(preview);
     }
 
     @Subscribe

src/main/java/org/jabref/gui/StateManager.java

@@ -6,14 +6,18 @@
 import java.util.stream.Collectors;
 
 import javafx.beans.binding.Bindings;
+import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ReadOnlyListProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
 
 import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.logic.search.SearchQuery;
+import org.jabref.logic.search.SearchQueryHighlightListener;
+import org.jabref.logic.search.SearchQueryHighlightObservable;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.groups.GroupTreeNode;
@@ -34,6 +38,8 @@ public class StateManager {
     private final ObservableList<BibEntry> selectedEntries = FXCollections.observableArrayList();
     private final ObservableMap<BibDatabaseContext, ObservableList<GroupTreeNode>> selectedGroups = FXCollections.observableHashMap();
     private final OptionalObjectProperty<SearchQuery> activeSearchQuery = OptionalObjectProperty.empty();
+    private final IntegerProperty searchResultSize = new SimpleIntegerProperty();
+    private final SearchQueryHighlightObservable searchQueryHighlightObservable = new SearchQueryHighlightObservable();
 
     public StateManager() {
         activeGroups.bind(Bindings.valueAt(selectedGroups, activeDatabase.orElse(null)));
@@ -79,7 +85,7 @@ public Optional<BibDatabaseContext> getActiveDatabase() {
 
     public List<BibEntry> getEntriesInCurrentDatabase() {
         return OptionalUtil.flatMap(activeDatabase.get(), BibDatabaseContext::getEntries)
-                .collect(Collectors.toList());
+                           .collect(Collectors.toList());
     }
 
     public void clearSearchQuery() {
@@ -89,4 +95,32 @@ public void clearSearchQuery() {
     public void setSearchQuery(SearchQuery searchQuery) {
         activeSearchQuery.setValue(Optional.of(searchQuery));
     }
+
+    public IntegerProperty searchResultSizeProperty() {
+        return searchResultSize;
+    }
+
+    public void setSearchResultSize(int size) {
+        searchResultSize.setValue(size);
+    }
+
+    public SearchQueryHighlightObservable getSearchQueryHighlightObservable() {
+        return searchQueryHighlightObservable;
+    }
+
+    public void fireSearchQueryHighlightEvent() {
+        if (activeSearchQuery.get().isPresent()) {
+            searchQueryHighlightObservable.fireSearchlistenerEvent(activeSearchQuery.getValue().get());
+        }
+    }
+
+    public void resetSearchQueryHighlightObservable()
+    {
+        searchQueryHighlightObservable.reset();
+    }
+
+    public void addSearchQueryHighlightListener(SearchQueryHighlightListener listener) {
+        searchQueryHighlightObservable.removeSearchListener(listener);
+        searchQueryHighlightObservable.addSearchListener(listener);
+    }
 }

src/main/java/org/jabref/gui/entryeditor/BibtexSourceCodeArea.css

@@ -0,0 +1,7 @@
+#bibtexSourceCodeArea .search {
+	-fx-fill: red;
+}
+
+.bibtexSourceCodeArea .text {
+    -fx-fill: -fx-text-background-color;
+}

src/main/java/org/jabref/gui/entryeditor/EntryEditor.css

@@ -87,5 +87,3 @@
 .related-articles-tab {
     -fx-padding: 20 20 20 20;
 }
-
-

src/main/java/org/jabref/gui/entryeditor/EntryEditor.java

@@ -403,7 +403,7 @@ private void fetchAndMerge(EntryBasedFetcher fetcher) {
     void addSearchListener(SearchQueryHighlightListener listener) {
         // TODO: Highlight search text in entry editors
         searchListeners.add(listener);
-        panel.frame().getGlobalSearchBar().getSearchQueryHighlightObservable().addSearchListener(listener);
+
     }
 
     public void setFocusToField(String fieldName) {

src/main/java/org/jabref/gui/entryeditor/SourceTab.java

@@ -5,6 +5,7 @@
 import java.io.StringWriter;
 import java.util.Map;
 import java.util.Objects;
+import java.util.regex.Matcher;
 
 import javax.swing.undo.UndoManager;
 
@@ -15,6 +16,7 @@
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.InputMethodRequests;
 
+import org.jabref.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.undo.CountingUndoManager;
@@ -53,10 +55,11 @@ public class SourceTab extends EntryEditorTab {
     private final BibDatabaseMode mode;
     private final UndoManager undoManager;
     private final ObjectProperty<ValidationMessage> sourceIsValid = new SimpleObjectProperty<>();
-    private final ObservableRuleBasedValidator sourceValidator = new ObservableRuleBasedValidator(sourceIsValid);
+    @SuppressWarnings("unchecked") private final ObservableRuleBasedValidator sourceValidator = new ObservableRuleBasedValidator(sourceIsValid);
     private final ImportFormatPreferences importFormatPreferences;
     private final FileUpdateMonitor fileMonitor;
     private final DialogService dialogService;
+    private CodeArea codeArea;
 
     public SourceTab(BibDatabaseContext bibDatabaseContext, CountingUndoManager undoManager, LatexFieldFormatterPreferences fieldFormatterPreferences, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor, DialogService dialogService) {
         this.mode = bibDatabaseContext.getMode();
@@ -69,6 +72,17 @@ public SourceTab(BibDatabaseContext bibDatabaseContext, CountingUndoManager undo
         this.fileMonitor = fileMonitor;
         this.dialogService = dialogService;
 
+        Globals.stateManager.addSearchQueryHighlightListener(highlightPattern -> {
+            if (highlightPattern.isPresent() && codeArea != null) {
+                codeArea.setStyleClass(0, codeArea.getLength(), "text");
+                Matcher matcher = highlightPattern.get().matcher(codeArea.getText());
+                while (matcher.find()) {
+                    for (int i = 0; i <= matcher.groupCount(); i++) {
+                        codeArea.setStyleClass(matcher.start(), matcher.end(), "search");
+                    }
+                }
+            }
+        });
     }
 
     private static String getSourceString(BibEntry entry, BibDatabaseMode type, LatexFieldFormatterPreferences fieldFormatterPreferences) throws IOException {
@@ -115,6 +129,9 @@ private CodeArea createSourceEditor() {
                 codeArea.insertText(codeArea.getCaretPosition(), committed);
             }
         });
+        codeArea.setId("bibtexSourceCodeArea");
+        codeArea.getStylesheets().add(SourceTab.class.getResource("BibtexSourceCodeArea.css").toExternalForm());
+
         return codeArea;
     }
 
@@ -140,7 +157,7 @@ protected void bindToEntry(BibEntry entry) {
             }
         });
         this.setContent(codeArea);
-
+        this.codeArea = codeArea;
         // Store source for on focus out event in the source code (within its text area)
         // and update source code for every change of entry field values
         BindingsHelper.bindContentBidirectional(entry.getFieldsObservable(), codeArea.focusedProperty(), onFocus -> {
@@ -152,10 +169,12 @@ protected void bindToEntry(BibEntry entry) {
                 codeArea.clear();
                 try {
                     codeArea.appendText(getSourceString(entry, mode, fieldFormatterPreferences));
+                    Globals.stateManager.fireSearchQueryHighlightEvent();
+
                 } catch (IOException ex) {
                     codeArea.setEditable(false);
                     codeArea.appendText(ex.getMessage() + "\n\n" +
-                            Localization.lang("Correct the entry, and reopen editor to display/edit source."));
+                                        Localization.lang("Correct the entry, and reopen editor to display/edit source."));
                     LOGGER.debug("Incorrect entry", ex);
                 }
             });
@@ -208,8 +227,7 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
                 String fieldValue = field.getValue();
 
                 if (InternalBibtexFields.isDisplayableField(fieldName) && !newEntry.hasField(fieldName)) {
-                    compound.addEdit(
-                                     new UndoableFieldChange(outOfFocusEntry, fieldName, fieldValue, null));
+                    compound.addEdit(new UndoableFieldChange(outOfFocusEntry, fieldName, fieldValue, null));
                     outOfFocusEntry.clearField(fieldName);
                 }
             }
@@ -221,8 +239,7 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
                 String newValue = field.getValue();
                 if (!Objects.equals(oldValue, newValue)) {
                     // Test if the field is legally set.
-                    new LatexFieldFormatter(fieldFormatterPreferences)
-                            .format(newValue, fieldName);
+                    new LatexFieldFormatter(fieldFormatterPreferences).format(newValue, fieldName);
 
                     compound.addEdit(new UndoableFieldChange(outOfFocusEntry, fieldName, oldValue, newValue));
                     outOfFocusEntry.setField(fieldName, newValue);
@@ -243,4 +260,5 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
             LOGGER.debug("Incorrect source", ex);
         }
     }
+
 }

src/main/java/org/jabref/gui/maintable/MainTableDataModel.java

@@ -4,6 +4,7 @@
 import java.util.Optional;
 
 import javafx.beans.binding.Bindings;
+import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import javafx.collections.transformation.SortedList;
@@ -30,7 +31,11 @@ public MainTableDataModel(BibDatabaseContext context) {
         entriesFiltered.predicateProperty().bind(
                 Bindings.createObjectBinding(() -> this::isMatched,
                         Globals.stateManager.activeGroupProperty(), Globals.stateManager.activeSearchQueryProperty())
+
         );
+        entriesFiltered.addListener((ListChangeListener<BibEntryTableViewModel>) c -> {
+            Globals.stateManager.setSearchResultSize(entriesFiltered.size());
+        });
 
         // We need to wrap the list since otherwise sorting in the table does not work
         entriesSorted = new SortedList<>(entriesFiltered);

src/main/java/org/jabref/gui/preview/PreviewViewer.java

@@ -5,6 +5,8 @@
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
+import javafx.beans.value.ObservableValue;
+import javafx.concurrent.Worker;
 import javafx.print.PrinterJob;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.input.ClipboardContent;
@@ -34,12 +36,21 @@ public class PreviewViewer extends ScrollPane implements InvalidationListener {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PreviewViewer.class);
 
+    private static final String JS_HIGHLIGHT_FUNCTION = " <script type=\"text/javascript\">\r\n" +
+                                                        "        function highlight(text) {\r\n" +
+                                                        "            var innertxt = document.body.innerText;\r\n" +
+                                                        "            var response = innertxt.replace(new RegExp(text, 'gi'), str => `<span style='background-color:red'>${str}</span>`);\r\n" +
+                                                        "            document.body.innerHTML = response;\r\n" +
+                                                        "        }\r\n" +
+                                                        "    </script>";
+
     private final ClipBoardManager clipBoardManager;
     private final DialogService dialogService;
 
     private final TaskExecutor taskExecutor = Globals.TASK_EXECUTOR;
     private final WebView previewView;
     private PreviewLayout layout;
+
     /**
      * The entry currently shown
      */
@@ -59,6 +70,23 @@ public PreviewViewer(BibDatabaseContext database, DialogService dialogService) {
         previewView = new WebView();
         setContent(previewView);
         previewView.setContextMenuEnabled(false);
+
+        previewView.getEngine().getLoadWorker().stateProperty().addListener((ObservableValue<? extends Worker.State> observable,
+                                                                             Worker.State oldValue,
+                                                                             Worker.State newValue) -> {
+            if (newValue != Worker.State.SUCCEEDED) {
+                return;
+            }
+            Globals.stateManager.addSearchQueryHighlightListener(highlightPattern -> {
+                if (highlightPattern.isPresent()) {
+                    String pattern = highlightPattern.get().pattern().replace("\\Q", "").replace("\\E", "");
+
+                    previewView.getEngine().executeScript("highlight('" + pattern + "');");
+
+                }
+            });
+        });
+
     }
 
     public void setLayout(PreviewLayout newLayout) {
@@ -93,18 +121,21 @@ private void update() {
         ExporterFactory.entryNumber = 1; // Set entry number in case that is included in the preview layout.
 
         BackgroundTask
-                .wrap(() -> layout.generatePreview(entry.get(), database.getDatabase()))
-                .onRunning(() -> setPreviewText("<i>" + Localization.lang("Processing %0", Localization.lang("Citation Style")) + ": " + layout.getName() + " ..." + "</i>"))
-                .onSuccess(this::setPreviewText)
-                .onFailure(exception -> {
-                    LOGGER.error("Error while generating citation style", exception);
-                    setPreviewText(Localization.lang("Error while generating citation style"));
-                })
-                .executeWith(taskExecutor);
+                      .wrap(() -> layout.generatePreview(entry.get(), database.getDatabase()))
+                      .onRunning(() -> setPreviewText("<i>" + Localization.lang("Processing %0", Localization.lang("Citation Style")) + ": " + layout.getName() + " ..." + "</i>"))
+                      .onSuccess(this::setPreviewText)
+                      .onFailure(exception -> {
+                          LOGGER.error("Error while generating citation style", exception);
+                          setPreviewText(Localization.lang("Error while generating citation style"));
+                      })
+                      .executeWith(taskExecutor);
     }
 
     private void setPreviewText(String text) {
-        previewView.getEngine().loadContent(text);
+        String myText = JS_HIGHLIGHT_FUNCTION + "<div id=\"content\"" + text + "</div>";
+        previewView.getEngine().setJavaScriptEnabled(true);
+        previewView.getEngine().loadContent(myText);
+
         this.setHvalue(0);
     }
 
@@ -116,13 +147,13 @@ public void print() {
         }
 
         BackgroundTask
-                .wrap(() -> {
-                    job.getJobSettings().setJobName(entry.flatMap(BibEntry::getCiteKeyOptional).orElse("NO ENTRY"));
-                    previewView.getEngine().print(job);
-                    job.endJob();
-                })
-                .onFailure(exception -> dialogService.showErrorDialogAndWait(Localization.lang("Could not print preview"), exception))
-                .executeWith(taskExecutor);
+                      .wrap(() -> {
+                          job.getJobSettings().setJobName(entry.flatMap(BibEntry::getCiteKeyOptional).orElse("NO ENTRY"));
+                          previewView.getEngine().print(job);
+                          job.endJob();
+                      })
+                      .onFailure(exception -> dialogService.showErrorDialogAndWait(Localization.lang("Could not print preview"), exception))
+                      .executeWith(taskExecutor);
     }
 
     public void copyPreviewToClipBoard() {