diff --git a/src/main/java/net/sf/jabref/collab/ChangeScanner.java b/src/main/java/net/sf/jabref/collab/ChangeScanner.java index 21e8f9cf79a..5a67e3d9e39 100644 --- a/src/main/java/net/sf/jabref/collab/ChangeScanner.java +++ b/src/main/java/net/sf/jabref/collab/ChangeScanner.java @@ -82,7 +82,7 @@ public ChangeScanner(JabRefFrame frame, BasePanel bp, File file) { //, BibDataba this.panel = bp; this.frame = frame; this.inMem = bp.database(); - this.mdInMem = bp.loadedDatabase.getMetaData(); + this.mdInMem = bp.getLoadedDatabase().getMetaData(); this.f = file; } diff --git a/src/main/java/net/sf/jabref/collab/GroupChange.java b/src/main/java/net/sf/jabref/collab/GroupChange.java index e84390458ee..9a9ac97e9f4 100644 --- a/src/main/java/net/sf/jabref/collab/GroupChange.java +++ b/src/main/java/net/sf/jabref/collab/GroupChange.java @@ -41,9 +41,9 @@ public GroupChange(GroupTreeNode changedGroups, GroupTreeNode tmpGroupRoot) { @Override public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound undoEdit) { - final GroupTreeNode root = panel.loadedDatabase.getMetaData().getGroups(); + final GroupTreeNode root = panel.getLoadedDatabase().getMetaData().getGroups(); final UndoableModifySubtree undo = new UndoableModifySubtree( - panel.getGroupSelector(), panel.loadedDatabase.getMetaData().getGroups(), + panel.getGroupSelector(), panel.getLoadedDatabase().getMetaData().getGroups(), root, Localization.lang("Modified groups")); root.removeAllChildren(); if (changedGroups == null) { diff --git a/src/main/java/net/sf/jabref/exporter/AutoSaveManager.java b/src/main/java/net/sf/jabref/exporter/AutoSaveManager.java index 84927b11246..7f9376f0a97 100644 --- a/src/main/java/net/sf/jabref/exporter/AutoSaveManager.java +++ b/src/main/java/net/sf/jabref/exporter/AutoSaveManager.java @@ -98,7 +98,7 @@ private static boolean autoSave(BasePanel panel) { File databaseFile = panel.getLoadedDatabase().getDatabaseFile(); File backupFile = AutoSaveManager.getAutoSaveFile(databaseFile); try { - SaveSession ss = FileActions.saveDatabase(new LoadedDatabase(panel.database(), panel.loadedDatabase.getMetaData()), + SaveSession ss = FileActions.saveDatabase(new LoadedDatabase(panel.database(), panel.getLoadedDatabase().getMetaData()), backupFile, Globals.prefs, false, false, panel.getEncoding(), true); ss.commit(); } catch (SaveException e) { diff --git a/src/main/java/net/sf/jabref/exporter/ExportFormats.java b/src/main/java/net/sf/jabref/exporter/ExportFormats.java index 74b666186ef..bf84768ce36 100644 --- a/src/main/java/net/sf/jabref/exporter/ExportFormats.java +++ b/src/main/java/net/sf/jabref/exporter/ExportFormats.java @@ -207,10 +207,10 @@ public void actionPerformed(ActionEvent e) { // Set the global variable for this database's file directory before exporting, // so formatters can resolve linked files correctly. // (This is an ugly hack!) - Globals.prefs.fileDirForDatabase = frame.getCurrentBasePanel().loadedDatabase.getMetaData() + Globals.prefs.fileDirForDatabase = frame.getCurrentBasePanel().getLoadedDatabase().getMetaData() .getFileDirectory(Globals.FILE_FIELD).toArray(new String[0]); // Also store the database's file in a global variable: - Globals.prefs.databaseFile = frame.getCurrentBasePanel().loadedDatabase.getDatabaseFile(); + Globals.prefs.databaseFile = frame.getCurrentBasePanel().getLoadedDatabase().getDatabaseFile(); // Make sure we remember which filter was used, to set // the default for next time: @@ -228,7 +228,7 @@ public void actionPerformed(ActionEvent e) { public void run() { try { format.performExport(frame.getCurrentBasePanel().database(), - frame.getCurrentBasePanel().loadedDatabase.getMetaData(), + frame.getCurrentBasePanel().getLoadedDatabase().getMetaData(), finFile.getPath(), frame .getCurrentBasePanel().getEncoding(), finEntryIDs); } catch (Exception ex) { diff --git a/src/main/java/net/sf/jabref/exporter/ExportToClipboardAction.java b/src/main/java/net/sf/jabref/exporter/ExportToClipboardAction.java index 8ffda74f25a..15eb7730831 100644 --- a/src/main/java/net/sf/jabref/exporter/ExportToClipboardAction.java +++ b/src/main/java/net/sf/jabref/exporter/ExportToClipboardAction.java @@ -96,10 +96,10 @@ public void run() { // Set the global variable for this database's file directory before exporting, // so formatters can resolve linked files correctly. // (This is an ugly hack!) - Globals.prefs.fileDirForDatabase = frame.getCurrentBasePanel().loadedDatabase.getMetaData() + Globals.prefs.fileDirForDatabase = frame.getCurrentBasePanel().getLoadedDatabase().getMetaData() .getFileDirectory(Globals.FILE_FIELD).toArray(new String[0]); // Also store the database's file in a global variable: - Globals.prefs.databaseFile = frame.getCurrentBasePanel().loadedDatabase.getDatabaseFile(); + Globals.prefs.databaseFile = frame.getCurrentBasePanel().getLoadedDatabase().getDatabaseFile(); File tmp = null; Reader reader = null; @@ -115,7 +115,7 @@ public void run() { } // Write to file: - format.performExport(database, panel.loadedDatabase.getMetaData(), + format.performExport(database, panel.getLoadedDatabase().getMetaData(), tmp.getPath(), panel.getEncoding(), entries); // Read the file and put the contents on the clipboard: StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/net/sf/jabref/exporter/SaveDatabaseAction.java b/src/main/java/net/sf/jabref/exporter/SaveDatabaseAction.java index 2d03307f16e..a9b4c3f6fcc 100644 --- a/src/main/java/net/sf/jabref/exporter/SaveDatabaseAction.java +++ b/src/main/java/net/sf/jabref/exporter/SaveDatabaseAction.java @@ -128,7 +128,7 @@ public void run() { } else { // User indicated to store anyway. // See if the database has the protected flag set: - List pd = panel.loadedDatabase.getMetaData().getData(Globals.PROTECTED_FLAG_META); + List pd = panel.getLoadedDatabase().getMetaData().getData(Globals.PROTECTED_FLAG_META); boolean databaseProtectionFlag = (pd != null) && Boolean.parseBoolean(pd.get(0)); if (databaseProtectionFlag) { JOptionPane.showMessageDialog(frame, Localization.lang("Database is protected. Cannot save until external changes have been reviewed."), @@ -226,11 +226,11 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset encoding) frame.block(); try { if (selectedOnly) { - session = FileActions.savePartOfDatabase(new LoadedDatabase(panel.database(), panel.loadedDatabase.getMetaData()), + session = FileActions.savePartOfDatabase(new LoadedDatabase(panel.database(), panel.getLoadedDatabase().getMetaData()), file, Globals.prefs, panel.getSelectedEntries(), encoding, FileActions.DatabaseSaveType.DEFAULT); } else { - session = FileActions.saveDatabase(new LoadedDatabase(panel.database(), panel.loadedDatabase.getMetaData()), + session = FileActions.saveDatabase(new LoadedDatabase(panel.database(), panel.getLoadedDatabase().getMetaData()), file, Globals.prefs, false, false, encoding, false); } @@ -376,13 +376,13 @@ public void saveAs() throws Throwable { } if (chosenFile != null) { - File oldFile = panel.loadedDatabase.getDatabaseFile(); - panel.loadedDatabase.getMetaData().setFile(f); + File oldFile = panel.getLoadedDatabase().getDatabaseFile(); + panel.getLoadedDatabase().getMetaData().setFile(f); Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, f.getParent()); runCommand(); // If the operation failed, revert the file field and return: if (!success) { - panel.loadedDatabase.getMetaData().setFile(oldFile); + panel.getLoadedDatabase().getMetaData().setFile(oldFile); return; } // Register so we get notifications about outside changes to the file. @@ -391,7 +391,7 @@ public void saveAs() throws Throwable { } catch (IOException ex) { LOGGER.error("Problem registering file change notifications", ex); } - frame.getFileHistory().newFile(panel.loadedDatabase.getDatabaseFile().getPath()); + frame.getFileHistory().newFile(panel.getLoadedDatabase().getDatabaseFile().getPath()); } } diff --git a/src/main/java/net/sf/jabref/external/AttachFileAction.java b/src/main/java/net/sf/jabref/external/AttachFileAction.java index 5695ad30c6c..c29f26745e9 100644 --- a/src/main/java/net/sf/jabref/external/AttachFileAction.java +++ b/src/main/java/net/sf/jabref/external/AttachFileAction.java @@ -30,7 +30,7 @@ public void action() { BibEntry entry = panel.getSelectedEntries()[0]; FileListEntry flEntry = new FileListEntry("", "", null); FileListEntryEditor editor = new FileListEntryEditor(panel.frame(), flEntry, false, true, - panel.loadedDatabase.getMetaData()); + panel.getLoadedDatabase().getMetaData()); editor.setVisible(true, true); if (editor.okPressed()) { FileListTableModel model = new FileListTableModel(); diff --git a/src/main/java/net/sf/jabref/external/DroppedFileHandler.java b/src/main/java/net/sf/jabref/external/DroppedFileHandler.java index af5c9972da9..fd6622f740c 100644 --- a/src/main/java/net/sf/jabref/external/DroppedFileHandler.java +++ b/src/main/java/net/sf/jabref/external/DroppedFileHandler.java @@ -150,7 +150,7 @@ public void handleDroppedfile(String fileName, ExternalFileType fileType, boolea String destFilename; if (linkInPlace.isSelected()) { - destFilename = FileUtil.shortenFileName(new File(fileName), panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD)).toString(); + destFilename = FileUtil.shortenFileName(new File(fileName), panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD)).toString(); } else { destFilename = renameCheckBox.isSelected() ? renameToTextBox.getText() : new File(fileName).getName(); if (copyRadioButton.isSelected()) { @@ -195,7 +195,7 @@ public void linkPdfToEntry(String fileName, MainTable entryTable, BibEntry entry String destFilename; if (linkInPlace.isSelected()) { - destFilename = FileUtil.shortenFileName(new File(fileName), panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD)).toString(); + destFilename = FileUtil.shortenFileName(new File(fileName), panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD)).toString(); } else { destFilename = renameCheckBox.isSelected() ? renameToTextBox.getText() : new File(fileName).getName(); if (copyRadioButton.isSelected()) { @@ -225,7 +225,7 @@ public void importXmp(List xmpEntriesInFile, String fileName) { String destFilename; if (linkInPlace.isSelected()) { - destFilename = FileUtil.shortenFileName(new File(fileName), panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD)).toString(); + destFilename = FileUtil.shortenFileName(new File(fileName), panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD)).toString(); } else { if (renameCheckBox.isSelected()) { destFilename = fileName; @@ -312,7 +312,7 @@ private boolean tryXmpImport(String fileName, ExternalFileType fileType, boolean String destFilename; if (linkInPlace.isSelected()) { - destFilename = FileUtil.shortenFileName(new File(fileName), panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD)).toString(); + destFilename = FileUtil.shortenFileName(new File(fileName), panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD)).toString(); } else { if (renameCheckBox.isSelected()) { destFilename = fileName; @@ -349,7 +349,7 @@ private boolean showLinkMoveCopyRenameDialog(String linkFileName, ExternalFileTy BibEntry entry, boolean newEntry, final boolean multipleEntries, BibDatabase database) { String dialogTitle = Localization.lang("Link to file %0", linkFileName); - List dirs = panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + List dirs = panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); int found = -1; for (int i = 0; i < dirs.size(); i++) { if (new File(dirs.get(i)).exists()) { @@ -451,7 +451,7 @@ private void doLink(BibEntry entry, ExternalFileType fileType, String filename, // If avoidDuplicate==true, we should check if this file is already linked: if (avoidDuplicate) { // For comparison, find the absolute filename: - List dirs = panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + List dirs = panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); String absFilename = !new File(filename).isAbsolute() && (dirs.size() > 0) ? FileUtil.expandFilename(filename, dirs).getAbsolutePath() : filename; @@ -492,7 +492,7 @@ private void doLink(BibEntry entry, ExternalFileType fileType, String filename, */ private boolean doMove(String fileName, ExternalFileType fileType, String destFilename, NamedCompound edits) { - List dirs = panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + List dirs = panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); int found = -1; for (int i = 0; i < dirs.size(); i++) { if (new File(dirs.get(i)).exists()) { @@ -543,7 +543,7 @@ private boolean doMove(String fileName, ExternalFileType fileType, String destFi private boolean doCopy(String fileName, ExternalFileType fileType, String toFile, NamedCompound edits) { - List dirs = panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + List dirs = panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); int found = -1; for (int i = 0; i < dirs.size(); i++) { if (new File(dirs.get(i)).exists()) { diff --git a/src/main/java/net/sf/jabref/external/ExternalFileMenuItem.java b/src/main/java/net/sf/jabref/external/ExternalFileMenuItem.java index 8d2f53e742b..761a962ee05 100644 --- a/src/main/java/net/sf/jabref/external/ExternalFileMenuItem.java +++ b/src/main/java/net/sf/jabref/external/ExternalFileMenuItem.java @@ -76,7 +76,7 @@ public boolean openLink() { ExternalFileType type = fileType; if (this.fileType == null) { if (this.fieldName != null) { - JabRefDesktop.openExternalViewer(frame.getCurrentBasePanel().loadedDatabase.getMetaData(), link, fieldName); + JabRefDesktop.openExternalViewer(frame.getCurrentBasePanel().getLoadedDatabase().getMetaData(), link, fieldName); return true; } else { diff --git a/src/main/java/net/sf/jabref/external/FindFullTextAction.java b/src/main/java/net/sf/jabref/external/FindFullTextAction.java index 9cac11f104d..7a576128922 100644 --- a/src/main/java/net/sf/jabref/external/FindFullTextAction.java +++ b/src/main/java/net/sf/jabref/external/FindFullTextAction.java @@ -60,7 +60,7 @@ public void run() { @Override public void update() { if (result.isPresent()) { - List dirs = basePanel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + List dirs = basePanel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); if (dirs.size() == 0) { // FIXME: Localization JOptionPane.showMessageDialog(basePanel.frame(), "Main file directory not set! Preferences -> External programs", "Directory not found", JOptionPane.ERROR_MESSAGE); @@ -68,7 +68,7 @@ public void update() { } String bibtexKey = entry.getCiteKey(); // TODO: this needs its own thread as it blocks the UI! - DownloadExternalFile def = new DownloadExternalFile(basePanel.frame(), basePanel.loadedDatabase.getMetaData(), bibtexKey); + DownloadExternalFile def = new DownloadExternalFile(basePanel.frame(), basePanel.getLoadedDatabase().getMetaData(), bibtexKey); try { def.download(result.get(), new DownloadExternalFile.DownloadCallback() { @Override diff --git a/src/main/java/net/sf/jabref/external/MoveFileAction.java b/src/main/java/net/sf/jabref/external/MoveFileAction.java index f527d559d7c..eff23268c43 100644 --- a/src/main/java/net/sf/jabref/external/MoveFileAction.java +++ b/src/main/java/net/sf/jabref/external/MoveFileAction.java @@ -70,7 +70,7 @@ public void actionPerformed(ActionEvent event) { } // Get an absolute path representation: - List dirs = frame.getCurrentBasePanel().loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + List dirs = frame.getCurrentBasePanel().getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); int found = -1; for (int i = 0; i < dirs.size(); i++) { if (new File(dirs.get(i)).exists()) { diff --git a/src/main/java/net/sf/jabref/external/SynchronizeFileField.java b/src/main/java/net/sf/jabref/external/SynchronizeFileField.java index 7beda27d25d..aa5f78a4d6f 100644 --- a/src/main/java/net/sf/jabref/external/SynchronizeFileField.java +++ b/src/main/java/net/sf/jabref/external/SynchronizeFileField.java @@ -74,7 +74,7 @@ public void init() { // Ask about rules for the operation: if (optDiag == null) { - optDiag = new SynchronizeFileField.OptionsDialog(panel.frame(), panel.loadedDatabase.getMetaData()); + optDiag = new SynchronizeFileField.OptionsDialog(panel.frame(), panel.getLoadedDatabase().getMetaData()); } PositionWindow.placeDialog(optDiag, panel.frame()); optDiag.setVisible(true); @@ -111,7 +111,7 @@ public void run() { Collections.addAll(entries, sel); // Start the autosetting process: - Runnable r = Util.autoSetLinks(entries, ce, changedEntries, null, panel.loadedDatabase.getMetaData(), null, null); + Runnable r = Util.autoSetLinks(entries, ce, changedEntries, null, panel.getLoadedDatabase().getMetaData(), null, null); JabRefExecutorService.INSTANCE.executeAndWait(r); } progress += sel.length * weightAutoSet; @@ -128,7 +128,7 @@ public void run() { tableModel.setContentDontGuessTypes(old); // We need to specify which directories to search in for Util.expandFilename: - List dirsS = panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + List dirsS = panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); ArrayList dirs = new ArrayList<>(); for (String dirs1 : dirsS) { dirs.add(new File(dirs1)); @@ -166,7 +166,7 @@ public void run() { case 1: // Assign new file. FileListEntryEditor flEditor = new FileListEntryEditor - (panel.frame(), flEntry, false, true, panel.loadedDatabase.getMetaData()); + (panel.frame(), flEntry, false, true, panel.getLoadedDatabase().getMetaData()); flEditor.setVisible(true, true); break; case 2: @@ -222,7 +222,7 @@ public void run() { // User wants to change the type of this link. // First get a model of all file links for this entry: FileListEntryEditor editor = new FileListEntryEditor - (panel.frame(), flEntry, false, true, panel.loadedDatabase.getMetaData()); + (panel.frame(), flEntry, false, true, panel.getLoadedDatabase().getMetaData()); editor.setVisible(true, false); } } diff --git a/src/main/java/net/sf/jabref/external/TransferableFileLinkSelection.java b/src/main/java/net/sf/jabref/external/TransferableFileLinkSelection.java index 8afc7290824..1f56c323ca5 100644 --- a/src/main/java/net/sf/jabref/external/TransferableFileLinkSelection.java +++ b/src/main/java/net/sf/jabref/external/TransferableFileLinkSelection.java @@ -42,7 +42,7 @@ public TransferableFileLinkSelection(BasePanel panel, BibEntry[] selection) { selection[0].getFieldOptional(Globals.FILE_FIELD).ifPresent(file -> tm.setContent(file)); if (tm.getRowCount() > 0) { // Find the default directory for this field type, if any: - List dirs = panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + List dirs = panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); File expLink = FileUtil.expandFilename(tm.getEntry(0).link, dirs); fileList.add(expLink); diff --git a/src/main/java/net/sf/jabref/external/WriteXMPAction.java b/src/main/java/net/sf/jabref/external/WriteXMPAction.java index 1d5e8d4810c..5aca50dc85e 100644 --- a/src/main/java/net/sf/jabref/external/WriteXMPAction.java +++ b/src/main/java/net/sf/jabref/external/WriteXMPAction.java @@ -123,14 +123,14 @@ public void run() { // First check the (legacy) "pdf" field: String pdf = entry.getField("pdf"); - List dirs = panel.loadedDatabase.getMetaData().getFileDirectory("pdf"); + List dirs = panel.getLoadedDatabase().getMetaData().getFileDirectory("pdf"); File f = FileUtil.expandFilename(pdf, dirs); if (f != null) { files.add(f); } // Then check the "file" field: - dirs = panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + dirs = panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); if (entry.hasField(Globals.FILE_FIELD)) { FileListTableModel tm = new FileListTableModel(); tm.setContent(entry.getField(Globals.FILE_FIELD)); diff --git a/src/main/java/net/sf/jabref/external/WriteXMPEntryEditorAction.java b/src/main/java/net/sf/jabref/external/WriteXMPEntryEditorAction.java index cb9aab2765d..1ec27c3dae2 100644 --- a/src/main/java/net/sf/jabref/external/WriteXMPEntryEditorAction.java +++ b/src/main/java/net/sf/jabref/external/WriteXMPEntryEditorAction.java @@ -65,14 +65,14 @@ public void actionPerformed(ActionEvent actionEvent) { // First check the (legacy) "pdf" field: String pdf = entry.getField("pdf"); - List dirs = panel.loadedDatabase.getMetaData().getFileDirectory("pdf"); + List dirs = panel.getLoadedDatabase().getMetaData().getFileDirectory("pdf"); File f = FileUtil.expandFilename(pdf, dirs); if (f != null) { files.add(f); } // Then check the "file" field: - dirs = panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + dirs = panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); if (entry.hasField(Globals.FILE_FIELD)) { FileListTableModel tm = new FileListTableModel(); tm.setContent(entry.getField(Globals.FILE_FIELD)); diff --git a/src/main/java/net/sf/jabref/external/push/PushToApplicationAction.java b/src/main/java/net/sf/jabref/external/push/PushToApplicationAction.java index a65331cc2cd..2a1341d6061 100644 --- a/src/main/java/net/sf/jabref/external/push/PushToApplicationAction.java +++ b/src/main/java/net/sf/jabref/external/push/PushToApplicationAction.java @@ -79,7 +79,7 @@ public void actionPerformed(ActionEvent e) { @Override public void run() { // Do the operation: - operation.pushEntries(panel.database(), entries, getKeyString(entries), panel.loadedDatabase.getMetaData()); + operation.pushEntries(panel.database(), entries, getKeyString(entries), panel.getLoadedDatabase().getMetaData()); // Call the operationCompleted() method on the event dispatch thread: SwingUtilities.invokeLater(new Runnable() { diff --git a/src/main/java/net/sf/jabref/groups/GroupDialog.java b/src/main/java/net/sf/jabref/groups/GroupDialog.java index 34aa7e86dc4..ebc90c80725 100644 --- a/src/main/java/net/sf/jabref/groups/GroupDialog.java +++ b/src/main/java/net/sf/jabref/groups/GroupDialog.java @@ -149,7 +149,7 @@ public GroupDialog(JabRefFrame jabrefFrame, BasePanel basePanel, builderKG.append(Localization.lang("Keyword")); builderKG.append(m_kgSearchTerm); builderKG.append(new FieldContentSelector(jabrefFrame, m_basePanel, this, - m_kgSearchTerm, m_basePanel.loadedDatabase.getMetaData(), null, true, ", ")); + m_kgSearchTerm, m_basePanel.getLoadedDatabase().getMetaData(), null, true, ", ")); builderKG.nextLine(); builderKG.append(m_kgCaseSensitive, 3); builderKG.nextLine(); diff --git a/src/main/java/net/sf/jabref/groups/GroupSelector.java b/src/main/java/net/sf/jabref/groups/GroupSelector.java index a2d2182526c..072ee32d126 100644 --- a/src/main/java/net/sf/jabref/groups/GroupSelector.java +++ b/src/main/java/net/sf/jabref/groups/GroupSelector.java @@ -1418,7 +1418,7 @@ public void setActiveBasePanel(BasePanel panel) { frame.sidePaneManager.hide("groups"); return; } - MetaData metaData = panel.loadedDatabase.getMetaData(); + MetaData metaData = panel.getLoadedDatabase().getMetaData(); if (metaData.getGroups() == null) { GroupTreeNode newGroupsRoot = new GroupTreeNode(new AllEntriesGroup()); metaData.setGroups(newGroupsRoot); diff --git a/src/main/java/net/sf/jabref/gui/BasePanel.java b/src/main/java/net/sf/jabref/gui/BasePanel.java index 6b0b66e1083..eb399078fc8 100644 --- a/src/main/java/net/sf/jabref/gui/BasePanel.java +++ b/src/main/java/net/sf/jabref/gui/BasePanel.java @@ -107,7 +107,7 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe public static final int WILL_SHOW_EDITOR = 3; private final BibDatabase database; - public final LoadedDatabase loadedDatabase; + private final LoadedDatabase loadedDatabase; private int mode; private EntryEditor currentEditor; @@ -2538,8 +2538,8 @@ public Optional searchAndOpen() { final ExternalFileType[] types = ExternalFileTypes.getInstance().getExternalFileTypeSelection(); final List dirs = new ArrayList<>(); - if (basePanel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD).size() > 0) { - final List mdDirs = basePanel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + if (basePanel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD).size() > 0) { + final List mdDirs = basePanel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); for (final String mdDir : mdDirs) { dirs.add(new File(mdDir)); @@ -2567,7 +2567,7 @@ public Optional searchAndOpen() { .getExternalFileTypeByExt(extension.get()); if (type != null) { try { - JabRefDesktop.openExternalFileAnyFormat(basePanel.loadedDatabase.getMetaData(), filepath, type); + JabRefDesktop.openExternalFileAnyFormat(basePanel.getLoadedDatabase().getMetaData(), filepath, type); basePanel.output(Localization.lang("External viewer called") + '.'); return Optional.of(filepath); } catch (IOException ex) { diff --git a/src/main/java/net/sf/jabref/gui/BibtexKeyPatternDialog.java b/src/main/java/net/sf/jabref/gui/BibtexKeyPatternDialog.java index 5b18810f2c4..82a6c37c1df 100644 --- a/src/main/java/net/sf/jabref/gui/BibtexKeyPatternDialog.java +++ b/src/main/java/net/sf/jabref/gui/BibtexKeyPatternDialog.java @@ -58,7 +58,7 @@ public BibtexKeyPatternDialog(JabRefFrame parent, BasePanel panel) { */ public void setPanel(BasePanel panel) { this.panel = panel; - this.metaData = panel.loadedDatabase.getMetaData(); + this.metaData = panel.getLoadedDatabase().getMetaData(); AbstractLabelPattern keypatterns = metaData.getLabelPattern(); labelPatternPanel.setValues(keypatterns); } diff --git a/src/main/java/net/sf/jabref/gui/ContentSelectorDialog2.java b/src/main/java/net/sf/jabref/gui/ContentSelectorDialog2.java index 19d12306ed4..6786b06992f 100644 --- a/src/main/java/net/sf/jabref/gui/ContentSelectorDialog2.java +++ b/src/main/java/net/sf/jabref/gui/ContentSelectorDialog2.java @@ -379,7 +379,7 @@ private void applyChanges() { } else { panel.updateAllContentSelectors(); } - panel.getAutoCompleters().addContentSelectorValuesToAutoCompleters(panel.loadedDatabase.getMetaData()); + panel.getAutoCompleters().addContentSelectorValuesToAutoCompleters(panel.getLoadedDatabase().getMetaData()); } diff --git a/src/main/java/net/sf/jabref/gui/DatabasePropertiesDialog.java b/src/main/java/net/sf/jabref/gui/DatabasePropertiesDialog.java index 6db70ac1876..46f56456da0 100644 --- a/src/main/java/net/sf/jabref/gui/DatabasePropertiesDialog.java +++ b/src/main/java/net/sf/jabref/gui/DatabasePropertiesDialog.java @@ -105,7 +105,7 @@ public DatabasePropertiesDialog(JFrame parent) { public void setPanel(BasePanel panel) { this.panel = panel; - this.metaData = panel.loadedDatabase.getMetaData(); + this.metaData = panel.getLoadedDatabase().getMetaData(); } private void init(JFrame parent) { diff --git a/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java b/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java index 76c39daa9a0..2a01aeb6f50 100644 --- a/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java +++ b/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java @@ -975,7 +975,7 @@ public void mousePressed(MouseEvent e) { if ((userObject instanceof FileNodeWrapper) && node.isLeaf()) { FileNodeWrapper fnw = (FileNodeWrapper) userObject; try { - JabRefDesktop.openExternalViewer(JabRef.jrf.getCurrentBasePanel().loadedDatabase.getMetaData(), fnw.file.getAbsolutePath(), "pdf"); + JabRefDesktop.openExternalViewer(JabRef.jrf.getCurrentBasePanel().getLoadedDatabase().getMetaData(), fnw.file.getAbsolutePath(), "pdf"); } catch (IOException e1) { LOGGER.info("Error opening file", e1); } diff --git a/src/main/java/net/sf/jabref/gui/GroupAddRemoveDialog.java b/src/main/java/net/sf/jabref/gui/GroupAddRemoveDialog.java index b0d15710762..fc65f38c7b0 100644 --- a/src/main/java/net/sf/jabref/gui/GroupAddRemoveDialog.java +++ b/src/main/java/net/sf/jabref/gui/GroupAddRemoveDialog.java @@ -46,7 +46,7 @@ public GroupAddRemoveDialog(BasePanel panel, boolean add, boolean move) { @Override public void action() throws Throwable { - GroupTreeNode groups = panel.loadedDatabase.getMetaData().getGroups(); + GroupTreeNode groups = panel.getLoadedDatabase().getMetaData().getGroups(); if (groups == null) { return; } diff --git a/src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java b/src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java index e695a928399..bed9c893bd9 100644 --- a/src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java +++ b/src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java @@ -233,7 +233,7 @@ public ImportInspectionDialog(JabRefFrame frame, BasePanel panel, String[] field String undoName, boolean newDatabase) { this.frame = frame; this.panel = panel; - this.metaData = (panel == null) ? new MetaData() : panel.loadedDatabase.getMetaData(); + this.metaData = (panel == null) ? new MetaData() : panel.getLoadedDatabase().getMetaData(); this.fields = Arrays.copyOf(fields, fields.length); this.undoName = undoName; this.newDatabase = newDatabase; @@ -511,7 +511,7 @@ private void generateKeySelectedEntry() { localMetaData = new MetaData(); } else { database = panel.database(); - localMetaData = panel.loadedDatabase.getMetaData(); + localMetaData = panel.getLoadedDatabase().getMetaData(); } entry.setId(IdGenerator.next()); @@ -546,7 +546,7 @@ private void generateKeys() { localMetaData = new MetaData(); } else { database = panel.database(); - localMetaData = panel.loadedDatabase.getMetaData(); + localMetaData = panel.getLoadedDatabase().getMetaData(); } List keys = new ArrayList<>(entries.size()); @@ -955,7 +955,7 @@ public void mouseClicked(MouseEvent e) { return; } FileListEntry fl = tableModel.getEntry(0); - (new ExternalFileMenuItem(frame, entry, "", fl.link, null, panel.loadedDatabase.getMetaData(), fl.type)) + (new ExternalFileMenuItem(frame, entry, "", fl.link, null, panel.getLoadedDatabase().getMetaData(), fl.type)) .actionPerformed(null); } } else { // Must be URL_COL @@ -1014,7 +1014,7 @@ private void showFileFieldMenu(MouseEvent e) { description = flEntry.link; } menu.add(new ExternalFileMenuItem(panel.frame(), entry, description, flEntry - .link, flEntry.type.getIcon(), panel.loadedDatabase.getMetaData(), flEntry.type)); + .link, flEntry.type.getIcon(), panel.getLoadedDatabase().getMetaData(), flEntry.type)); count++; } if (count == 0) { @@ -1036,7 +1036,7 @@ private void openExternalLink(String fieldName, MouseEvent e) { entry.getFieldOptional(fieldName).ifPresent(link -> { try { - JabRefDesktop.openExternalViewer(panel.loadedDatabase.getMetaData(), link, fieldName); + JabRefDesktop.openExternalViewer(panel.getLoadedDatabase().getMetaData(), link, fieldName); } catch (IOException ex) { LOGGER.warn("Could not open link", ex); } diff --git a/src/main/java/net/sf/jabref/gui/JabRefFrame.java b/src/main/java/net/sf/jabref/gui/JabRefFrame.java index 5be4074672f..2cac0b23c8e 100644 --- a/src/main/java/net/sf/jabref/gui/JabRefFrame.java +++ b/src/main/java/net/sf/jabref/gui/JabRefFrame.java @@ -124,7 +124,8 @@ public class JabRefFrame extends JFrame implements OutputPrinter { @Override public void actionPerformed(ActionEvent e) { IntegrityCheck check = new IntegrityCheck(); - List messages = check.checkBibtexDatabase(getCurrentBasePanel().database(), getCurrentBasePanel().loadedDatabase.isBiblatexMode()); + List messages = check.checkBibtexDatabase(getCurrentBasePanel().database(), + getCurrentBasePanel().getLoadedDatabase().isBiblatexMode()); if (messages.isEmpty()) { JOptionPane.showMessageDialog(getCurrentBasePanel(), Localization.lang("No problems found.")); @@ -517,7 +518,7 @@ public void actionPerformed(ActionEvent e) { private List getNewEntryActions() { List actions = new ArrayList<>(); - if (this.getCurrentBasePanel() != null && this.getCurrentBasePanel().loadedDatabase.isBiblatexMode()) { + if (this.getCurrentBasePanel() != null && this.getCurrentBasePanel().getLoadedDatabase().isBiblatexMode()) { for (EntryType entryType : BibLatexEntryTypes.ALL) { actions.add(new NewEntryAction(this, entryType.getName())); } diff --git a/src/main/java/net/sf/jabref/gui/RightClickMenu.java b/src/main/java/net/sf/jabref/gui/RightClickMenu.java index d7131ab0cda..e395a1a70cc 100644 --- a/src/main/java/net/sf/jabref/gui/RightClickMenu.java +++ b/src/main/java/net/sf/jabref/gui/RightClickMenu.java @@ -229,7 +229,7 @@ public static void populateSpecialFieldMenu(JMenu menu, SpecialField field, JabR @Override public void popupMenuWillBecomeVisible(PopupMenuEvent e) { panel.storeCurrentEdit(); - GroupTreeNode groups = panel.loadedDatabase.getMetaData().getGroups(); + GroupTreeNode groups = panel.getLoadedDatabase().getMetaData().getGroups(); if (groups == null) { groupAdd.setEnabled(false); groupRemove.setEnabled(false); diff --git a/src/main/java/net/sf/jabref/gui/actions/AutoLinkFilesAction.java b/src/main/java/net/sf/jabref/gui/actions/AutoLinkFilesAction.java index 59a0812b294..025dcd360b6 100644 --- a/src/main/java/net/sf/jabref/gui/actions/AutoLinkFilesAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/AutoLinkFilesAction.java @@ -42,7 +42,8 @@ public void actionPerformed(ActionEvent event) { } JDialog diag = new JDialog(JabRef.jrf, true); final NamedCompound nc = new NamedCompound(Localization.lang("Automatically set file links")); - Runnable runnable = Util.autoSetLinks(entries, nc, null, null, JabRef.jrf.getCurrentBasePanel().loadedDatabase.getMetaData(), new ActionListener() { + Runnable runnable = Util.autoSetLinks(entries, nc, null, null, + JabRef.jrf.getCurrentBasePanel().getLoadedDatabase().getMetaData(), new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/src/main/java/net/sf/jabref/gui/actions/CleanUpAction.java b/src/main/java/net/sf/jabref/gui/actions/CleanUpAction.java index bb810d09571..83ed9faed12 100644 --- a/src/main/java/net/sf/jabref/gui/actions/CleanUpAction.java +++ b/src/main/java/net/sf/jabref/gui/actions/CleanUpAction.java @@ -392,11 +392,11 @@ private static void fixWrongFileEntries(BibEntry entry, NamedCompound ce) { } private void doMakePathsRelative(BibEntry entry, NamedCompound ce) { - doCleanup(new RelativePathsCleanup(panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD)), entry, ce); + doCleanup(new RelativePathsCleanup(panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD)), entry, ce); } private void doRenamePDFs(BibEntry entry, NamedCompound ce) { - List paths = panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + List paths = panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); BibDatabase database = panel.database(); Boolean onlyRelativePaths = cleanUpRenamePDFonlyRelativePaths.isSelected(); RenamePdfCleanup cleaner = new RenamePdfCleanup(paths, onlyRelativePaths, database); diff --git a/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditor.java index d93b5a92622..48ca405c6cf 100644 --- a/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditor.java +++ b/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditor.java @@ -197,7 +197,7 @@ private void setupFieldPanels() { tabbed.removeAll(); tabs.clear(); - EntryType type = EntryTypes.getType(entry.getType(), this.frame.getCurrentBasePanel().loadedDatabase.getType()); + EntryType type = EntryTypes.getType(entry.getType(), this.frame.getCurrentBasePanel().getLoadedDatabase().getType()); List fieldList = type.getRequiredFieldsFlat(); @@ -211,7 +211,7 @@ private void setupFieldPanels() { if ((type.getOptionalFields() != null) && (type.getOptionalFields().size() >= 1)) { EntryEditorTab optPan; - if (!this.frame.getCurrentBasePanel().loadedDatabase.isBiblatexMode()) { + if (!this.frame.getCurrentBasePanel().getLoadedDatabase().isBiblatexMode()) { optPan = new EntryEditorTab(frame, panel, type.getOptionalFields(), this, false, false, Localization.lang("Optional fields")); if (optPan.fileListEditor != null) { @@ -429,7 +429,7 @@ public Optional getExtra(final FieldEditor editor) { // If this field also has a FieldContentSelector, we need to combine these. return FieldExtraComponents.getJournalExtraComponent(frame, panel, editor, entry, contentSelectors, storeFieldAction); - } else if (panel.loadedDatabase.getMetaData().getData(Globals.SELECTOR_META_PREFIX + fieldName) != null) { + } else if (panel.getLoadedDatabase().getMetaData().getData(Globals.SELECTOR_META_PREFIX + fieldName) != null) { return FieldExtraComponents.getSelectorExtraComponent(frame, panel, editor, contentSelectors, storeFieldAction); } else if (BibtexFields.EXTRA_BROWSE.equals(fieldExtras)) { @@ -445,7 +445,7 @@ public Optional getExtra(final FieldEditor editor) { } else if (BibtexFields.EXTRA_YES_NO.equals(fieldExtras)) { return FieldExtraComponents.getYesNoExtraComponent(editor, this); } else if (BibtexFields.EXTRA_MONTH.equals(fieldExtras)) { - return FieldExtraComponents.getMonthExtraComponent(editor, this, this.frame.getCurrentBasePanel().loadedDatabase.getType()); + return FieldExtraComponents.getMonthExtraComponent(editor, this, this.frame.getCurrentBasePanel().getLoadedDatabase().getType()); } return Optional.empty(); } @@ -1328,7 +1328,7 @@ public void actionPerformed(ActionEvent e) { } } - LabelPatternUtil.makeLabel(panel.loadedDatabase.getMetaData(), panel.getDatabase(), entry); + LabelPatternUtil.makeLabel(panel.getLoadedDatabase().getMetaData(), panel.getDatabase(), entry); // Store undo information: panel.undoManager.addEdit(new UndoableKeyChange(panel.getDatabase(), entry.getId(), (String) oldValue, entry.getCiteKey())); @@ -1409,7 +1409,7 @@ public void mouseClicked(MouseEvent evt) { String link = tf.getText(); // get selected ? String try { - JabRefDesktop.openExternalViewer(panel.loadedDatabase.getMetaData(), link, tf.getFieldName()); + JabRefDesktop.openExternalViewer(panel.getLoadedDatabase().getMetaData(), link, tf.getFieldName()); } catch (IOException ex) { LOGGER.warn("Error opening file.", ex); } diff --git a/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditorTab.java b/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditorTab.java index 018a9a5aabb..8bf18a040b8 100644 --- a/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditorTab.java +++ b/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditorTab.java @@ -141,7 +141,7 @@ private void setupPanel(JabRefFrame frame, BasePanel bPanel, boolean addKeyField int defaultHeight; int wHeight = (int) (50.0 * BibtexFields.getFieldWeight(fields[i])); if (editorType == GUIGlobals.FILE_LIST_EDITOR) { - fieldEditor = new FileListEditor(frame, bPanel.loadedDatabase.getMetaData(), fields[i], null, parent); + fieldEditor = new FileListEditor(frame, bPanel.getLoadedDatabase().getMetaData(), fields[i], null, parent); fileListEditor = (FileListEditor) fieldEditor; defaultHeight = 0; } else { diff --git a/src/main/java/net/sf/jabref/gui/entryeditor/FieldExtraComponents.java b/src/main/java/net/sf/jabref/gui/entryeditor/FieldExtraComponents.java index 649b2e9cd51..1b9e4e7d38d 100644 --- a/src/main/java/net/sf/jabref/gui/entryeditor/FieldExtraComponents.java +++ b/src/main/java/net/sf/jabref/gui/entryeditor/FieldExtraComponents.java @@ -77,8 +77,8 @@ public static Optional getJournalExtraComponent(JabRefFrame frame, B BibEntry entry, Set contentSelectors, StoreFieldAction storeFieldAction) { JPanel controls = new JPanel(); controls.setLayout(new BorderLayout()); - if (panel.loadedDatabase.getMetaData().getData(Globals.SELECTOR_META_PREFIX + editor.getFieldName()) != null) { - FieldContentSelector ws = new FieldContentSelector(frame, panel, frame, editor, panel.loadedDatabase.getMetaData(), + if (panel.getLoadedDatabase().getMetaData().getData(Globals.SELECTOR_META_PREFIX + editor.getFieldName()) != null) { + FieldContentSelector ws = new FieldContentSelector(frame, panel, frame, editor, panel.getLoadedDatabase().getMetaData(), storeFieldAction, false, ", "); contentSelectors.add(ws); controls.add(ws, BorderLayout.NORTH); @@ -167,7 +167,7 @@ public static Optional getBrowseDocExtraComponent(JabRefFrame frame, off = new OpenFileFilter(new String[] {ext}); } - return Optional.of(new ExternalFilePanel(frame, panel.loadedDatabase.getMetaData(), entryEditor, fieldEditor.getFieldName(), off, + return Optional.of(new ExternalFilePanel(frame, panel.getLoadedDatabase().getMetaData(), entryEditor, fieldEditor.getFieldName(), off, fieldEditor)); } @@ -292,7 +292,7 @@ public static Optional getURLExtraComponent(FieldEditor fieldEditor, */ public static Optional getSelectorExtraComponent(JabRefFrame frame, BasePanel panel, FieldEditor editor, Set contentSelectors, StoreFieldAction storeFieldAction) { - FieldContentSelector ws = new FieldContentSelector(frame, panel, frame, editor, panel.loadedDatabase.getMetaData(), + FieldContentSelector ws = new FieldContentSelector(frame, panel, frame, editor, panel.getLoadedDatabase().getMetaData(), storeFieldAction, false, "author".equals(editor.getFieldName()) || "editor".equals(editor.getFieldName()) ? " and " : ", "); contentSelectors.add(ws); diff --git a/src/main/java/net/sf/jabref/gui/fieldeditors/FileListEditor.java b/src/main/java/net/sf/jabref/gui/fieldeditors/FileListEditor.java index 65461f93d76..f36314a4580 100644 --- a/src/main/java/net/sf/jabref/gui/fieldeditors/FileListEditor.java +++ b/src/main/java/net/sf/jabref/gui/fieldeditors/FileListEditor.java @@ -474,7 +474,7 @@ private void downloadFile() { } } DownloadExternalFile def = new DownloadExternalFile(frame, - frame.getCurrentBasePanel().loadedDatabase.getMetaData(), bibtexKey); + frame.getCurrentBasePanel().getLoadedDatabase().getMetaData(), bibtexKey); try { def.download(this); } catch (IOException ex) { diff --git a/src/main/java/net/sf/jabref/gui/labelPattern/SearchFixDuplicateLabels.java b/src/main/java/net/sf/jabref/gui/labelPattern/SearchFixDuplicateLabels.java index 421e656b1c8..44524b4b6e2 100644 --- a/src/main/java/net/sf/jabref/gui/labelPattern/SearchFixDuplicateLabels.java +++ b/src/main/java/net/sf/jabref/gui/labelPattern/SearchFixDuplicateLabels.java @@ -107,7 +107,7 @@ public void update() { NamedCompound ce = new NamedCompound("resolve duplicate keys"); for (BibEntry entry : toGenerateFor) { String oldKey = entry.getCiteKey(); - LabelPatternUtil.makeLabel(panel.loadedDatabase.getMetaData(), panel.database(), entry); + LabelPatternUtil.makeLabel(panel.getLoadedDatabase().getMetaData(), panel.database(), entry); ce.addEdit(new UndoableKeyChange(panel.database(), entry.getId(), oldKey, entry.getCiteKey())); } diff --git a/src/main/java/net/sf/jabref/gui/maintable/MainTableSelectionListener.java b/src/main/java/net/sf/jabref/gui/maintable/MainTableSelectionListener.java index 791079c4e12..d08655e3903 100644 --- a/src/main/java/net/sf/jabref/gui/maintable/MainTableSelectionListener.java +++ b/src/main/java/net/sf/jabref/gui/maintable/MainTableSelectionListener.java @@ -84,9 +84,9 @@ public MainTableSelectionListener(BasePanel panel, MainTable table) { this.panel = panel; this.tableRows = table.getTableRows(); previewPanel = new PreviewPanel[] { - new PreviewPanel(panel.database(), null, panel, panel.loadedDatabase.getMetaData(), Globals.prefs + new PreviewPanel(panel.database(), null, panel, panel.getLoadedDatabase().getMetaData(), Globals.prefs .get(JabRefPreferences.PREVIEW_0), true), - new PreviewPanel(panel.database(), null, panel, panel.loadedDatabase.getMetaData(), Globals.prefs + new PreviewPanel(panel.database(), null, panel, panel.getLoadedDatabase().getMetaData(), Globals.prefs .get(JabRefPreferences.PREVIEW_1), true)}; panel.getSearchBar().getSearchQueryHighlightObservable().addSearchListener(previewPanel[0]); @@ -321,7 +321,7 @@ public void run() { } if (flEntry != null) { ExternalFileMenuItem item = new ExternalFileMenuItem(panel.frame(), entry, "", - flEntry.link, flEntry.type.getIcon(), panel.loadedDatabase.getMetaData(), + flEntry.link, flEntry.type.getIcon(), panel.getLoadedDatabase().getMetaData(), flEntry.type); boolean success = item.openLink(); if (!success) { @@ -330,7 +330,7 @@ public void run() { } } else { try { - JabRefDesktop.openExternalViewer(panel.loadedDatabase.getMetaData(), link, fieldName); + JabRefDesktop.openExternalViewer(panel.getLoadedDatabase().getMetaData(), link, fieldName); } catch (IOException ex) { panel.output(Localization.lang("Unable to open link.")); } @@ -379,7 +379,7 @@ private void processPopupTrigger(MouseEvent e, int row) { table.setRowSelectionInterval(row, row); //panel.updateViewToSelected(); } - RightClickMenu rightClickMenu = new RightClickMenu(panel, panel.loadedDatabase.getMetaData()); + RightClickMenu rightClickMenu = new RightClickMenu(panel, panel.getLoadedDatabase().getMetaData()); rightClickMenu.show(table, e.getX(), e.getY()); } @@ -416,7 +416,7 @@ private void showIconRightClickMenu(MouseEvent e, int row, MainTableColumn colum description = flEntry.link; } menu.add(new ExternalFileMenuItem(panel.frame(), entry, description, - flEntry.link, flEntry.type.getIcon(), panel.loadedDatabase.getMetaData(), + flEntry.link, flEntry.type.getIcon(), panel.getLoadedDatabase().getMetaData(), flEntry.type)); showDefaultPopup = false; } @@ -426,7 +426,7 @@ private void showIconRightClickMenu(MouseEvent e, int row, MainTableColumn colum if (entry.hasField(field)) { String content = entry.getField(field); menu.add(new ExternalFileMenuItem(panel.frame(), entry, content, content, - GUIGlobals.getTableIcon(field).getIcon(), panel.loadedDatabase.getMetaData(), field)); + GUIGlobals.getTableIcon(field).getIcon(), panel.getLoadedDatabase().getMetaData(), field)); showDefaultPopup = false; } } else { diff --git a/src/main/java/net/sf/jabref/gui/search/SearchResultsDialog.java b/src/main/java/net/sf/jabref/gui/search/SearchResultsDialog.java index 1de5fc446e3..1f107d133ac 100644 --- a/src/main/java/net/sf/jabref/gui/search/SearchResultsDialog.java +++ b/src/main/java/net/sf/jabref/gui/search/SearchResultsDialog.java @@ -349,12 +349,12 @@ public void mouseClicked(MouseEvent e) { } FileListEntry fl = tableModel.getEntry(0); (new ExternalFileMenuItem(frame, entry, "", fl.link, null, - p.loadedDatabase.getMetaData(), fl.type)).actionPerformed(null); + p.getLoadedDatabase().getMetaData(), fl.type)).actionPerformed(null); } break; case URL_COL: entry.getFieldOptional("url").ifPresent(link -> { try { - JabRefDesktop.openExternalViewer(p.loadedDatabase.getMetaData(), link, "url"); + JabRefDesktop.openExternalViewer(p.getLoadedDatabase().getMetaData(), link, "url"); } catch (IOException ex) { LOGGER.warn("Could not open viewer", ex); } @@ -391,7 +391,7 @@ public void processPopupTrigger(MouseEvent e) { description = flEntry.link; } menu.add(new ExternalFileMenuItem(p.frame(), entry, description, - flEntry.link, flEntry.type.getIcon(), p.loadedDatabase.getMetaData(), + flEntry.link, flEntry.type.getIcon(), p.getLoadedDatabase().getMetaData(), flEntry.type)); count++; } @@ -417,7 +417,7 @@ public void listChanged(ListEvent listEvent) { // Find out which BasePanel the selected entry belongs to: BasePanel p = entryHome.get(entry); // Update the preview's metadata reference: - preview.setMetaData(p.loadedDatabase.getMetaData()); + preview.setMetaData(p.getLoadedDatabase().getMetaData()); // Update the preview's entry: preview.setEntry(entry); contentPane.setDividerLocation(0.5f); diff --git a/src/main/java/net/sf/jabref/gui/worker/SendAsEMailAction.java b/src/main/java/net/sf/jabref/gui/worker/SendAsEMailAction.java index a07417e740c..fd96028242b 100644 --- a/src/main/java/net/sf/jabref/gui/worker/SendAsEMailAction.java +++ b/src/main/java/net/sf/jabref/gui/worker/SendAsEMailAction.java @@ -97,7 +97,7 @@ public void run() { boolean openFolders = JabRefPreferences.getInstance().getBoolean(JabRefPreferences.OPEN_FOLDERS_OF_ATTACHED_FILES); List fileList = FileUtil.getListOfLinkedFiles(Arrays.asList(bes), - frame.getCurrentBasePanel().loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD)); + frame.getCurrentBasePanel().getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD)); for (File f : fileList) { attachments.add(f.getPath()); if (openFolders) { diff --git a/src/main/java/net/sf/jabref/importer/AppendDatabaseAction.java b/src/main/java/net/sf/jabref/importer/AppendDatabaseAction.java index dc84f35fc74..9d16a5c9889 100644 --- a/src/main/java/net/sf/jabref/importer/AppendDatabaseAction.java +++ b/src/main/java/net/sf/jabref/importer/AppendDatabaseAction.java @@ -210,7 +210,7 @@ private static void mergeFromBibtex(JabRefFrame frame, BasePanel panel, ParserRe if (importSelectorWords) { for (String s : meta) { if (s.startsWith(Globals.SELECTOR_META_PREFIX)) { - panel.loadedDatabase.getMetaData().putData(s, meta.getData(s)); + panel.getLoadedDatabase().getMetaData().putData(s, meta.getData(s)); } } } diff --git a/src/main/java/net/sf/jabref/importer/DatabaseFileLookup.java b/src/main/java/net/sf/jabref/importer/DatabaseFileLookup.java index 2fcb3c00c4b..afdc87aff0c 100644 --- a/src/main/java/net/sf/jabref/importer/DatabaseFileLookup.java +++ b/src/main/java/net/sf/jabref/importer/DatabaseFileLookup.java @@ -48,7 +48,7 @@ class DatabaseFileLookup { */ public DatabaseFileLookup(BibDatabase database) { Objects.requireNonNull(database); - possibleFilePaths = Optional.ofNullable(JabRef.jrf.getCurrentBasePanel().loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD)).orElse(new ArrayList<>()); + possibleFilePaths = Optional.ofNullable(JabRef.jrf.getCurrentBasePanel().getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD)).orElse(new ArrayList<>()); for (BibEntry entry : database.getEntries()) { fileCache.addAll(parseFileField(entry)); diff --git a/src/main/java/net/sf/jabref/importer/EntryFromFileCreator.java b/src/main/java/net/sf/jabref/importer/EntryFromFileCreator.java index 0c5111ae764..dd8177b386b 100644 --- a/src/main/java/net/sf/jabref/importer/EntryFromFileCreator.java +++ b/src/main/java/net/sf/jabref/importer/EntryFromFileCreator.java @@ -154,7 +154,7 @@ private void addFileInfo(BibEntry entry, File file) { ExternalFileType fileType = ExternalFileTypes.getInstance() .getExternalFileTypeByExt(externalFileType.getFieldName()); - List possibleFilePaths = JabRef.jrf.getCurrentBasePanel().loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + List possibleFilePaths = JabRef.jrf.getCurrentBasePanel().getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); File shortenedFileName = FileUtil.shortenFileName(file, possibleFilePaths); FileListEntry fileListEntry = new FileListEntry("", shortenedFileName.getPath(), fileType); diff --git a/src/main/java/net/sf/jabref/importer/fetcher/OAI2Fetcher.java b/src/main/java/net/sf/jabref/importer/fetcher/OAI2Fetcher.java index f136e6e98b1..8cc62d02053 100644 --- a/src/main/java/net/sf/jabref/importer/fetcher/OAI2Fetcher.java +++ b/src/main/java/net/sf/jabref/importer/fetcher/OAI2Fetcher.java @@ -207,7 +207,7 @@ public BibEntry importOai2Entry(String key) { InputStream inputStream = oai2Connection.getInputStream(); /* create an empty BibEntry and set the oai2identifier field */ - BibEntry be = new BibEntry(IdGenerator.next(), BibtexEntryTypes.ARTICLE.getName()); + BibEntry be = new BibEntry(IdGenerator.next(), "article"); be.setField(OAI2Fetcher.OAI2_IDENTIFIER_FIELD, key); DefaultHandler handlerBase = new OAI2Handler(be); /* parse the result */ diff --git a/src/main/java/net/sf/jabref/importer/fileformat/FreeCiteImporter.java b/src/main/java/net/sf/jabref/importer/fileformat/FreeCiteImporter.java index f10e26cb88b..4c1a09f04fa 100644 --- a/src/main/java/net/sf/jabref/importer/fileformat/FreeCiteImporter.java +++ b/src/main/java/net/sf/jabref/importer/fileformat/FreeCiteImporter.java @@ -212,7 +212,7 @@ public List importEntries(String text, OutputPrinter status) { e.setType(type); // autogenerate label (BibTeX key) - LabelPatternUtil.makeLabel(JabRef.jrf.getCurrentBasePanel().loadedDatabase.getMetaData(), JabRef.jrf.getCurrentBasePanel().database(), e); + LabelPatternUtil.makeLabel(JabRef.jrf.getCurrentBasePanel().getLoadedDatabase().getMetaData(), JabRef.jrf.getCurrentBasePanel().database(), e); res.add(e); } diff --git a/src/main/java/net/sf/jabref/pdfimport/PdfImporter.java b/src/main/java/net/sf/jabref/pdfimport/PdfImporter.java index 60387dd3772..34c56bb5227 100644 --- a/src/main/java/net/sf/jabref/pdfimport/PdfImporter.java +++ b/src/main/java/net/sf/jabref/pdfimport/PdfImporter.java @@ -167,7 +167,7 @@ private List importPdfFiles(List fileNames, OutputPrinter stat int globalChoice = Globals.prefs.getInt(ImportSettingsTab.PREF_IMPORT_DEFAULT_PDF_IMPORT_STYLE); // Get a list of file directories: - List dirsS = panel.loadedDatabase.getMetaData().getFileDirectory(Globals.FILE_FIELD); + List dirsS = panel.getLoadedDatabase().getMetaData().getFileDirectory(Globals.FILE_FIELD); List res = new ArrayList<>(); @@ -273,7 +273,7 @@ private List importPdfFiles(List fileNames, OutputPrinter stat panel.database().insertEntry(entry); panel.markBaseChanged(); - LabelPatternUtil.makeLabel(panel.loadedDatabase.getMetaData(), panel.database(), entry); + LabelPatternUtil.makeLabel(panel.getLoadedDatabase().getMetaData(), panel.database(), entry); dfh = new DroppedFileHandler(frame, panel); dfh.linkPdfToEntry(fileName, entryTable, entry); panel.highlightEntry(entry); diff --git a/src/main/java/net/sf/jabref/sql/DbConnectAction.java b/src/main/java/net/sf/jabref/sql/DbConnectAction.java index de54b587909..f4b168d7e36 100644 --- a/src/main/java/net/sf/jabref/sql/DbConnectAction.java +++ b/src/main/java/net/sf/jabref/sql/DbConnectAction.java @@ -59,7 +59,7 @@ public void actionPerformed(ActionEvent e) { @Override public void action() { - DBStrings dbs = panel.loadedDatabase.getMetaData().getDBStrings(); + DBStrings dbs = panel.getLoadedDatabase().getMetaData().getDBStrings(); // init DB strings if necessary if (!dbs.isInitialized()) { @@ -99,7 +99,7 @@ public void action() { Localization.lang("Connect to SQL database"), JOptionPane.ERROR_MESSAGE); } finally { - panel.loadedDatabase.getMetaData().setDBStrings(dbs); + panel.getLoadedDatabase().getMetaData().setDBStrings(dbs); dbd.dispose(); } } diff --git a/src/main/java/net/sf/jabref/sql/importer/DbImportAction.java b/src/main/java/net/sf/jabref/sql/importer/DbImportAction.java index 97279aa92db..bca1171a299 100644 --- a/src/main/java/net/sf/jabref/sql/importer/DbImportAction.java +++ b/src/main/java/net/sf/jabref/sql/importer/DbImportAction.java @@ -193,7 +193,7 @@ public void update() { metaData = res.getMetaData(); if (database != null) { BasePanel pan = frame.addTab(database, null, metaData, Globals.prefs.getDefaultEncoding(), true); - pan.loadedDatabase.getMetaData().setDBStrings(dbs); + pan.getLoadedDatabase().getMetaData().setDBStrings(dbs); frame.setTabTitle(pan, res.getName() + "(Imported)", "Imported DB"); pan.markBaseChanged(); }