Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve search history by attaching change listener #9794

Merged
merged 20 commits into from
May 4, 2023
Merged

Improve search history by attaching change listener #9794

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
715988e
Improve search history attaching change listener #9685
dkokkotas Apr 24, 2023
44008dd
Merge branch 'main' of https://github.com/JabRef/jabref into fix-for-…
dkokkotas Apr 25, 2023
7a51bd7
Resolve not proper change listener attachment #9685
dkokkotas Apr 28, 2023
2e94417
Improve javadoc comments
dkokkotas Apr 29, 2023
62256e6
Replace isEmpty() method with isBlank() method in GlobalSearchBar class
dkokkotas Apr 29, 2023
bace6f2
Add issue resolution description in CHANGELOG.md file
dkokkotas Apr 29, 2023
2cabb8d
Resolve merge conflicts
dkokkotas Apr 29, 2023
7dc410a
Fix order of entries in CHANGELOG.md
dkokkotas Apr 29, 2023
8e3f5cf
Improve changelog description
dkokkotas Apr 29, 2023
fa6867f
Add GUI tests regarding search history improvement
dkokkotas May 2, 2023
6b97ecd
Update Javadoc and exception handling
dkokkotas May 2, 2023
f11d2c9
Resolve issues regarding assertions and improve javadoc
dkokkotas May 2, 2023
5ca78d1
Resolve failed GUI test
dkokkotas May 3, 2023
2cd605b
Replace List by ObservableList
dkokkotas May 3, 2023
664b015
Update test methods in GlobalSearchBarTest class
dkokkotas May 3, 2023
39786e4
Use "List.of()"
koppor May 4, 2023
ecde3be
Remove obsolete assertion statement
koppor May 4, 2023
0a7695c
Fix checkstyle
koppor May 4, 2023
ae18770
Merge remote-tracking branch 'upstream/main' into fix-for-9685
koppor May 4, 2023
4613549
Fix checkstyle (again)
koppor May 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/main/java/org/jabref/gui/StateManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.jabref.gui.util.CustomLocalDragboard;
import org.jabref.gui.util.DialogWindowState;
import org.jabref.gui.util.OptionalObjectProperty;
import org.jabref.gui.search.GlobalSearchBar;
import org.jabref.logic.search.SearchQuery;
import org.jabref.model.database.BibDatabaseContext;
import org.jabref.model.entry.BibEntry;
Expand Down Expand Up @@ -216,8 +217,10 @@ public List<String> collectAllDatabasePaths() {
}

public void addSearchHistory(String search) {
searchHistory.remove(search);
searchHistory.add(search);
if (!GlobalSearchBar.searchBoxFocused.get()) {
dkokkotas marked this conversation as resolved.
Show resolved Hide resolved
searchHistory.remove(search);
searchHistory.add(search);
}
}

public ObservableList<String> getWholeSearchHistory() {
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/org/jabref/gui/search/GlobalSearchBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ public class GlobalSearchBar extends HBox {
private final DialogService dialogService;

private final BooleanProperty globalSearchActive = new SimpleBooleanProperty(false);
public static final BooleanProperty searchBoxFocused = new SimpleBooleanProperty(false);
dkokkotas marked this conversation as resolved.
Show resolved Hide resolved
private GlobalSearchResultDialog globalSearchResultDialog;

public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, PreferencesService preferencesService, CountingUndoManager undoManager, DialogService dialogService) {
Expand Down Expand Up @@ -307,7 +308,12 @@ public void performSearch() {
informUserAboutInvalidSearchQuery();
return;
}
this.stateManager.addSearchHistory(searchField.textProperty().get());
searchBoxFocused.bind(searchField.focusedProperty());
koppor marked this conversation as resolved.
Show resolved Hide resolved
searchBoxFocused.addListener((observable, oldPropertyValue, newPropertyValue) -> {
if (!(newPropertyValue || searchField.textProperty().get().isEmpty())) {
this.stateManager.addSearchHistory(searchField.textProperty().get());
}
});
stateManager.setSearchQuery(searchQuery);
}

Expand Down