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 problems with sort order of exports #4363

Merged
merged 2 commits into from
Oct 9, 2018
Merged

Fix problems with sort order of exports #4363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f46d5bd
group RadioButtons in ExportSortingPrefsTab to prevent the selection …
125m125 Oct 9, 2018
e5feccf
fix IndexOutOfBoundsException when saving preferences
125m125 Oct 9, 2018
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
13 changes: 7 additions & 6 deletions src/main/java/org/jabref/gui/SaveOrderConfigDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.jabref.model.entry.BibEntry;
import org.jabref.model.entry.InternalBibtexFields;
import org.jabref.model.metadata.SaveOrderConfig;
import org.jabref.model.metadata.SaveOrderConfig.SortCriterion;

public class SaveOrderConfigDisplay {

Expand Down Expand Up @@ -85,12 +86,12 @@ public void setEnabled(boolean enabled) {

public SaveOrderConfig getSaveOrderConfig() {
SaveOrderConfig saveOrderConfig = new SaveOrderConfig();
saveOrderConfig.getSortCriteria().get(0).field = getSelectedItemAsLowerCaseTrim(savePriSort);
saveOrderConfig.getSortCriteria().get(0).descending = savePriDesc.isSelected();
saveOrderConfig.getSortCriteria().get(1).field = getSelectedItemAsLowerCaseTrim(saveSecSort);
saveOrderConfig.getSortCriteria().get(1).descending = saveSecDesc.isSelected();
saveOrderConfig.getSortCriteria().get(2).field = getSelectedItemAsLowerCaseTrim(saveTerSort);
saveOrderConfig.getSortCriteria().get(2).descending = saveTerDesc.isSelected();
SortCriterion primary = new SortCriterion(getSelectedItemAsLowerCaseTrim(savePriSort), savePriDesc.isSelected());
saveOrderConfig.getSortCriteria().add(primary);
SortCriterion secondary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveSecSort), saveSecDesc.isSelected());
saveOrderConfig.getSortCriteria().add(secondary);
SortCriterion tertiary = new SortCriterion(getSelectedItemAsLowerCaseTrim(saveTerSort), saveTerDesc.isSelected());
saveOrderConfig.getSortCriteria().add(tertiary);

return saveOrderConfig;
}
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import javafx.scene.control.Label;
import javafx.scene.control.RadioButton;
import javafx.scene.control.Separator;
import javafx.scene.control.ToggleGroup;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Pane;
import javafx.scene.shape.Line;
Expand Down Expand Up @@ -35,6 +36,11 @@ public ExportSortingPrefsTab(JabRefPreferences prefs) {
exportInTableOrder = new RadioButton(Localization.lang("Export in current table sort order"));
exportInSpecifiedOrder = new RadioButton(Localization.lang("Export entries ordered as specified"));

final ToggleGroup group = new ToggleGroup();
exportInOriginalOrder.setToggleGroup(group);
exportInTableOrder.setToggleGroup(group);
exportInSpecifiedOrder.setToggleGroup(group);

exportOrderPanel = new SaveOrderConfigDisplay();

EventHandler<ActionEvent> listener = (event) -> {
Expand Down