Merge remote-tracking branch 'upstream/master' into autofilelink

* upstream/master:
  Refactorings (#3370)

# Conflicts:
#	src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java
#	src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java

Author: Siedlerchr

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

@@ -31,7 +31,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
-import java.util.Vector;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.swing.AbstractAction;
@@ -973,11 +972,7 @@ private void createFileTypesCombobox() {
 
         List<FileFilter> fileFilterList = creatorManager.getFileFilterList();
 
-        Vector<FileFilter> vector = new Vector<>();
-        for (FileFilter fileFilter : fileFilterList) {
-            vector.add(fileFilter);
-        }
-        comboBoxFileTypeSelection = new JComboBox<>(vector);
+        comboBoxFileTypeSelection = new JComboBox<>(fileFilterList.toArray(new FileFilter[fileFilterList.size()]));
 
         comboBoxFileTypeSelection.setRenderer(new DefaultListCellRenderer() {
 
@@ -1009,16 +1004,15 @@ private void createEntryTypesCombobox() {
 
         Iterator<EntryType> iterator = EntryTypes
                 .getAllValues(frame.getCurrentBasePanel().getBibDatabaseContext().getMode()).iterator();
-        Vector<BibtexEntryTypeWrapper> list = new Vector<>();
+        List<BibtexEntryTypeWrapper> list = new ArrayList<>();
         list.add(
                 new BibtexEntryTypeWrapper(null));
         while (iterator.hasNext()) {
             list.add(new BibtexEntryTypeWrapper(iterator.next()));
         }
-        comboBoxEntryTypeSelection = new JComboBox<>(list);
+        comboBoxEntryTypeSelection = new JComboBox<>(list.toArray(new BibtexEntryTypeWrapper[list.size()]));
     }
 
-
     /**
      * Wrapper for displaying the Type {@link BibtexEntryType} in a Combobox.
      *
@@ -1030,7 +1024,6 @@ private static class BibtexEntryTypeWrapper {
 
         private final EntryType entryType;
 
-
         BibtexEntryTypeWrapper(EntryType bibtexType) {
             this.entryType = bibtexType;
         }
@@ -1053,7 +1046,6 @@ public static class CheckableTreeNode extends DefaultMutableTreeNode {
         private boolean isSelected;
         private final JCheckBox checkbox;
 
-
         public CheckableTreeNode(Object userObject) {
             super(userObject);
             checkbox = new JCheckBox();
@@ -1134,7 +1126,6 @@ public static class FileNodeWrapper {
         public final File file;
         public final int fileCount;
 
-
         public FileNodeWrapper(File aFile) {
             this(aFile, 0);
         }

src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java

@@ -1,7 +1,7 @@
 package org.jabref.gui.groups;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 import org.jabref.gui.undo.AbstractUndoableJabRefEdit;
 import org.jabref.model.groups.GroupTreeNode;
@@ -14,10 +14,9 @@ public class UndoableModifySubtree extends AbstractUndoableJabRefEdit {
     /** The path to the global groups root node */
     private final List<Integer> m_subtreeRootPath;
     /** This holds the new subtree (the root's modified children) to allow redo. */
-    private final List<GroupTreeNode> m_modifiedSubtree = new Vector<>();
+    private final List<GroupTreeNode> m_modifiedSubtree = new ArrayList<>();
     private final String m_name;
 
-
     /**
      *
      * @param subtree

src/main/java/org/jabref/model/search/matchers/MatcherSet.java

@@ -1,33 +1,33 @@
 package org.jabref.model.search.matchers;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Vector;
 
 import org.jabref.model.search.SearchMatcher;
 
 public abstract class MatcherSet implements SearchMatcher {
 
-    protected final List<SearchMatcher> matchers = new Vector<>();
+    protected final List<SearchMatcher> matchers = new ArrayList<>();
 
     @Override
     public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if ((o == null) || (getClass() != o.getClass())) {
             return false;
         }
 
         MatcherSet that = (MatcherSet) o;
 
-        return matchers.equals(that.matchers);
+        return Objects.equals(matchers, that.matchers);
 
     }
 
     @Override
     public int hashCode() {
-        return matchers.hashCode();
+        return Objects.hash(matchers);
     }
 
     public void addRule(SearchMatcher newRule) {