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

Fix for issue 6959 #7151

Merged
merged 7 commits into from
Dec 4, 2020
Merged

Fix for issue 6959 #7151

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1290a40
Add needsSharedDatabase to validate if DatabaseLocation is shared
Dec 2, 2020
139115b
Update CHANGELOG.md with fix for pullingChangesFromSharedDb exception
Dec 3, 2020
b6f88e0
Refactor needsSharedDatabase to use EasyBind.map
Dec 3, 2020
394762e
Change Boolean Expression for validation to simplify
Dec 3, 2020
452ce01
Remove whitespace to meet checkstyle criteria
Dec 3, 2020
5dfa820
Refactor import order to meet checkstyle criteria
Dec 3, 2020
bde9d55
Add blankline after heading to meet checkstyle criteria
Dec 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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
## [Unreleased]

### Added

- We added a Boolean Expression to validate if the current database location is shared, preventing an exception when Pulling Changes From Shared Database. [#6959](https://github.com/JabRef/jabref/issues/6959)
tobiasdiez marked this conversation as resolved.
Show resolved Hide resolved
- We added a query parser and mapping layer to enable conversion of queries formulated in simplified lucene syntax by the user into api queries. [#6799](https://github.com/JabRef/jabref/pull/6799)
- We added some basic functionality to customise the look of JabRef by importing a css theme file. [#5790](https://github.com/JabRef/jabref/issues/5790)
- We added connection check function in network preference setting [#6560](https://github.com/JabRef/jabref/issues/6560)
Expand Down
8 changes: 8 additions & 0 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 @@ -12,6 +12,7 @@
import javafx.scene.control.TabPane;

import org.jabref.gui.StateManager;
import org.jabref.logic.shared.DatabaseLocation;
import org.jabref.model.entry.BibEntry;
import org.jabref.model.entry.LinkedFile;
import org.jabref.model.entry.field.Field;
Expand All @@ -26,6 +27,13 @@ public static BooleanExpression needsDatabase(StateManager stateManager) {
return stateManager.activeDatabaseProperty().isPresent();
}

public static BooleanExpression needsSharedDatabase(StateManager stateManager){
var binding = Bindings.createBooleanBinding(() ->
stateManager.activeDatabaseProperty().getValue().filter(context -> context.getLocation() == DatabaseLocation.SHARED).isPresent(),
tobiasdiez marked this conversation as resolved.
Show resolved Hide resolved
stateManager.activeDatabaseProperty());
return BooleanExpression.booleanExpression(binding);
}

public static BooleanExpression needsEntriesSelected(StateManager stateManager) {
return Bindings.isNotEmpty(stateManager.getSelectedEntries());
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/shared/PullChangesFromSharedAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class PullChangesFromSharedAction extends SimpleCommand {
public PullChangesFromSharedAction(StateManager stateManager) {
this.stateManager = stateManager;

this.executable.bind(ActionHelper.needsDatabase(stateManager));
this.executable.bind(ActionHelper.needsDatabase(stateManager).and(ActionHelper.needsSharedDatabase(stateManager)));
}

public void execute() {
Expand Down