Improve performance for loading files

src/main/java/org/jabref/gui/BasePanel.java

@@ -38,7 +38,6 @@
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.database.KeyCollisionException;
 import org.jabref.model.database.event.BibDatabaseContextChangedEvent;
 import org.jabref.model.database.event.EntriesAddedEvent;
 import org.jabref.model.database.event.EntriesRemovedEvent;
@@ -253,7 +252,6 @@ public void insertEntry(final BibEntry bibEntry) {
 
     public void insertEntries(final List<BibEntry> entries) {
         if (!entries.isEmpty()) {
-            try {
                 bibDatabaseContext.getDatabase().insertEntries(entries);
 
                 // Set owner and timestamp
@@ -272,9 +270,6 @@ public void insertEntries(final List<BibEntry> entries) {
                     showAndEdit(entries.get(0));
                 }
                 clearAndSelect(entries.get(0));
-            } catch (KeyCollisionException ex) {
-                LOGGER.info("Collision for bibtex key" + ex.getId(), ex);
-            }
         }
     }
 

src/main/java/org/jabref/gui/entryeditor/SourceTab.java

@@ -69,16 +69,18 @@ public class SourceTab extends EntryEditorTab {
     private final DialogService dialogService;
     private final StateManager stateManager;
     private Optional<Pattern> searchHighlightPattern = Optional.empty();
-    private final CodeArea codeArea;
-    private KeyBindingRepository keyBindingRepository;
+    private final KeyBindingRepository keyBindingRepository;
+    private CodeArea codeArea;
 
     private BibEntry previousEntry;
 
     private class EditAction extends SimpleCommand {
 
         private final StandardActions command;
 
-        public EditAction(StandardActions command) { this.command = command; }
+        public EditAction(StandardActions command) {
+            this.command = command;
+        }
 
         @Override
         public void execute() {
@@ -112,11 +114,6 @@ public SourceTab(BibDatabaseContext bibDatabaseContext, CountingUndoManager undo
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.keyBindingRepository = keyBindingRepository;
-        this.codeArea = new CodeArea();
-
-        setupSourceEditor();
-        VirtualizedScrollPane<CodeArea> scrollableCodeArea = new VirtualizedScrollPane<>(codeArea);
-        this.setContent(scrollableCodeArea);
 
         stateManager.activeSearchQueryProperty().addListener((observable, oldValue, newValue) -> {
             searchHighlightPattern = newValue.flatMap(SearchQuery::getPatternForWords);
@@ -172,6 +169,7 @@ public Point2D getTextLocation(int offset) {
     }
 
     private void setupSourceEditor() {
+        codeArea = new CodeArea();
         codeArea.setWrapText(true);
         codeArea.setInputMethodRequests(new InputMethodRequestsObject());
         codeArea.setOnInputMethodTextChanged(event -> {
@@ -200,7 +198,7 @@ private void setupSourceEditor() {
             ValidationStatus sourceValidationStatus = sourceValidator.getValidationStatus();
             if (!sourceValidationStatus.isValid()) {
                 sourceValidationStatus.getHighestMessage().ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage()));
+                        dialogService.showErrorDialogAndWait(message.getMessage()));
             }
         });
 
@@ -209,6 +207,8 @@ private void setupSourceEditor() {
                 storeSource(currentEntry, codeArea.textProperty().getValue());
             }
         });
+        VirtualizedScrollPane<CodeArea> scrollableCodeArea = new VirtualizedScrollPane<>(codeArea);
+        this.setContent(scrollableCodeArea);
     }
 
     @Override
@@ -218,6 +218,10 @@ public boolean shouldShow(BibEntry entry) {
 
     private void updateCodeArea() {
         DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> {
+            if (codeArea == null) {
+                setupSourceEditor();
+            }
+
             codeArea.clear();
             try {
                 codeArea.appendText(getSourceString(currentEntry, mode, fieldWriterPreferences));
@@ -233,7 +237,7 @@ private void updateCodeArea() {
 
     @Override
     protected void bindToEntry(BibEntry entry) {
-        if (previousEntry != null) {
+        if (previousEntry != null && codeArea != null) {
             storeSource(previousEntry, codeArea.textProperty().getValue());
         }
         this.previousEntry = entry;

src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java

@@ -216,6 +216,8 @@ public String getDescription(Field field) {
                     return Localization.lang("Citation keys of other entries which have a relationship to this entry.");
                 case XREF:
                     return Localization.lang("This field is an alternative cross-referencing mechanism. It differs from \"Crossref\" in that the child entry will not inherit any data from the parent entry specified in the \"Xref\" field.");
+                case GROUPS:
+                    return Localization.lang("Name(s) of the (manual) groups the entry belongs to.");
             }
         } else if (field instanceof InternalField) {
             InternalField internalField = (InternalField) field;
@@ -226,8 +228,6 @@ public String getDescription(Field field) {
                     return Localization.lang("Timestamp of this entry, when it has been created or last modified.");
                 case KEY_FIELD:
                     return Localization.lang("Key by which the work may be cited.");
-                case GROUPS:
-                    return Localization.lang("Name(s) of the (manual) groups the entry belongs to.");
             }
         } else if (field instanceof SpecialField) {
             SpecialField specialField = (SpecialField) field;

src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java

@@ -12,7 +12,6 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
 
-import org.jabref.Globals;
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
@@ -21,7 +20,6 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldProperty;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
@@ -41,10 +39,10 @@ public class BibEntryTableViewModel {
     private final ObjectBinding<Map<Field, String>> linkedIdentifiers;
     private final ObservableValue<List<AbstractGroup>> matchedGroups;
 
-    public BibEntryTableViewModel(BibEntry entry, BibDatabaseContext database) {
+    public BibEntryTableViewModel(BibEntry entry, BibDatabaseContext database, MainTableNameFormatter nameFormatter) {
         this.entry = entry;
         this.database = database.getDatabase();
-        this.nameFormatter = new MainTableNameFormatter(Globals.prefs);
+        this.nameFormatter = nameFormatter;
 
         this.linkedFiles = EasyBind.map(getField(StandardField.FILE), FileFieldParser::parse);
         this.linkedIdentifiers = createLinkedIdentifiersBinding(entry);
@@ -100,7 +98,7 @@ public ObservableValue<List<AbstractGroup>> getMatchedGroups() {
     private ObservableValue<List<AbstractGroup>> createMatchedGroupsBinding(BibDatabaseContext database) {
         Optional<GroupTreeNode> root = database.getMetaData().getGroups();
         if (root.isPresent()) {
-            return EasyBind.map(entry.getFieldBinding(InternalField.GROUPS), field -> {
+            return EasyBind.map(entry.getFieldBinding(StandardField.GROUPS), field -> {
                 List<AbstractGroup> groups = root.get().getMatchingGroups(entry)
                                                  .stream()
                                                  .map(GroupTreeNode::getGroup)
@@ -122,7 +120,7 @@ public ObservableValue<String> getFields(OrFields fields) {
 
                 Optional<String> content = Optional.empty();
                 for (Field field : fields) {
-                    content = entry.getResolvedFieldOrAlias(field, database);
+                    content = entry.getResolvedFieldOrAliasLatexFree(field, database);
                     if (content.isPresent()) {
                         isName = field.getProperties().contains(FieldProperty.PERSON_NAMES);
                         break;

src/main/java/org/jabref/gui/maintable/MainTableDataModel.java

@@ -27,7 +27,8 @@ public class MainTableDataModel {
     public MainTableDataModel(BibDatabaseContext context) {
         ObservableList<BibEntry> allEntries = BindingsHelper.forUI(context.getDatabase().getEntries());
 
-        ObservableList<BibEntryTableViewModel> entriesViewModel = BindingsHelper.mapBacked(allEntries, entry -> new BibEntryTableViewModel(entry, context));
+        MainTableNameFormatter nameFormatter = new MainTableNameFormatter(Globals.prefs);
+        ObservableList<BibEntryTableViewModel> entriesViewModel = BindingsHelper.mapBacked(allEntries, entry -> new BibEntryTableViewModel(entry, context, nameFormatter));
 
         entriesFiltered = new FilteredList<>(entriesViewModel);
         entriesFiltered.predicateProperty().bind(

src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java

@@ -61,9 +61,9 @@ public MainTableColumnModel fromString(String string) {
     private final BooleanProperty specialFieldsSerializeProperty = new SimpleBooleanProperty();
     private final BooleanProperty extraFileColumnsEnabledProperty = new SimpleBooleanProperty();
 
-    private Validator columnsNotEmptyValidator;
+    private final Validator columnsNotEmptyValidator;
 
-    private List<String> restartWarnings = new ArrayList<>();
+    private final List<String> restartWarnings = new ArrayList<>();
 
     private final DialogService dialogService;
     private final JabRefPreferences preferences;
@@ -121,7 +121,7 @@ public void setValues() {
                 new MainTableColumnModel(MainTableColumnModel.Type.FILES),
                 new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, InternalField.TIMESTAMP.getName()),
                 new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, InternalField.OWNER.getName()),
-                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, InternalField.GROUPS.getName()),
+                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, StandardField.GROUPS.getName()),
                 new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, InternalField.KEY_FIELD.getName()),
                 new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, InternalField.TYPE_HEADER.getName())
         );

src/main/java/org/jabref/logic/importer/ParserResult.java

@@ -22,7 +22,6 @@
 public class ParserResult {
     private final Set<BibEntryType> entryTypes;
     private final List<String> warnings = new ArrayList<>();
-    private final List<String> duplicateKeys = new ArrayList<>();
     private BibDatabase database;
     private MetaData metaData;
     private Path file;
@@ -35,7 +34,7 @@ public ParserResult() {
     }
 
     public ParserResult(Collection<BibEntry> entries) {
-        this(BibDatabases.createDatabase(BibDatabases.purgeEmptyEntries(entries)));
+        this(new BibDatabase(BibDatabases.purgeEmptyEntries(entries)));
     }
 
     public ParserResult(BibDatabase database) {
@@ -126,35 +125,6 @@ public List<String> warnings() {
         return new ArrayList<>(warnings);
     }
 
-    /**
-     * Add a key to the list of duplicated BibTeX keys found in the database.
-     *
-     * @param key The duplicated key
-     */
-    public void addDuplicateKey(String key) {
-        if (!duplicateKeys.contains(key)) {
-            duplicateKeys.add(key);
-        }
-    }
-
-    /**
-     * Query whether any duplicated BibTeX keys have been found in the database.
-     *
-     * @return true if there is at least one duplicate key.
-     */
-    public boolean hasDuplicateKeys() {
-        return !duplicateKeys.isEmpty();
-    }
-
-    /**
-     * Get all duplicated keys found in the database.
-     *
-     * @return A list containing the duplicated keys.
-     */
-    public List<String> getDuplicateKeys() {
-        return duplicateKeys;
-    }
-
     public boolean isInvalid() {
         return invalid;
     }

src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java

@@ -38,7 +38,6 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.FieldProperty;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.metadata.MetaData;
@@ -141,11 +140,7 @@ public ParserResult parse(Reader in) throws IOException {
 
         skipWhitespace();
 
-        try {
-            return parseFileContent();
-        } catch (KeyCollisionException kce) {
-            throw new IOException("Duplicate ID in bibtex file: " + kce);
-        }
+        return parseFileContent();
     }
 
     private void initializeParserResult() {
@@ -246,12 +241,7 @@ private void parseAndAddEntry(String type) {
             // store complete parsed serialization (comments, type definition + type contents)
             entry.setParsedSerialization(commentsAndEntryTypeDefinition + dumpTextReadSoFarToString());
 
-            boolean duplicateKey = database.insertEntry(entry);
-            if (duplicateKey) {
-                entry.getField(InternalField.KEY_FIELD).ifPresent(
-                        key -> parserResult.addDuplicateKey(key)
-                );
-            }
+            database.insertEntry(entry);
         } catch (IOException ex) {
             // Trying to make the parser more robust.
             // If an exception is thrown when parsing an entry, drop the entry and try to resume parsing.
@@ -278,7 +268,7 @@ private void parseJabRefComment(Map<String, String> meta) {
         String comment = buffer.toString().replaceAll("[\\x0d\\x0a]", "");
         if (comment.substring(0, Math.min(comment.length(), MetaData.META_FLAG.length())).equals(MetaData.META_FLAG)) {
 
-            if (comment.substring(0, MetaData.META_FLAG.length()).equals(MetaData.META_FLAG)) {
+            if (comment.startsWith(MetaData.META_FLAG)) {
                 String rest = comment.substring(MetaData.META_FLAG.length());
 
                 int pos = rest.indexOf(':');

src/main/java/org/jabref/model/database/BibDatabase.java

@@ -169,46 +169,35 @@ public synchronized List<BibEntry> getEntriesByKey(String key) {
     }
 
     /**
-     * Inserts the entry, given that its ID is not already in use.
-     * use Util.createId(...) to make up a unique ID for an entry.
+     * Inserts the entry.
      *
-     * @param entry BibEntry to insert into the database
-     * @return false if the insert was done without a duplicate warning
-     * @throws KeyCollisionException thrown if the entry id ({@link BibEntry#getId()}) is already  present in the database
+     * @param entry entry to insert
      */
-    public synchronized boolean insertEntry(BibEntry entry) throws KeyCollisionException {
-        return insertEntry(entry, EntriesEventSource.LOCAL);
+    public synchronized void insertEntry(BibEntry entry) {
+        insertEntry(entry, EntriesEventSource.LOCAL);
     }
 
     /**
-     * Inserts the entry, given that its ID is not already in use.
-     * use Util.createId(...) to make up a unique ID for an entry.
+     * Inserts the entry.
      *
-     * @param entry BibEntry to insert
-     * @param eventSource Source the event is sent from
-     * @return false if the insert was done without a duplicate warning
+     * @param entry       entry to insert
+     * @param eventSource source the event is sent from
      */
-    public synchronized boolean insertEntry(BibEntry entry, EntriesEventSource eventSource) throws KeyCollisionException {
+    public synchronized void insertEntry(BibEntry entry, EntriesEventSource eventSource) {
         insertEntries(Collections.singletonList(entry), eventSource);
-        return entry.getCiteKeyOptional().map(this::isDuplicateCiteKeyExisting).orElse(false);
     }
 
-    public synchronized void insertEntries(BibEntry... entries) throws KeyCollisionException {
+    public synchronized void insertEntries(BibEntry... entries) {
         insertEntries(Arrays.asList(entries), EntriesEventSource.LOCAL);
     }
 
-    public synchronized void insertEntries(List<BibEntry> entries) throws KeyCollisionException {
+    public synchronized void insertEntries(List<BibEntry> entries) {
         insertEntries(entries, EntriesEventSource.LOCAL);
     }
 
-    public synchronized void insertEntries(List<BibEntry> newEntries, EntriesEventSource eventSource) throws KeyCollisionException {
+    public synchronized void insertEntries(List<BibEntry> newEntries, EntriesEventSource eventSource) {
         Objects.requireNonNull(newEntries);
         for (BibEntry entry : newEntries) {
-            String id = entry.getId();
-            if (containsEntryWithId(id)) {
-                throw new KeyCollisionException("ID is already in use, please choose another", id);
-            }
-
             entry.registerListener(this);
         }
         if (newEntries.isEmpty()) {