Skip to content

Commit

Permalink
Cleanup now uses active preferences (#1261)
Browse files Browse the repository at this point in the history 
* Pass JabRefPreferences to panes via constructor

* Cleanup process now uses current preferences
  • Loading branch information
@tobiasdiez @simonharrer
tobiasdiez authored and simonharrer committed Apr 21, 2016
1 parent 34494bb commit 1fde2f0
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 25 deletions.
9 changes: 4 additions & 5 deletions src/main/java/net/sf/jabref/gui/actions/CleanupAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,12 @@ public class CleanupAction extends AbstractWorker {
private boolean canceled;
private int modifiedEntriesCount;
private final JabRefPreferences preferences;
private final CleanupPresetPanel presetPanel;


public CleanupAction(BasePanel panel, JabRefPreferences preferences) {
this.panel = panel;
this.frame = panel.frame();
this.preferences = Objects.requireNonNull(preferences);
this.presetPanel = new CleanupPresetPanel(panel.getBibDatabaseContext(),
CleanupPreset.loadFromPreferences(preferences));
}

@Override
Expand All @@ -80,7 +77,9 @@ public void run() {
if (canceled) {
return;
}
int choice = showDialog();
CleanupPresetPanel presetPanel = new CleanupPresetPanel(panel.getBibDatabaseContext(),
CleanupPreset.loadFromPreferences(preferences));
int choice = showDialog(presetPanel);
if (choice != JOptionPane.OK_OPTION) {
canceled = true;
return;
Expand Down Expand Up @@ -148,7 +147,7 @@ public void update() {
frame.unblock();
}

private int showDialog() {
private int showDialog(CleanupPresetPanel presetPanel) {
String dialogTitle = Localization.lang("Cleanup entries");

Object[] messages = {Localization.lang("What would you like to clean up?"), presetPanel.getPanel()};
Expand Down
19 changes: 11 additions & 8 deletions src/main/java/net/sf/jabref/gui/preftabs/ImportSettingsTab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package net.sf.jabref.gui.preftabs;

import java.awt.BorderLayout;
import java.util.Objects;

import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
Expand All @@ -28,7 +29,6 @@
import javax.swing.JRadioButton;
import javax.swing.JTextField;

import net.sf.jabref.Globals;
import net.sf.jabref.JabRefPreferences;
import net.sf.jabref.logic.l10n.Localization;
import net.sf.jabref.pdfimport.ImportDialog;
Expand All @@ -49,6 +49,7 @@ public class ImportSettingsTab extends JPanel implements PrefsTab {
"\\bibtexkey\\begin{title} - \\format[RemoveBrackets]{\\title}\\end{title}"
};

private final JabRefPreferences prefs;
private final JRadioButton radioButtonXmp;
private final JRadioButton radioButtonPDFcontent;
private final JRadioButton radioButtonNoMeta;
Expand All @@ -59,7 +60,9 @@ public class ImportSettingsTab extends JPanel implements PrefsTab {
private final JButton selectFileNamePattern;


public ImportSettingsTab() {
public ImportSettingsTab(JabRefPreferences prefs) {
this.prefs = Objects.requireNonNull(prefs);

setLayout(new BorderLayout());
FormLayout layout = new FormLayout("1dlu, 8dlu, left:pref, 4dlu, fill:3dlu");
radioButtonNoMeta = new JRadioButton(Localization.lang("Create_blank_entry_linking_the_PDF"));
Expand Down Expand Up @@ -116,8 +119,8 @@ public ImportSettingsTab() {

@Override
public void setValues() {
useDefaultPDFImportStyle.setSelected(Globals.prefs.getBoolean(JabRefPreferences.PREF_IMPORT_ALWAYSUSE));
int style = Globals.prefs.getInt(JabRefPreferences.PREF_IMPORT_DEFAULT_PDF_IMPORT_STYLE);
useDefaultPDFImportStyle.setSelected(prefs.getBoolean(JabRefPreferences.PREF_IMPORT_ALWAYSUSE));
int style = prefs.getInt(JabRefPreferences.PREF_IMPORT_DEFAULT_PDF_IMPORT_STYLE);
switch (style) {
case ImportDialog.NOMETA:
radioButtonNoMeta.setSelected(true);
Expand All @@ -136,12 +139,12 @@ public void setValues() {
radioButtonPDFcontent.setSelected(true);
break;
}
fileNamePattern.setText(Globals.prefs.get(JabRefPreferences.PREF_IMPORT_FILENAMEPATTERN));
fileNamePattern.setText(prefs.get(JabRefPreferences.PREF_IMPORT_FILENAMEPATTERN));
}

@Override
public void storeSettings() {
Globals.prefs.putBoolean(JabRefPreferences.PREF_IMPORT_ALWAYSUSE, useDefaultPDFImportStyle.isSelected());
prefs.putBoolean(JabRefPreferences.PREF_IMPORT_ALWAYSUSE, useDefaultPDFImportStyle.isSelected());
int style = ImportSettingsTab.DEFAULT_STYLE;
if (radioButtonNoMeta.isSelected()) {
style = ImportDialog.NOMETA;
Expand All @@ -152,8 +155,8 @@ public void storeSettings() {
} else if (radioButtononlyAttachPDF.isSelected()) {
style = ImportDialog.ONLYATTACH;
}
Globals.prefs.putInt(JabRefPreferences.PREF_IMPORT_DEFAULT_PDF_IMPORT_STYLE, style);
Globals.prefs.put(JabRefPreferences.PREF_IMPORT_FILENAMEPATTERN, fileNamePattern.getText());
prefs.putInt(JabRefPreferences.PREF_IMPORT_DEFAULT_PDF_IMPORT_STYLE, style);
prefs.put(JabRefPreferences.PREF_IMPORT_FILENAMEPATTERN, fileNamePattern.getText());
}

@Override
Expand Down
15 changes: 9 additions & 6 deletions src/main/java/net/sf/jabref/gui/preftabs/NameFormatterTab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.awt.event.ActionEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

import javax.swing.AbstractAction;
import javax.swing.Action;
Expand All @@ -34,7 +35,7 @@
import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;

import net.sf.jabref.Globals;
import net.sf.jabref.JabRefPreferences;
import net.sf.jabref.gui.IconTheme;
import net.sf.jabref.gui.OSXCompatibleToolbar;
import net.sf.jabref.gui.help.HelpAction;
Expand All @@ -47,6 +48,7 @@

public class NameFormatterTab extends JPanel implements PrefsTab {

private final JabRefPreferences prefs;
private boolean tableChanged;

private final JTable table;
Expand Down Expand Up @@ -98,7 +100,8 @@ public void setFormat(String format) {
* Tab to create custom Name Formatters
*
*/
public NameFormatterTab() {
public NameFormatterTab(JabRefPreferences prefs) {
this.prefs = Objects.requireNonNull(prefs);
setLayout(new BorderLayout());

TableModel tableModel = new AbstractTableModel() {
Expand Down Expand Up @@ -208,8 +211,8 @@ public void setValueAt(Object value, int row, int col) {
@Override
public void setValues() {
tableRows.clear();
List<String> names = Globals.prefs.getStringList(NameFormatter.NAME_FORMATER_KEY);
List<String> formats = Globals.prefs.getStringList(NameFormatter.NAME_FORMATTER_VALUE);
List<String> names = prefs.getStringList(NameFormatter.NAME_FORMATER_KEY);
List<String> formats = prefs.getStringList(NameFormatter.NAME_FORMATTER_VALUE);

for (int i = 0; i < names.size(); i++) {
if (i < formats.size()) {
Expand Down Expand Up @@ -325,8 +328,8 @@ public void storeSettings() {
}

// Finally, we store the new preferences.
Globals.prefs.putStringList(NameFormatter.NAME_FORMATER_KEY, names);
Globals.prefs.putStringList(NameFormatter.NAME_FORMATTER_VALUE, formats);
prefs.putStringList(NameFormatter.NAME_FORMATER_KEY, names);
prefs.putStringList(NameFormatter.NAME_FORMATTER_VALUE, formats);
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/sf/jabref/gui/preftabs/PreferencesDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ public PreferencesDialog(JabRefFrame parent) {
tabs.add(new TableColumnsTab(prefs, parent));
tabs.add(new LabelPatternPrefTab(prefs, parent.getCurrentBasePanel()));
tabs.add(new PreviewPrefsTab(prefs));
tabs.add(new NameFormatterTab());
tabs.add(new ImportSettingsTab());
tabs.add(new XmpPrefsTab());
tabs.add(new NameFormatterTab(prefs));
tabs.add(new ImportSettingsTab(prefs));
tabs.add(new XmpPrefsTab(prefs));
tabs.add(new AdvancedTab(prefs));

// add all tabs
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/net/sf/jabref/gui/preftabs/XmpPrefsTab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.awt.event.ActionEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

import javax.swing.AbstractAction;
Expand All @@ -36,7 +37,6 @@
import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;

import net.sf.jabref.Globals;
import net.sf.jabref.JabRefPreferences;
import net.sf.jabref.gui.IconTheme;
import net.sf.jabref.gui.OSXCompatibleToolbar;
Expand All @@ -52,6 +52,7 @@
*/
class XmpPrefsTab extends JPanel implements PrefsTab {

private final JabRefPreferences prefs;
private boolean tableChanged;

private int rowCount;
Expand All @@ -67,7 +68,8 @@ class XmpPrefsTab extends JPanel implements PrefsTab {
/**
* Customization of external program paths.
*/
public XmpPrefsTab() {
public XmpPrefsTab(JabRefPreferences prefs) {
this.prefs = Objects.requireNonNull(prefs);
setLayout(new BorderLayout());

TableModel tableModel = new AbstractTableModel() {
Expand Down Expand Up @@ -258,7 +260,7 @@ public void storeSettings() {
// table setup table. This needs to be done either if changes were made, or
// if the checkbox is checked and no field values have been stored previously:
if (tableChanged ||
(privacyFilterCheckBox.isSelected() && !Globals.prefs.hasKey(JabRefPreferences.XMP_PRIVACY_FILTERS))) {
(privacyFilterCheckBox.isSelected() && !prefs.hasKey(JabRefPreferences.XMP_PRIVACY_FILTERS))) {

// First we remove all rows with empty names.
for (int i = tableRows.size() - 1; i >= 0; i--) {
Expand Down

0 comments on commit 1fde2f0

Please sign in to comment.