convert search worker to javafx #4897

Siedlerchr · 2019-04-18T18:46:16Z

One of the few things which was still using swing.

Search Counter is implemented again
Search Highlighting is also implemented

Change in CHANGELOG.md described
Tests created for changes
Manually tested changed features in running JabRef
Screenshots added in PR description (for bigger UI changes)
Ensured that the git commit message is a good one
Check documentation status (Issue created for outdated help page at help.jabref.org?)

tobiasdiez

The search is also done here:

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

Lines 29 to 33 in 3ed02ee

    
           entriesFiltered = new FilteredList<>(entriesViewModel); 
        
           entriesFiltered.predicateProperty().bind( 
        
                   Bindings.createObjectBinding(() -> this::isMatched, 
        
                           Globals.stateManager.activeGroupProperty(), Globals.stateManager.activeSearchQueryProperty()) 
        
           );

which makes the SearchWorker kind of obsolete

* upstream/master: Fix Some Codacy Code Convention Issues (#4904) Bump ridl from 6.2.2 to 6.2.3 (#4903) Bump juh from 6.2.2 to 6.2.3 (#4902) Bump jurt from 6.2.2 to 6.2.3 (#4901) Bump unoil from 6.2.2 to 6.2.3 (#4900) Bump richtextfx from 0.9.3 to 0.10.0 (#4899) Store column widths as integer (#4896) Improve full text search for several files (#4855)

Siedlerchr · 2019-04-20T08:37:48Z

OKay, thanks for the hint. now removed the search worker completely.

tobiasdiez · 2019-04-23T21:49:46Z

src/main/java/org/jabref/gui/search/SearchWorker.java

-        }
-    }
-
-    private void updateUIWithSearchResult(List<BibEntry> matchedEntries) {


What about this functionality? I think both the search result message as well as the highlighting are nice-to-have features.

Hm, yes I will look if I can integrate this somehow

* upstream/master: Fix for the issue #4912 (#4916) Refactorings, move functionality of CustomEntryTypesManager to Preferences Use ObservableList instead of LIstProperty Toggle enable status of menu items (#4872) Fixes throwing an exception when 'id' field is present in bib file (#4918) Quick fix for error when opening preferences (#4917) Revert "Create new layout for preferences regarding columns" Create new layout for preferences regarding columns Rearrange the padding of the "Append library" dialog (#4914) Make Group dialog resizable (#4910) Adjust save exception to inlcude orgininal stack traces remove dialogService parameter remove dialog service argument rework dialog, create fxml etc fix l10n Remove obsolete code rework threading stuff simplify code Rework PosteOpenActions to javafx (custom entry type import) Rework PosteOpenActions to javafx (custom entry type import)

Siedlerchr · 2019-04-24T20:05:22Z

I actually found a way to add the search result message and the highlighter, but I am not if this behaviour in the entry editor is really correct, and this creates sometimes really odd issues #4472

However, in the entry editor itself there seems no highlighting be done?

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

Lines 403 to 407 in 251c44d

    
           void addSearchListener(SearchQueryHighlightListener listener) { 
        
               // TODO: Highlight search text in entry editors 
        
               searchListeners.add(listener); 
        
               panel.frame().getGlobalSearchBar().getSearchQueryHighlightObservable().addSearchListener(listener); 
        
           }

And I noticed that when the entry editor is open, and I search a term which is not present, the entry stays open at the last selected entry:

* upstream/master: Throw BibEntryNotFound exception in case entry is no longer present (#4935) Improve author parsing (#4931) Ui preferences global modifications (#4926) Bump checkstyle from 8.19 to 8.20 (#4928) Bump mysql-connector-java from 8.0.15 to 8.0.16 (#4924) UI Preferences->advanced tab optimization : separators and text modification (#4922) # Conflicts: # src/main/java/org/jabref/gui/search/SearchWorker.java

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

Siedlerchr · 2019-05-01T18:46:10Z

Got it wo work

Siedlerchr · 2019-05-01T19:03:08Z

~~TODO: The highlighting needs to be recalculated on tab switch~~

~~TODO: Highlighting for WebView~~

~~Maybe moving the register of the search listener fo the bind to entry?~~

* upstream/master: fixes remaining issues in #4844 (#4950) Fix threading issue with opening from recent libraries (#4943) New translations JabRef_en.properties (German) (#4946) New Crowdin translations (#4945) New Crowdin translations (#4944) Extract build plugins (#4934)

* upstream/master: Remove UI ThreadList for maintable as it prevents sorting in maintable (#4964) fix map collision (#4962) Added a link to the current open issues with tags 'good first issue' to the beginning of CONTRIBUTING.md to help new contributors find a way to get started. (#4960) Fixed the tab order in the database login dialog (#4955)

fix listeners

tobiasdiez

Generally looks fine to me.

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

tobiasdiez · 2019-05-17T09:46:16Z

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);
+


remove empty line

tobiasdiez · 2019-05-17T09:49:36Z

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

@@ -69,6 +72,17 @@ public SourceTab(BibDatabaseContext bibDatabaseContext, CountingUndoManager undo
        this.fileMonitor = fileMonitor;
        this.dialogService = dialogService;

+        Globals.stateManager.addSearchQueryHighlightListener(highlightPattern -> {


Please pass stateManager as external dependency.

tobiasdiez · 2019-05-17T09:50:46Z

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

@@ -0,0 +1,7 @@
+#bibtexSourceCodeArea .search {


Is it possible to move this code to the entry editor css?

tobiasdiez · 2019-05-17T09:52:47Z

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

        );
+        entriesFiltered.addListener((ListChangeListener<BibEntryTableViewModel>) c -> {


Use bindings: Bindings.size(entriesFiltered) ?

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

tobiasdiez · 2019-05-17T09:57:00Z

src/main/java/org/jabref/gui/search/GlobalSearchBar.java

-        // TODO: Remove search worker as this is doing the work twice now
-        searchWorker = new SearchWorker(currentBasePanel, searchQuery, searchDisplayMode);
-        searchWorker.execute();
+        updateResults(Globals.stateManager.searchResultSizeProperty().get(),


Is this really working as desired? I would have expected that the resultSize is not yet updated correctly (for large databases).

Good thing. I'm trying to bind it to the results property but turns out to be a bit more complicated as the illegal search query msg is also listed in the label

* upstream/master: Fix downloading pdf produces html as extension (#4965) Too big error message #4827 (#4966) Reformat Understanding the basics section of CONTRIBUTING.md (#4978) Revised README.md (#4974) Switch Jsoup's StringUtil for JabRef's StringUtil (#4970)

move css for highlighting binding for searchResultSize

Use SearchQuery directly TODO: fix updating of search results

* upstream/master: Resize different fonts changing entry type (#4980) Extended Hints - Alternative to #4971 (#4975) Fix command line help text (#4979) # Conflicts: # src/main/java/org/jabref/gui/search/GlobalSearchBar.java

* upstream/master: Fix background color of dialogs in dark mode (#4994) NPE-fix for Preferences/Ext-Prog/Settings for X/Browse (#4983) Bump richtextfx from 0.10.0 to 0.10.1 (#4989) Bump tika-core from 1.20 to 1.21 (#4984)

* upstream/master: Fix icon size - the second (#4993) # Conflicts: # src/main/java/org/jabref/gui/entryeditor/EntryEditor.java

Siedlerchr · 2019-05-25T12:19:48Z

@tobiasdiez I am currently having trouble with the updating of the search result count. I tried around with different ways but I always end up with the problem that the count is either 1 or 0 , although the number of found/matched entries in the Main table is obviously higher.
I have no freaking idea why. Maybe you have an idea

davidemdot · 2019-05-26T03:53:18Z

@Siedlerchr:

I am currently having trouble with the updating of the search result count. I tried around with different ways but I always end up with the problem that the count is either 1 or 0 , although the number of found/matched entries in the Main table is obviously higher.

I am looking this branch and trying to replicate your error, but the search result counter is OK for me. Maybe I did not understand the point properly, so could you explain in detail what is going bad?

Here you can find three screenshots, from JabRef running in "convertSearchWorker" branch:

And here you can see the output from my terminal (I did more than three searches):

Siedlerchr · 2019-05-26T08:53:55Z

Glad that it works for you. I was running it from Eclipse. Will double check my Java version again

Siedlerchr · 2019-05-26T09:47:52Z

@davidemdot Okay, I found out that it only works with one open library. If you have at least two libraries open and switch the tabs than you encounter this behaviour.

@tobiasdiez seems like I somehow have to include the databasecontext in the search result binding. Any idea how to achieve this?

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

* upstream/master: Update mac icon and install4j to 7.0.11 (#5005) Bump checkstyle from 8.20 to 8.21 (#5001) fix IEE fetcher (#4999) Fix the 'Attach file' dialog for starting on the user's main directory (#4996) Readme TOC (#4986)

Siedlerchr · 2019-06-06T08:08:12Z

As the search is now working fine with multiple databases open I am going to merge this.

convert search worker to javafx

b2971ed

Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Apr 18, 2019

tobiasdiez reviewed Apr 18, 2019

View reviewed changes

Siedlerchr added 2 commits April 20, 2019 10:15

remove obsolete search worker

2bb96e2

tobiasdiez reviewed Apr 23, 2019

View reviewed changes

tobiasdiez changed the title ~~convert search worker to javafx~~ [WIP] convert search worker to javafx Apr 24, 2019

tobiasdiez removed the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Apr 24, 2019

Siedlerchr added 2 commits April 24, 2019 21:16

Add search query update result count

b374c0e

Siedlerchr changed the title ~~[WIP] convert search worker to javafx~~ convert search worker to javafx Apr 27, 2019

Siedlerchr added 2 commits May 1, 2019 14:33

First attempt at creating search highlighter for source tab

907670e

Siedlerchr commented May 1, 2019

View reviewed changes

src/main/java/org/jabref/gui/entryeditor/SourceTab.java Outdated Show resolved Hide resolved

Siedlerchr added 2 commits May 1, 2019 20:56

Add custom css for codeArea highlighting on Search

45020d2

fix exception loop

7b01b92

Siedlerchr changed the title ~~convert search worker to javafx~~ [WIP] convert search worker to javafx May 1, 2019

Siedlerchr mentioned this pull request May 2, 2019

Getting Rid of Swing #4894

Merged

Siedlerchr added 8 commits May 2, 2019 16:34

inline search listener

a4465c2

refactor searchQueryHighlightobservable

79e77c5

fix checkstyle

11ac5ab

fireSearchQueryHighlitghter on focus change

2614523

Add sample js for highlighting

75b089c

add search query highlither to handle the highlighting

2b20ecd

add new regex js

6255111

Siedlerchr added 3 commits May 6, 2019 10:38

fix checkstyle

2db6403

fix search highlighting in source editor

cd6d181

fix listeners

Siedlerchr changed the title ~~[WIP] convert search worker to javafx~~ #convert search worker to javafx May 12, 2019

Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label May 12, 2019

tobiasdiez requested changes May 17, 2019

View reviewed changes

Siedlerchr added 8 commits May 18, 2019 17:53

refactor state manager as parameter

1210a2a

move css for highlighting binding for searchResultSize

Get rid of SearchQueryHighlightObservable

d0c5f2e

Use SearchQuery directly TODO: fix updating of search results

update on search

6db6073

Merge remote-tracking branch 'upstream/master' into convertSearchWorker

ef6b159

* upstream/master: Fix icon size - the second (#4993) # Conflicts: # src/main/java/org/jabref/gui/entryeditor/EntryEditor.java

fix checkstyle

da17d06

try again with checkstyle declaration order

63678c2

tobiasdiez reviewed May 26, 2019

View reviewed changes

src/main/java/org/jabref/gui/StateManager.java Outdated Show resolved Hide resolved

Siedlerchr added 2 commits May 27, 2019 20:17

Finally fix the number of search results on multiple libs

6a220bd

Siedlerchr changed the title ~~#convert search worker to javafx~~ convert search worker to javafx May 27, 2019

fix checkstyle

752e433

This was referenced May 29, 2019

Bibentrysource contextmenu #5007

Merged

Cleared search is redone after switching library #4846

Closed

Siedlerchr merged commit dd4f0a0 into master Jun 6, 2019

Siedlerchr deleted the convertSearchWorker branch June 6, 2019 08:08

Siedlerchr mentioned this pull request Jun 11, 2019

search produces error when removing entry #5044

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

convert search worker to javafx #4897

convert search worker to javafx #4897

Siedlerchr commented Apr 18, 2019 •

edited

Loading

tobiasdiez left a comment

Siedlerchr commented Apr 20, 2019

tobiasdiez Apr 23, 2019

Siedlerchr Apr 24, 2019

Siedlerchr commented Apr 24, 2019

Siedlerchr commented May 1, 2019

Siedlerchr commented May 1, 2019 •

edited

Loading

tobiasdiez left a comment

tobiasdiez May 17, 2019

tobiasdiez May 17, 2019

tobiasdiez May 17, 2019

tobiasdiez May 17, 2019

tobiasdiez May 17, 2019

Siedlerchr May 19, 2019

Siedlerchr commented May 25, 2019

davidemdot commented May 26, 2019 •

edited

Loading

Siedlerchr commented May 26, 2019

Siedlerchr commented May 26, 2019

Siedlerchr commented Jun 6, 2019

	entriesFiltered = new FilteredList<>(entriesViewModel);
	entriesFiltered.predicateProperty().bind(
	Bindings.createObjectBinding(() -> this::isMatched,
	Globals.stateManager.activeGroupProperty(), Globals.stateManager.activeSearchQueryProperty())
	);

		);
		entriesFiltered.addListener((ListChangeListener<BibEntryTableViewModel>) c -> {

convert search worker to javafx #4897

convert search worker to javafx #4897

Conversation

Siedlerchr commented Apr 18, 2019 • edited Loading

tobiasdiez left a comment

Choose a reason for hiding this comment

Siedlerchr commented Apr 20, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Siedlerchr commented Apr 24, 2019

Siedlerchr commented May 1, 2019

Siedlerchr commented May 1, 2019 • edited Loading

tobiasdiez left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Siedlerchr commented May 25, 2019

davidemdot commented May 26, 2019 • edited Loading

Siedlerchr commented May 26, 2019

Siedlerchr commented May 26, 2019

Siedlerchr commented Jun 6, 2019

Siedlerchr commented Apr 18, 2019 •

edited

Loading

Siedlerchr commented May 1, 2019 •

edited

Loading

davidemdot commented May 26, 2019 •

edited

Loading