Added model.entry.FieldName that contains field name constants

src/main/java/net/sf/jabref/BibDatabaseContext.java

@@ -9,6 +9,7 @@
 import net.sf.jabref.model.database.BibDatabase;
 import net.sf.jabref.model.database.BibDatabaseMode;
 import net.sf.jabref.model.database.BibDatabaseModeDetection;
+import net.sf.jabref.model.entry.FieldName;
 import net.sf.jabref.preferences.JabRefPreferences;
 
 /**
@@ -177,6 +178,6 @@ private String getFileDirectoryPath(String directoryName) {
     }
 
     public List<String> getFileDirectory() {
-        return getFileDirectory(Globals.FILE_FIELD);
+        return getFileDirectory(FieldName.FILE);
     }
 }

src/main/java/net/sf/jabref/Globals.java

@@ -31,8 +31,6 @@
 
 public class Globals {
 
-    public static final String FILE_FIELD = "file";
-    public static final String FOLDER_FIELD = "folder";
     public static final String DIR_SUFFIX = "Directory";
 
     // JabRef version info

src/main/java/net/sf/jabref/MetaData.java

@@ -40,6 +40,7 @@
 import net.sf.jabref.logic.labelpattern.DatabaseLabelPattern;
 import net.sf.jabref.logic.util.strings.StringUtil;
 import net.sf.jabref.model.database.BibDatabaseMode;
+import net.sf.jabref.model.entry.FieldName;
 import net.sf.jabref.sql.DBStrings;
 
 import org.apache.commons.logging.Log;
@@ -57,7 +58,7 @@ public class MetaData implements Iterable<String> {
     private static final String DATABASE_TYPE = "databaseType";
 
     private static final String GROUPSTREE = "groupstree";
-    private static final String FILE_DIRECTORY = Globals.FILE_FIELD + Globals.DIR_SUFFIX;
+    private static final String FILE_DIRECTORY = FieldName.FILE + Globals.DIR_SUFFIX;
     public static final String SELECTOR_META_PREFIX = "selector_";
     private static final String PROTECTED_FLAG_META = "protectedFlag";
 
@@ -126,11 +127,11 @@ public Optional<SaveOrderConfig> getSaveOrderConfig() {
      * Add default metadata for new database:
      */
     public void initializeNewDatabase() {
-        metaData.put(SELECTOR_META_PREFIX + "keywords", new Vector<>());
-        metaData.put(SELECTOR_META_PREFIX + "author", new Vector<>());
-        metaData.put(SELECTOR_META_PREFIX + "journal", new Vector<>());
-        metaData.put(SELECTOR_META_PREFIX + "publisher", new Vector<>());
-        metaData.put(SELECTOR_META_PREFIX + "review", new Vector<>());
+        metaData.put(SELECTOR_META_PREFIX + FieldName.KEYWORDS, new Vector<>());
+        metaData.put(SELECTOR_META_PREFIX + FieldName.AUTHOR, new Vector<>());
+        metaData.put(SELECTOR_META_PREFIX + FieldName.JOURNAL, new Vector<>());
+        metaData.put(SELECTOR_META_PREFIX + FieldName.PUBLISHER, new Vector<>());
+        metaData.put(SELECTOR_META_PREFIX + FieldName.REVIEW, new Vector<>());
     }
 
     /**

src/main/java/net/sf/jabref/collab/ChangeScanner.java

@@ -53,14 +53,15 @@
 import net.sf.jabref.model.database.EntrySorter;
 import net.sf.jabref.model.entry.BibEntry;
 import net.sf.jabref.model.entry.BibtexString;
+import net.sf.jabref.model.entry.FieldName;
 import net.sf.jabref.preferences.JabRefPreferences;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public class ChangeScanner implements Runnable {
 
-    private static final String[] SORT_BY = new String[] {"year", "author", "title"};
+    private static final String[] SORT_BY = new String[] {FieldName.YEAR, FieldName.AUTHOR, FieldName.TITLE};
 
     private final File f;
 

src/main/java/net/sf/jabref/external/AttachFileAction.java

@@ -1,6 +1,5 @@
 package net.sf.jabref.external;
 
-import net.sf.jabref.Globals;
 import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.FileListEntry;
 import net.sf.jabref.gui.FileListEntryEditor;
@@ -9,6 +8,7 @@
 import net.sf.jabref.gui.undo.UndoableFieldChange;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.model.entry.BibEntry;
+import net.sf.jabref.model.entry.FieldName;
 
 /**
  * Created by IntelliJ IDEA.
@@ -39,13 +39,13 @@ public void action() {
         editor.setVisible(true, true);
         if (editor.okPressed()) {
             FileListTableModel model = new FileListTableModel();
-            entry.getFieldOptional(Globals.FILE_FIELD).ifPresent(model::setContent);
+            entry.getFieldOptional(FieldName.FILE).ifPresent(model::setContent);
             model.addEntry(model.getRowCount(), flEntry);
             String newVal = model.getStringRepresentation();
 
-            UndoableFieldChange ce = new UndoableFieldChange(entry, Globals.FILE_FIELD,
-                    entry.getFieldOptional(Globals.FILE_FIELD).orElse(null), newVal);
-            entry.setField(Globals.FILE_FIELD, newVal);
+            UndoableFieldChange ce = new UndoableFieldChange(entry, FieldName.FILE,
+                    entry.getFieldOptional(FieldName.FILE).orElse(null), newVal);
+            entry.setField(FieldName.FILE, newVal);
             panel.getUndoManager().addEdit(ce);
             panel.markBaseChanged();
         }

src/main/java/net/sf/jabref/external/AutoSetLinks.java

@@ -29,6 +29,7 @@
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.logic.util.io.FileUtil;
 import net.sf.jabref.model.entry.BibEntry;
+import net.sf.jabref.model.entry.FieldName;
 import net.sf.jabref.preferences.JabRefPreferences;
 
 public class AutoSetLinks {
@@ -111,7 +112,7 @@ public void run() {
                 // Iterate over the entries:
                 for (Entry<BibEntry, List<File>> entryFilePair : result.entrySet()) {
                     FileListTableModel tableModel;
-                    Optional<String> oldVal = entryFilePair.getKey().getFieldOptional(Globals.FILE_FIELD);
+                    Optional<String> oldVal = entryFilePair.getKey().getFieldOptional(FieldName.FILE);
                     if (singleTableModel == null) {
                         tableModel = new FileListTableModel();
                         oldVal.ifPresent(tableModel::setContent);
@@ -152,12 +153,12 @@ public void run() {
                             if (ce != null) {
                                 // store undo information
                                 UndoableFieldChange change = new UndoableFieldChange(entryFilePair.getKey(),
-                                        Globals.FILE_FIELD, oldVal.orElse(null), newVal);
+                                        FieldName.FILE, oldVal.orElse(null), newVal);
                                 ce.addEdit(change);
                             }
                             // hack: if table model is given, do NOT modify entry
                             if (singleTableModel == null) {
-                                entryFilePair.getKey().setField(Globals.FILE_FIELD, newVal);
+                                entryFilePair.getKey().setField(FieldName.FILE, newVal);
                             }
                             if (changedEntries != null) {
                                 changedEntries.add(entryFilePair.getKey());

src/main/java/net/sf/jabref/external/DroppedFileHandler.java

@@ -44,6 +44,7 @@
 import net.sf.jabref.logic.xmp.XMPUtil;
 import net.sf.jabref.model.database.BibDatabase;
 import net.sf.jabref.model.entry.BibEntry;
+import net.sf.jabref.model.entry.FieldName;
 import net.sf.jabref.model.entry.IdGenerator;
 
 import com.jgoodies.forms.builder.FormBuilder;
@@ -395,7 +396,7 @@ private boolean showLinkMoveCopyRenameDialog(String linkFileName, ExternalFileTy
     private void doLink(BibEntry entry, ExternalFileType fileType, String filename,
                         boolean avoidDuplicate, NamedCompound edits) {
 
-        Optional<String> oldValue = entry.getFieldOptional(Globals.FILE_FIELD);
+        Optional<String> oldValue = entry.getFieldOptional(FieldName.FILE);
         FileListTableModel tm = new FileListTableModel();
         oldValue.ifPresent(tm::setContent);
 
@@ -441,8 +442,8 @@ private void doLink(BibEntry entry, ExternalFileType fileType, String filename,
 
         tm.addEntry(tm.getRowCount(), new FileListEntry("", filename, fileType));
         String newValue = tm.getStringRepresentation();
-        UndoableFieldChange edit = new UndoableFieldChange(entry, Globals.FILE_FIELD, oldValue.orElse(null), newValue);
-        entry.setField(Globals.FILE_FIELD, newValue);
+        UndoableFieldChange edit = new UndoableFieldChange(entry, FieldName.FILE, oldValue.orElse(null), newValue);
+        entry.setField(FieldName.FILE, newValue);
 
         if (edits == null) {
             panel.getUndoManager().addEdit(edit);

src/main/java/net/sf/jabref/external/FindFullTextAction.java

@@ -22,14 +22,14 @@
 
 import javax.swing.JOptionPane;
 
-import net.sf.jabref.Globals;
 import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.FileListTableModel;
 import net.sf.jabref.gui.undo.UndoableFieldChange;
 import net.sf.jabref.gui.worker.AbstractWorker;
 import net.sf.jabref.logic.fulltext.FindFullText;
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.model.entry.BibEntry;
+import net.sf.jabref.model.entry.FieldName;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -80,12 +80,12 @@ public void update() {
             try {
                 def.download(result.get(), file -> {
                     FileListTableModel tm = new FileListTableModel();
-                    entry.getFieldOptional(Globals.FILE_FIELD).ifPresent(tm::setContent);
+                    entry.getFieldOptional(FieldName.FILE).ifPresent(tm::setContent);
                     tm.addEntry(tm.getRowCount(), file);
                     String newValue = tm.getStringRepresentation();
-                    UndoableFieldChange edit = new UndoableFieldChange(entry, Globals.FILE_FIELD,
-                            entry.getFieldOptional(Globals.FILE_FIELD).orElse(null), newValue);
-                    entry.setField(Globals.FILE_FIELD, newValue);
+                    UndoableFieldChange edit = new UndoableFieldChange(entry, FieldName.FILE,
+                            entry.getFieldOptional(FieldName.FILE).orElse(null), newValue);
+                    entry.setField(FieldName.FILE, newValue);
                     basePanel.getUndoManager().addEdit(edit);
                     basePanel.markBaseChanged();
                 });

src/main/java/net/sf/jabref/external/SynchronizeFileField.java

@@ -59,6 +59,7 @@
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.logic.util.io.FileUtil;
 import net.sf.jabref.model.entry.BibEntry;
+import net.sf.jabref.model.entry.FieldName;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.builder.FormBuilder;
@@ -144,7 +145,7 @@ public void run() {
             boolean removeAllBroken = false;
             mainLoop: for (BibEntry aSel : sel) {
                 panel.frame().setProgressBarValue(progress++);
-                final Optional<String> old = aSel.getFieldOptional(Globals.FILE_FIELD);
+                final Optional<String> old = aSel.getFieldOptional(FieldName.FILE);
                 // Check if a extension is set:
                 if (old.isPresent() && !(old.get().isEmpty())) {
                     FileListTableModel tableModel = new FileListTableModel();
@@ -254,11 +255,11 @@ public void run() {
                         // The table has been modified. Store the change:
                         String toSet = tableModel.getStringRepresentation();
                         if (toSet.isEmpty()) {
-                            ce.addEdit(new UndoableFieldChange(aSel, Globals.FILE_FIELD, old.orElse(null), null));
-                            aSel.clearField(Globals.FILE_FIELD);
+                            ce.addEdit(new UndoableFieldChange(aSel, FieldName.FILE, old.orElse(null), null));
+                            aSel.clearField(FieldName.FILE);
                         } else {
-                            ce.addEdit(new UndoableFieldChange(aSel, Globals.FILE_FIELD, old.orElse(null), toSet));
-                            aSel.setField(Globals.FILE_FIELD, toSet);
+                            ce.addEdit(new UndoableFieldChange(aSel, FieldName.FILE, old.orElse(null), toSet));
+                            aSel.setField(FieldName.FILE, toSet);
                         }
                         changedEntries.add(aSel);
                     }

src/main/java/net/sf/jabref/external/TransferableFileLinkSelection.java

@@ -23,11 +23,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import net.sf.jabref.Globals;
 import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.FileListTableModel;
 import net.sf.jabref.logic.util.io.FileUtil;
 import net.sf.jabref.model.entry.BibEntry;
+import net.sf.jabref.model.entry.FieldName;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -44,7 +44,7 @@ public class TransferableFileLinkSelection implements Transferable {
 
     public TransferableFileLinkSelection(BasePanel panel, List<BibEntry> selection) {
         FileListTableModel tm = new FileListTableModel();
-        selection.get(0).getFieldOptional(Globals.FILE_FIELD).ifPresent(tm::setContent);
+        selection.get(0).getFieldOptional(FieldName.FILE).ifPresent(tm::setContent);
         if (tm.getRowCount() > 0) {
             // Find the default directory for this field type, if any:
             List<String> dirs = panel.getBibDatabaseContext().getFileDirectory();

src/main/java/net/sf/jabref/external/WriteXMPAction.java

@@ -49,6 +49,7 @@
 import net.sf.jabref.logic.xmp.XMPUtil;
 import net.sf.jabref.model.database.BibDatabase;
 import net.sf.jabref.model.entry.BibEntry;
+import net.sf.jabref.model.entry.FieldName;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
 
@@ -138,9 +139,9 @@ public void run() {
                     .ifPresent(files::add));
             // Then check the "file" field:
             List<String> dirs = panel.getBibDatabaseContext().getFileDirectory();
-            if (entry.hasField(Globals.FILE_FIELD)) {
+            if (entry.hasField(FieldName.FILE)) {
                 FileListTableModel tm = new FileListTableModel();
-                entry.getFieldOptional(Globals.FILE_FIELD).ifPresent(tm::setContent);
+                entry.getFieldOptional(FieldName.FILE).ifPresent(tm::setContent);
                 for (int j = 0; j < tm.getRowCount(); j++) {
                     FileListEntry flEntry = tm.getEntry(j);
                     if ((flEntry.type.isPresent()) && "pdf".equalsIgnoreCase(flEntry.type.get().getName())) {

src/main/java/net/sf/jabref/external/WriteXMPEntryEditorAction.java

@@ -25,7 +25,6 @@
 import javax.swing.Action;
 import javax.xml.transform.TransformerException;
 
-import net.sf.jabref.Globals;
 import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.FileListEntry;
 import net.sf.jabref.gui.FileListTableModel;
@@ -36,6 +35,7 @@
 import net.sf.jabref.logic.util.io.FileUtil;
 import net.sf.jabref.logic.xmp.XMPUtil;
 import net.sf.jabref.model.entry.BibEntry;
+import net.sf.jabref.model.entry.FieldName;
 
 /**
  * Write XMP action for EntryEditor toolbar.
@@ -73,9 +73,9 @@ public void actionPerformed(ActionEvent actionEvent) {
 
         // Then check the "file" field:
         List<String> dirs = panel.getBibDatabaseContext().getFileDirectory();
-        if (entry.hasField(Globals.FILE_FIELD)) {
+        if (entry.hasField(FieldName.FILE)) {
             FileListTableModel tm = new FileListTableModel();
-            entry.getFieldOptional(Globals.FILE_FIELD).ifPresent(tm::setContent);
+            entry.getFieldOptional(FieldName.FILE).ifPresent(tm::setContent);
             for (int j = 0; j < tm.getRowCount(); j++) {
                 FileListEntry flEntry = tm.getEntry(j);
                 if ((flEntry.type.isPresent()) && "pdf".equalsIgnoreCase(flEntry.type.get().getName())) {

src/main/java/net/sf/jabref/gui/BasePanel.java

@@ -126,6 +126,7 @@
 import net.sf.jabref.model.database.KeyCollisionException;
 import net.sf.jabref.model.entry.BibEntry;
 import net.sf.jabref.model.entry.EntryType;
+import net.sf.jabref.model.entry.FieldName;
 import net.sf.jabref.model.entry.IdGenerator;
 import net.sf.jabref.model.event.EntryAddedEvent;
 import net.sf.jabref.model.event.EntryChangedEvent;
@@ -1034,13 +1035,13 @@ private void openExternalFile() {
             }
 
             final BibEntry entry = bes.get(0);
-            if (!entry.hasField(Globals.FILE_FIELD)) {
+            if (!entry.hasField(FieldName.FILE)) {
                 // no bibtex field
                 new SearchAndOpenFile(entry, BasePanel.this).searchAndOpen();
                 return;
             }
             FileListTableModel tableModel = new FileListTableModel();
-            entry.getFieldOptional(Globals.FILE_FIELD).ifPresent(tableModel::setContent);
+            entry.getFieldOptional(FieldName.FILE).ifPresent(tableModel::setContent);
             if (tableModel.getRowCount() == 0) {
                 // content in bibtex field is not readable
                 new SearchAndOpenFile(entry, BasePanel.this).searchAndOpen();
@@ -2055,8 +2056,6 @@ public void action() {
 
     private class OpenURLAction implements BaseAction {
 
-        private static final String URL_FIELD = "url";
-        private static final String DOI_FIELD = "doi";
         private static final String PS_FIELD = "ps";
         private static final String PDF_FIELD = "pdf";
 
@@ -2065,11 +2064,11 @@ private class OpenURLAction implements BaseAction {
         public void action() {
             final List<BibEntry> bes = mainTable.getSelectedEntries();
             if (bes.size() == 1) {
-                String field = DOI_FIELD;
-                Optional<String> link = bes.get(0).getFieldOptional(DOI_FIELD);
-                if (bes.get(0).hasField(URL_FIELD)) {
-                    link = bes.get(0).getFieldOptional(URL_FIELD);
-                    field = URL_FIELD;
+                String field = FieldName.DOI;
+                Optional<String> link = bes.get(0).getFieldOptional(FieldName.DOI);
+                if (bes.get(0).hasField(FieldName.URL)) {
+                    link = bes.get(0).getFieldOptional(FieldName.URL);
+                    field = FieldName.URL;
                 }
                 if (link.isPresent()) {
                     try {
@@ -2083,10 +2082,10 @@ public void action() {
                     // Look for web links in the "file" field as a fallback:
                     FileListEntry entry = null;
                     FileListTableModel tm = new FileListTableModel();
-                    bes.get(0).getFieldOptional(Globals.FILE_FIELD).ifPresent(tm::setContent);
+                    bes.get(0).getFieldOptional(FieldName.FILE).ifPresent(tm::setContent);
                     for (int i = 0; i < tm.getRowCount(); i++) {
                         FileListEntry flEntry = tm.getEntry(i);
-                        if (URL_FIELD.equalsIgnoreCase(flEntry.type.get().getName())
+                        if (FieldName.URL.equalsIgnoreCase(flEntry.type.get().getName())
                                 || PS_FIELD.equalsIgnoreCase(flEntry.type.get().getName())
                                 || PDF_FIELD.equalsIgnoreCase(flEntry.type.get().getName())) {
                             entry = flEntry;

src/main/java/net/sf/jabref/gui/ContentSelectorDialog2.java

@@ -48,6 +48,7 @@
 import net.sf.jabref.gui.keyboard.KeyBinder;
 import net.sf.jabref.gui.util.FocusRequester;
 import net.sf.jabref.logic.l10n.Localization;
+import net.sf.jabref.model.entry.FieldName;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
 import org.apache.commons.logging.Log;
@@ -320,10 +321,10 @@ private void setupFieldSelector() {
         }
         if (contents.isEmpty()) {
             // if nothing was added, put the default fields (as described in the help)
-            fieldListModel.addElement("author");
-            fieldListModel.addElement("journal");
-            fieldListModel.addElement("keywords");
-            fieldListModel.addElement("publisher");
+            fieldListModel.addElement(FieldName.AUTHOR);
+            fieldListModel.addElement(FieldName.JOURNAL);
+            fieldListModel.addElement(FieldName.KEYWORDS);
+            fieldListModel.addElement(FieldName.PUBLISHER);
         } else {
             for (String s : contents) {
                 fieldListModel.addElement(s);