Refactor: use strict types, toList, List.of, remove unused variables and exceptions, convert ifs to switch, etc. (#13178)

Signed-off-by: subhramit <[email protected]>

Author: subhramit

jabgui/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import javax.swing.undo.UndoManager;
 
@@ -75,10 +76,10 @@ private void notifyOnChange(List<DatabaseChange> changes) {
         notificationPane.notify(
                 IconTheme.JabRefIcons.SAVE.getGraphicNode(),
                 Localization.lang("The library has been modified by another program."),
-                List.of(new Action(Localization.lang("Dismiss changes"), event -> notificationPane.hide()),
-                        new Action(Localization.lang("Review changes"), event -> {
+                List.of(new Action(Localization.lang("Dismiss changes"), _ -> notificationPane.hide()),
+                        new Action(Localization.lang("Review changes"), _ -> {
                             DatabaseChangesResolverDialog databaseChangesResolverDialog = new DatabaseChangesResolverDialog(changes, database, Localization.lang("External Changes Resolver"));
-                            var areAllChangesResolved = dialogService.showCustomDialogAndWait(databaseChangesResolverDialog);
+                            Optional<Boolean> areAllChangesResolved = dialogService.showCustomDialogAndWait(databaseChangesResolverDialog);
                             saveState = stateManager.activeTabProperty().get().get();
                             final NamedCompound ce = new NamedCompound(Localization.lang("Merged external changes"));
                             changes.stream().filter(DatabaseChange::isAccepted).forEach(change -> change.applyChange(ce));

jabgui/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java

@@ -50,7 +50,7 @@ public static Optional<ParserResult> showRestoreBackupDialog(DialogService dialo
                                                                  FileUpdateMonitor fileUpdateMonitor,
                                                                  UndoManager undoManager,
                                                                  StateManager stateManager) {
-        var actionOpt = showBackupResolverDialog(
+        Optional<ButtonType> actionOpt = showBackupResolverDialog(
                 dialogService,
                 preferences.getExternalApplicationsPreferences(),
                 originalPath,
@@ -100,7 +100,7 @@ private static Optional<ParserResult> showReviewBackupDialog(
                         changes,
                         originalDatabase, "Review Backup"
                 );
-                var allChangesResolved = dialogService.showCustomDialogAndWait(reviewBackupDialog);
+                Optional<Boolean> allChangesResolved = dialogService.showCustomDialogAndWait(reviewBackupDialog);
                 LibraryTab saveState = stateManager.activeTabProperty().get().get();
                 final NamedCompound CE = new NamedCompound(Localization.lang("Merged external changes"));
                 changes.stream().filter(DatabaseChange::isAccepted).forEach(change -> change.applyChange(CE));

jabgui/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java

@@ -169,7 +169,7 @@ public List<ImportFilesResultItemViewModel> call() {
                                 });
                             }
                         } else if (FileUtil.isBibFile(file)) {
-                            var bibtexParserResult = contentImporter.importFromBibFile(file, fileUpdateMonitor);
+                            ParserResult bibtexParserResult = contentImporter.importFromBibFile(file, fileUpdateMonitor);
                             List<BibEntry> entries = bibtexParserResult.getDatabaseContext().getEntries();
                             entriesToAdd.addAll(entries);
                             boolean success = !bibtexParserResult.hasWarnings();
@@ -207,7 +207,7 @@ public List<ImportFilesResultItemViewModel> call() {
             }
 
             private void addResultToList(Path newFile, boolean success, String logMessage) {
-                var result = new ImportFilesResultItemViewModel(newFile, success, logMessage);
+                ImportFilesResultItemViewModel result = new ImportFilesResultItemViewModel(newFile, success, logMessage);
                 results.add(result);
             }
         };

jabgui/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java

@@ -78,7 +78,7 @@ public class GroupNodeViewModel {
     @SuppressWarnings("FieldCanBeLocal")
     private final ObservableList<BibEntry> entriesList;
     @SuppressWarnings("FieldCanBeLocal")
-    private final InvalidationListener onInvalidatedGroup = listener -> refreshGroup();
+    private final InvalidationListener onInvalidatedGroup = _ -> refreshGroup();
 
     public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager stateManager, TaskExecutor taskExecutor, GroupTreeNode groupNode, CustomLocalDragboard localDragBoard, GuiPreferences preferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
@@ -111,9 +111,9 @@ public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager state
 
         hasChildren = new SimpleBooleanProperty();
         hasChildren.bind(Bindings.isNotEmpty(children));
-        EasyBind.subscribe(preferences.getGroupsPreferences().displayGroupCountProperty(), shouldDisplay -> updateMatchedEntries());
+        EasyBind.subscribe(preferences.getGroupsPreferences().displayGroupCountProperty(), _ -> updateMatchedEntries());
         expandedProperty.set(groupNode.getGroup().isExpanded());
-        expandedProperty.addListener((observable, oldValue, newValue) -> groupNode.getGroup().setExpanded(newValue));
+        expandedProperty.addListener((_, _, newValue) -> groupNode.getGroup().setExpanded(newValue));
 
         // Register listener
         // The wrapper created by the FXCollections will set a weak listener on the wrapped list. This weak listener gets garbage collected. Hence, we need to maintain a reference to this list.
@@ -147,7 +147,7 @@ public List<FieldChange> addEntriesToGroup(List<BibEntry> entries) {
         //    return; // user aborted operation
         // }
 
-        var changes = groupNode.addEntriesToGroup(entries);
+        List<FieldChange> changes = groupNode.addEntriesToGroup(entries);
 
         // Update appearance of group
         anySelectedEntriesMatched.invalidate();

jabgui/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java

@@ -60,7 +60,7 @@ public void initialize() {
                 .install(labelColumn, new DefaultStringConverter());
         labelColumn.setOnEditCommit((TableColumn.CellEditEvent<ConstantsItemModel, String> cellEvent) -> {
 
-            var tableView = cellEvent.getTableView();
+            TableView<ConstantsItemModel> tableView = cellEvent.getTableView();
             ConstantsItemModel cellItem = tableView.getItems()
                                                    .get(cellEvent.getTablePosition().getRow());
 
@@ -77,7 +77,7 @@ public void initialize() {
 
             // Resort the entries based on the keys and set the focus to the newly-created entry
             viewModel.resortStrings();
-            var selectionModel = tableView.getSelectionModel();
+            TableView.TableViewSelectionModel<ConstantsItemModel> selectionModel = tableView.getSelectionModel();
             selectionModel.select(cellItem);
             selectionModel.focus(selectionModel.getSelectedIndex());
             tableView.refresh();
@@ -97,9 +97,9 @@ public void initialize() {
         actionsColumn.setReorderable(false);
         actionsColumn.setCellValueFactory(cellData -> cellData.getValue().labelProperty());
         new ValueTableCellFactory<ConstantsItemModel, String>()
-                .withGraphic(label -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
+                .withGraphic(_ -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withTooltip(label -> Localization.lang("Remove string %0", label))
-                .withOnMouseClickedEvent(item -> evt ->
+                .withOnMouseClickedEvent(_ -> _ ->
                         viewModel.removeString(stringsList.getFocusModel().getFocusedItem()))
                 .install(actionsColumn);
 

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

@@ -88,7 +88,7 @@ public BibEntry getEntry() {
 
     private static Binding<List<AbstractGroup>> createMatchedGroupsBinding(BibDatabaseContext database, BibEntry entry) {
         return new UiThreadBinding<>(EasyBind.combine(entry.getFieldBinding(StandardField.GROUPS), database.getMetaData().groupsBinding(),
-                (a, b) ->
+                (_, _) ->
                         database.getMetaData().getGroups().map(groupTreeNode ->
                                         groupTreeNode.getMatchingGroups(entry).stream()
                                                      .map(GroupTreeNode::getGroup)
@@ -119,7 +119,7 @@ public ObservableValue<Optional<SpecialFieldValueViewModel>> getSpecialField(Spe
         Optional<String> currentValue = this.entry.getField(field);
         if (value != null) {
             if (currentValue.isEmpty() && value.getValue().isEmpty()) {
-                var zeroValue = getField(field).flatMapOpt(fieldValue -> field.parseValue("CLEAR_RANK").map(SpecialFieldValueViewModel::new));
+                OptionalBinding<SpecialFieldValueViewModel> zeroValue = getField(field).flatMapOpt(_ -> field.parseValue("CLEAR_RANK").map(SpecialFieldValueViewModel::new));
                 specialFieldValues.put(field, zeroValue);
                 return zeroValue;
             } else if (value.getValue().isEmpty() || !value.getValue().get().getValue().getFieldValue().equals(currentValue)) {

jabgui/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java

@@ -18,7 +18,7 @@ public PersonsNameFieldRowView(Field field, BibEntry leftEntry, BibEntry rightEn
         super(field, leftEntry, rightEntry, mergedEntry, fieldMergerFactory, preferences, rowIndex);
         assert field.getProperties().contains(FieldProperty.PERSON_NAMES);
 
-        var authorsParser = new AuthorListParser();
+        AuthorListParser authorsParser = new AuthorListParser();
         leftEntryNames = authorsParser.parse(viewModel.getLeftFieldValue());
         rightEntryNames = authorsParser.parse(viewModel.getRightFieldValue());
 

jabgui/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java

@@ -379,7 +379,7 @@ protected List<Path> call() {
                 }
             };
 
-            taskConnectIfInstalled.setOnSucceeded(evt -> {
+            taskConnectIfInstalled.setOnSucceeded(_ -> {
                 List<Path> installations = new ArrayList<>(taskConnectIfInstalled.getValue());
                 if (installations.isEmpty()) {
                     officeInstallation.selectInstallationPath().ifPresent(installations::add);
@@ -398,7 +398,7 @@ protected List<Path> call() {
     }
 
     private void connectManually() {
-        var fileDialogConfiguration = new DirectoryDialogConfiguration.Builder().withInitialDirectory(System.getProperty("user.home")).build();
+        DirectoryDialogConfiguration fileDialogConfiguration = new DirectoryDialogConfiguration.Builder().withInitialDirectory(System.getProperty("user.home")).build();
         Optional<Path> selectedPath = dialogService.showDirectorySelectionDialog(fileDialogConfiguration);
 
         DetectOpenOfficeInstallation officeInstallation = new DetectOpenOfficeInstallation(openOfficePreferences, dialogService);

jabgui/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTab.java

@@ -106,7 +106,7 @@ private void setupEntryTypesTable() {
         entryTypeActionsColumn.setReorderable(false);
         entryTypeActionsColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().entryType().get().getType().getDisplayName()));
         new ValueTableCellFactory<EntryTypeViewModel, String>()
-                .withGraphic((type, name) -> {
+                .withGraphic((type, _) -> {
                     if (type instanceof CustomEntryTypeViewModel) {
                         return IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode();
                     } else {
@@ -120,11 +120,11 @@ private void setupEntryTypesTable() {
                         return null;
                     }
                 })
-                .withOnMouseClickedEvent((type, name) -> {
+                .withOnMouseClickedEvent((type, _) -> {
                     if (type instanceof CustomEntryTypeViewModel) {
-                        return evt -> viewModel.removeEntryType(entryTypesTable.getSelectionModel().getSelectedItem());
+                        return _ -> viewModel.removeEntryType(entryTypesTable.getSelectionModel().getSelectedItem());
                     } else {
-                        return evt -> {
+                        return _ -> {
                         };
                     }
                 })
@@ -135,7 +135,7 @@ private void setupEntryTypesTable() {
 
         EasyBind.subscribe(viewModel.selectedEntryTypeProperty(), type -> {
             if (type != null) {
-                var items = type.fields();
+                ObservableList<FieldViewModel> items = type.fields();
                 fields.setItems(items);
             } else {
                 fields.setItems(null);
@@ -185,9 +185,9 @@ private void setupFieldsTable() {
         fieldTypeActionColumn.setCellValueFactory(cellData -> cellData.getValue().displayNameProperty());
 
         new ValueTableCellFactory<FieldViewModel, String>()
-                .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
+                .withGraphic(_ -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withTooltip(name -> Localization.lang("Remove field %0 from currently selected entry type", name))
-                .withOnMouseClickedEvent(item -> evt -> viewModel.removeField(fields.getSelectionModel().getSelectedItem()))
+                .withOnMouseClickedEvent(_ -> _ -> viewModel.removeField(fields.getSelectionModel().getSelectedItem()))
                 .install(fieldTypeActionColumn);
 
         new ViewModelTableRowFactory<FieldViewModel>()

jabgui/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModel.java

@@ -125,7 +125,7 @@ public void storeSettings() {
             entryTypesManager.update(newType, bibDatabaseMode);
         }
 
-        for (var entryType : entryTypesToDelete) {
+        for (BibEntryType entryType : entryTypesToDelete) {
             entryTypesManager.removeCustomOrModifiedEntryType(entryType, bibDatabaseMode);
         }