Skip to content

Commit 1e16b17

Browse files
committed
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
2 parents fff82ea + 4178789 commit 1e16b17

File tree

3 files changed

+10
-20
lines changed

3 files changed

+10
-20
lines changed

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import java.util.LinkedList;
3232
import java.util.List;
3333
import java.util.Optional;
34-
import java.util.Vector;
3534
import java.util.concurrent.atomic.AtomicBoolean;
3635

3736
import javax.swing.AbstractAction;
@@ -973,11 +972,7 @@ private void createFileTypesCombobox() {
973972

974973
List<FileFilter> fileFilterList = creatorManager.getFileFilterList();
975974

976-
Vector<FileFilter> vector = new Vector<>();
977-
for (FileFilter fileFilter : fileFilterList) {
978-
vector.add(fileFilter);
979-
}
980-
comboBoxFileTypeSelection = new JComboBox<>(vector);
975+
comboBoxFileTypeSelection = new JComboBox<>(fileFilterList.toArray(new FileFilter[fileFilterList.size()]));
981976

982977
comboBoxFileTypeSelection.setRenderer(new DefaultListCellRenderer() {
983978

@@ -1009,16 +1004,15 @@ private void createEntryTypesCombobox() {
10091004

10101005
Iterator<EntryType> iterator = EntryTypes
10111006
.getAllValues(frame.getCurrentBasePanel().getBibDatabaseContext().getMode()).iterator();
1012-
Vector<BibtexEntryTypeWrapper> list = new Vector<>();
1007+
List<BibtexEntryTypeWrapper> list = new ArrayList<>();
10131008
list.add(
10141009
new BibtexEntryTypeWrapper(null));
10151010
while (iterator.hasNext()) {
10161011
list.add(new BibtexEntryTypeWrapper(iterator.next()));
10171012
}
1018-
comboBoxEntryTypeSelection = new JComboBox<>(list);
1013+
comboBoxEntryTypeSelection = new JComboBox<>(list.toArray(new BibtexEntryTypeWrapper[list.size()]));
10191014
}
10201015

1021-
10221016
/**
10231017
* Wrapper for displaying the Type {@link BibtexEntryType} in a Combobox.
10241018
*
@@ -1030,7 +1024,6 @@ private static class BibtexEntryTypeWrapper {
10301024

10311025
private final EntryType entryType;
10321026

1033-
10341027
BibtexEntryTypeWrapper(EntryType bibtexType) {
10351028
this.entryType = bibtexType;
10361029
}
@@ -1053,7 +1046,6 @@ public static class CheckableTreeNode extends DefaultMutableTreeNode {
10531046
private boolean isSelected;
10541047
private final JCheckBox checkbox;
10551048

1056-
10571049
public CheckableTreeNode(Object userObject) {
10581050
super(userObject);
10591051
checkbox = new JCheckBox();
@@ -1134,7 +1126,6 @@ public static class FileNodeWrapper {
11341126
public final File file;
11351127
public final int fileCount;
11361128

1137-
11381129
public FileNodeWrapper(File aFile) {
11391130
this(aFile, 0);
11401131
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jabref.gui.groups;
22

3+
import java.util.ArrayList;
34
import java.util.List;
4-
import java.util.Vector;
55

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

20-
2120
/**
2221
*
2322
* @param subtree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
package org.jabref.model.search.matchers;
22

3+
import java.util.ArrayList;
34
import java.util.List;
45
import java.util.Objects;
5-
import java.util.Vector;
66

77
import org.jabref.model.search.SearchMatcher;
88

99
public abstract class MatcherSet implements SearchMatcher {
1010

11-
protected final List<SearchMatcher> matchers = new Vector<>();
11+
protected final List<SearchMatcher> matchers = new ArrayList<>();
1212

1313
@Override
1414
public boolean equals(Object o) {
1515
if (this == o) {
1616
return true;
1717
}
18-
if (o == null || getClass() != o.getClass()) {
18+
if ((o == null) || (getClass() != o.getClass())) {
1919
return false;
2020
}
2121

2222
MatcherSet that = (MatcherSet) o;
2323

24-
return matchers.equals(that.matchers);
24+
return Objects.equals(matchers, that.matchers);
2525

2626
}
2727

2828
@Override
2929
public int hashCode() {
30-
return matchers.hashCode();
30+
return Objects.hash(matchers);
3131
}
3232

3333
public void addRule(SearchMatcher newRule) {

0 commit comments

Comments
 (0)