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

Jump to bottom

Fix action helper #6122

Merged
merged 7 commits into from
May 3, 2020
Merged

Fix action helper #6122

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
383391d
fix: not every selected entry will have a file
stefan-kolb Mar 14, 2020
e6e27a9
fix: this will probably fix missing selection information on Linux
stefan-kolb Mar 14, 2020
1bd2770
Update src/main/java/org/jabref/gui/actions/ActionHelper.java
stefan-kolb Mar 14, 2020
058c725
Update ActionHelper.java
stefan-kolb Mar 14, 2020
9f3cf81
Merge branch 'master' into fix-action-helper
koppor Mar 29, 2020
a2aa16f
Fix binding
tobiasdiez May 3, 2020
e032d9d
Add changelog entry
tobiasdiez May 3, 2020
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
16 changes: 11 additions & 5 deletions src/main/java/org/jabref/gui/actions/ActionHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@

import javafx.beans.binding.Bindings;
import javafx.beans.binding.BooleanExpression;
import javafx.collections.ObservableList;

import org.jabref.gui.StateManager;
import org.jabref.model.entry.BibEntry;
import org.jabref.model.entry.field.Field;

import org.fxmisc.easybind.EasyBind;
import org.fxmisc.easybind.monadic.MonadicBinding;

public class ActionHelper {
public static BooleanExpression needsDatabase(StateManager stateManager) {
return stateManager.activeDatabaseProperty().isPresent();
Expand All @@ -30,10 +34,12 @@ public static BooleanExpression isFieldSetForSelectedEntry(Field field, StateMan
}

public static BooleanExpression isAnyFieldSetForSelectedEntry(List<Field> fields, StateManager stateManager) {
BibEntry entry = stateManager.getSelectedEntries().get(0);
return Bindings.createBooleanBinding(
() -> entry.getFields().stream().anyMatch(fields::contains),
entry.getFieldsObservable(),
stateManager.getSelectedEntries());
ObservableList<BibEntry> selectedEntries = stateManager.getSelectedEntries();
MonadicBinding<Boolean> fieldsAreSet = EasyBind.monadic(Bindings.valueAt(selectedEntries, 0))
.flatMap(entry -> Bindings.createBooleanBinding(() -> {
return entry.getFields().stream().anyMatch(fields::contains);
}, entry.getFieldsObservable()))
.orElse(false);
return BooleanExpression.booleanExpression(fieldsAreSet);
}
}
29 changes: 17 additions & 12 deletions src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,22 @@ public OpenFolderAction(DialogService dialogService, StateManager stateManager,
@Override
public void execute() {
stateManager.getActiveDatabase().ifPresent(databaseContext ->
stateManager.getSelectedEntries().forEach(entry -> {
LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(
entry.getFiles().get(0),
entry,
databaseContext,
Globals.TASK_EXECUTOR,
dialogService,
preferencesService.getXMPPreferences(),
preferencesService.getFilePreferences(),
ExternalFileTypes.getInstance());
linkedFileViewModel.openFolder();
}));
stateManager.getSelectedEntries().forEach(entry -> {
if (entry.getFiles().isEmpty()) {
return;
}

LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(
entry.getFiles().get(0),
entry,
databaseContext,
Globals.TASK_EXECUTOR,
dialogService,
preferencesService.getXMPPreferences(),
preferencesService.getFilePreferences(),
ExternalFileTypes.getInstance()
);
linkedFileViewModel.openFolder();
}));
}
}