Fix Codacy Unused Params, Fields (#3753)

JabRef · Mar 5, 2018 · 2eee861 · 2eee861
1 parent 21355ab
commit 2eee861
Show file tree

Hide file tree

Showing 16 changed files with 59 additions and 183 deletions.
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
@@ -1920,8 +1920,6 @@ private class RedoAction implements BaseAction {
         @Override
         public void action() {
             try {
-
-                JComponent focused = Globals.getFocusListener().getFocused();
                 getUndoManager().redo();
                 markBaseChanged();
                 frame.output(Localization.lang("Redo"));

diff --git a/src/main/java/org/jabref/gui/IconTheme.java b/src/main/java/org/jabref/gui/IconTheme.java
@@ -51,19 +51,9 @@ public class IconTheme {
     private static final Map<String, String> KEY_TO_ICON = readIconThemeFile(
             IconTheme.class.getResource("/images/Icons.properties"), "/images/external/");
 
-    // Christmas edition
-    //public static final Color DEFAULT_COLOR = new Color(0x155115);
-    //public static final Color DEFAULT_DISABLED_COLOR = new Color(0x990000);
-    private static Font FONT_16;
-    private static javafx.scene.text.Font FX_FONT;
-
     static {
         try (InputStream stream = getMaterialDesignIconsStream()) {
             FONT = Font.createFont(Font.TRUETYPE_FONT, stream);
-            FONT_16 = FONT.deriveFont(Font.PLAIN, 16f);
-            try (InputStream stream2 = getMaterialDesignIconsStream()) {
-                FX_FONT = javafx.scene.text.Font.loadFont(stream2, JabRefPreferences.getInstance().getInt(JabRefPreferences.ICON_SIZE_LARGE));
-            }
         } catch (FontFormatException | IOException e) {
             LOGGER.warn("Error loading font", e);
         }
@@ -92,14 +82,14 @@ public static Image getJabRefImageFX() {
         return getImageFX("jabrefIcon48");
     }
 
-    /**
+    /*
      * Constructs an {@link Image} for the image representing the given function, in the resource
      * file listing images.
      *
      * @param name The name of the icon, such as "open", "save", "saveAs" etc.
      * @return The {@link Image} for the function.
      */
-    public static Image getImageFX(String name) {
+    private static Image getImageFX(String name) {
         return new Image(getIconUrl(name).toString());
     }
 

diff --git a/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
@@ -31,7 +31,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibtexString;
-import org.jabref.model.metadata.MetaData;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,7 +42,6 @@ public class ChangeScanner implements Runnable {
     private final File file;
     private final Path tempFile;
     private final BibDatabaseContext databaseInMemory;
-    private final MetaData metadataInMemory;
 
     private final BasePanel panel;
     private final JabRefFrame frame;
@@ -62,7 +60,6 @@ public ChangeScanner(JabRefFrame frame, BasePanel bp, File file, Path tempFile)
         this.panel = bp;
         this.frame = frame;
         this.databaseInMemory = bp.getDatabaseContext();
-        this.metadataInMemory = bp.getBibDatabaseContext().getMetaData();
         this.file = file;
         this.tempFile = tempFile;
     }
@@ -136,7 +133,7 @@ public void run() {
             // Start looking at changes.
             BibDatabaseDiff differences = BibDatabaseDiff.compare(databaseInTemp, databaseOnDisk);
             differences.getMetaDataDifferences().ifPresent(diff -> {
-                changes.add(new MetaDataChangeViewModel(metadataInMemory, diff));
+                changes.add(new MetaDataChangeViewModel(diff));
                 diff.getGroupDifferences().ifPresent(groupDiff -> changes.add(new GroupChangeViewModel(groupDiff)));
             });
             differences.getPreambleDifferences().ifPresent(diff -> changes.add(new PreambleChangeViewModel(databaseInMemory.getDatabase().getPreamble().orElse(""), diff)));

diff --git a/src/main/java/org/jabref/gui/collab/MetaDataChangeViewModel.java b/src/main/java/org/jabref/gui/collab/MetaDataChangeViewModel.java
@@ -10,19 +10,14 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.metadata.MetaData;
 
-/**
- *
- */
 class MetaDataChangeViewModel extends ChangeViewModel {
 
     private final InfoPane infoPane = new InfoPane();
     private final JScrollPane sp = new JScrollPane(infoPane);
-    private final MetaData originalMetaData;
     private final MetaData newMetaData;
 
-    public MetaDataChangeViewModel(MetaData originalMetaData, MetaDataDiff metaDataDiff) {
+    public MetaDataChangeViewModel(MetaDataDiff metaDataDiff) {
         super(Localization.lang("Metadata change"));
-        this.originalMetaData = originalMetaData;
         this.newMetaData = metaDataDiff.getNewMetaData();
 
         infoPane.setText("<html>" + Localization.lang("Metadata change") + "</html>");

diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.Optional;
-
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
@@ -18,9 +16,10 @@
 
 public class JournalEditor extends HBox implements FieldEditorFX {
 
-    @FXML private JournalEditorViewModel viewModel;
-    @FXML private EditorTextArea textArea;
-    private Optional<BibEntry> entry;
+    @FXML
+    private JournalEditorViewModel viewModel;
+    @FXML
+    private EditorTextArea textArea;
 
     public JournalEditor(String fieldName, JournalAbbreviationLoader journalAbbreviationLoader, JabRefPreferences preferences, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         this.viewModel = new JournalEditorViewModel(fieldName, suggestionProvider, journalAbbreviationLoader, preferences.getJournalAbbreviationPreferences(), fieldCheckers);
@@ -41,7 +40,6 @@ public JournalEditorViewModel getViewModel() {
 
     @Override
     public void bindToEntry(BibEntry entry) {
-        this.entry = Optional.of(entry);
         viewModel.bindToEntry(entry);
     }
 
@@ -51,7 +49,7 @@ public Parent getNode() {
     }
 
     @FXML
-    private void toggleAbbreviation(ActionEvent event) {
+    private void toggleAbbreviation(ActionEvent unused) {
         viewModel.toggleAbbreviation();
     }
 }
diff --git a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
@@ -73,7 +73,7 @@ public class FileListEntryEditor {
     private final JComboBox<ExternalFileType> types;
     private final JProgressBar prog = new JProgressBar(SwingConstants.HORIZONTAL);
     private final JLabel downloadLabel = new JLabel(Localization.lang("Downloading..."));
-    private JDialog diag;
+    private JDialog dialog;
     //Do not make this variable final, as then the lambda action listener will fail on compile
     private JabRefFrame frame;
     private boolean showSaveDialog;
@@ -142,7 +142,7 @@ public FileListEntryEditor(LinkedFile entry, boolean showProgressBar, boolean sh
                     return;
                 }
             }
-            diag.dispose();
+            dialog.dispose();
             storeSettings(FileListEntryEditor.this.entry);
             okPressed = true;
         };
@@ -198,7 +198,7 @@ public FileListEntryEditor(LinkedFile entry, boolean showProgressBar, boolean sh
 
             @Override
             public void actionPerformed(ActionEvent e) {
-                diag.dispose();
+                dialog.dispose();
             }
         };
         cancel.addActionListener(cancelAction);
@@ -228,13 +228,13 @@ public void changedUpdate(DocumentEvent documentEvent) {
 
         });
 
-        diag = new JDialog();
-        diag.setTitle(Localization.lang("Select files"));
-        diag.setModal(true);
-        diag.getContentPane().add(builder.getPanel(), BorderLayout.CENTER);
-        diag.getContentPane().add(bb.getPanel(), BorderLayout.SOUTH);
-        diag.pack();
-        diag.addWindowListener(new WindowAdapter() {
+        dialog = new JDialog();
+        dialog.setTitle(Localization.lang("Select files"));
+        dialog.setModal(true);
+        dialog.getContentPane().add(builder.getPanel(), BorderLayout.CENTER);
+        dialog.getContentPane().add(bb.getPanel(), BorderLayout.SOUTH);
+        dialog.pack();
+        dialog.addWindowListener(new WindowAdapter() {
 
             @Override
             public void windowActivated(WindowEvent event) {
@@ -314,12 +314,12 @@ public void setVisible(boolean visible, boolean openBrowse) {
         } else {
             title = Localization.lang("Select files");
         }
-        diag.setTitle(title);
-        diag.setVisible(visible);
+        dialog.setTitle(title);
+        dialog.setVisible(visible);
     }
 
     public boolean isVisible() {
-        return (diag != null) && diag.isVisible();
+        return (dialog != null) && dialog.isVisible();
     }
 
     private void setValues(LinkedFile entry) {

diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
@@ -25,7 +25,6 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.groups.AbstractGroup;
@@ -139,7 +138,7 @@ public void addNewSubgroup(GroupNodeViewModel parent) {
         SwingUtilities.invokeLater(() -> {
             Optional<AbstractGroup> newGroup = dialogService.showCustomDialogAndWait(new GroupDialog());
             newGroup.ifPresent(group -> {
-                GroupTreeNode newGroupNode = parent.addSubgroup(group);
+                parent.addSubgroup(group);
 
                 // TODO: Add undo
                 //UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(parent, new GroupTreeNodeViewModel(newGroupNode), UndoableAddOrRemoveGroup.ADD_NODE);
@@ -176,7 +175,7 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                     boolean removePreviousAssignents = (oldGroup.getGroupNode().getGroup() instanceof ExplicitGroup)
                             && (group instanceof ExplicitGroup);
 
-                    List<FieldChange> addChange = oldGroup.getGroupNode().setGroup(
+                    oldGroup.getGroupNode().setGroup(
                             group,
                             keepPreviousAssignments,
                             removePreviousAssignents,
@@ -262,7 +261,7 @@ public void removeGroupAndSubgroups(GroupNodeViewModel group) {
     }
 
     void removeGroupsAndSubGroupsFromEntries(GroupNodeViewModel group) {
-        for (GroupNodeViewModel child: group.getChildren()) {
+        for (GroupNodeViewModel child : group.getChildren()) {
             removeGroupsAndSubGroupsFromEntries(child);
         }
 
@@ -278,7 +277,7 @@ public void addSelectedEntries(GroupNodeViewModel group) {
         // if (!WarnAssignmentSideEffects.warnAssignmentSideEffects(node.getNode().getGroup(), panel.frame())) {
         //    return; // user aborted operation
 
-        List<FieldChange> addChange = group.getGroupNode().addEntriesToGroup(stateManager.getSelectedEntries());
+        group.getGroupNode().addEntriesToGroup(stateManager.getSelectedEntries());
 
         // TODO: Add undo
         // NamedCompound undoAll = new NamedCompound(Localization.lang("change assignment of entries"));
@@ -306,7 +305,7 @@ public void removeSelectedEntries(GroupNodeViewModel group) {
         // if (!WarnAssignmentSideEffects.warnAssignmentSideEffects(mNode.getNode().getGroup(), mPanel.frame())) {
         //    return; // user aborted operation
 
-        List<FieldChange> removeChange = group.getGroupNode().removeEntriesFromGroup(stateManager.getSelectedEntries());
+        group.getGroupNode().removeEntriesFromGroup(stateManager.getSelectedEntries());
 
         // TODO: Add undo
         // if (!undo.isEmpty()) {
@@ -315,6 +314,5 @@ public void removeSelectedEntries(GroupNodeViewModel group) {
 
     public void sortAlphabeticallyRecursive(GroupNodeViewModel group) {
         group.getGroupNode().sortChildren(compAlphabetIgnoreCase, true);
-
     }
 }
diff --git a/src/main/java/org/jabref/gui/groups/UndoableModifyGroup.java b/src/main/java/org/jabref/gui/groups/UndoableModifyGroup.java