Skip to content

Fix Some Codacy Issues #3724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 15, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/main/java/org/jabref/gui/PreviewPanel.java
Original file line number Diff line number Diff line change
@@ -57,7 +57,6 @@ public class PreviewPanel extends ScrollPane implements SearchQueryHighlightList
*/
private Optional<BibEntry> bibEntry = Optional.empty();

private Optional<Pattern> highlightPattern = Optional.empty();
/**
* If a database is set, the preview will attempt to resolve strings in the previewed entry using that database.
*/
@@ -265,7 +264,6 @@ private void setPreviewLabel(String text) {
@Override
public void highlightPattern(Optional<Pattern> newPattern) {
// TODO: Implement that search phrases are highlighted
this.highlightPattern = newPattern;
update();
}

Original file line number Diff line number Diff line change
@@ -67,6 +67,6 @@ public void populateContextMenu(ContextMenu contextMenu) {

@Override
public void initialize(URL location, ResourceBundle resources) {

// not needed
}
}
14 changes: 7 additions & 7 deletions src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
Original file line number Diff line number Diff line change
@@ -53,20 +53,20 @@ public static FieldEditorFX getForField(String fieldName, TaskExecutor taskExecu
} else if (fieldExtras.contains(FieldProperty.FILE_EDITOR)) {
return new LinkedFilesEditor(fieldName, dialogService, databaseContext, taskExecutor, suggestionProvider, fieldCheckers);
} else if (fieldExtras.contains(FieldProperty.YES_NO)) {
return new OptionEditor<>(fieldName, new YesNoEditorViewModel(fieldName, suggestionProvider, fieldCheckers));
return new OptionEditor<>(new YesNoEditorViewModel(fieldName, suggestionProvider, fieldCheckers));
} else if (fieldExtras.contains(FieldProperty.MONTH)) {
return new OptionEditor<>(fieldName, new MonthEditorViewModel(fieldName, suggestionProvider, databaseContext.getMode(), fieldCheckers));
return new OptionEditor<>(new MonthEditorViewModel(fieldName, suggestionProvider, databaseContext.getMode(), fieldCheckers));
} else if (fieldExtras.contains(FieldProperty.GENDER)) {
return new OptionEditor<>(fieldName, new GenderEditorViewModel(fieldName, suggestionProvider, fieldCheckers));
return new OptionEditor<>(new GenderEditorViewModel(fieldName, suggestionProvider, fieldCheckers));
} else if (fieldExtras.contains(FieldProperty.EDITOR_TYPE)) {
return new OptionEditor<>(fieldName, new EditorTypeEditorViewModel(fieldName, suggestionProvider, fieldCheckers));
return new OptionEditor<>(new EditorTypeEditorViewModel(fieldName, suggestionProvider, fieldCheckers));
} else if (fieldExtras.contains(FieldProperty.PAGINATION)) {
return new OptionEditor<>(fieldName, new PaginationEditorViewModel(fieldName, suggestionProvider, fieldCheckers));
return new OptionEditor<>(new PaginationEditorViewModel(fieldName, suggestionProvider, fieldCheckers));
} else if (fieldExtras.contains(FieldProperty.TYPE)) {
if ("patent".equalsIgnoreCase(entryType)) {
return new OptionEditor<>(fieldName, new PatentTypeEditorViewModel(fieldName, suggestionProvider, fieldCheckers));
return new OptionEditor<>(new PatentTypeEditorViewModel(fieldName, suggestionProvider, fieldCheckers));
} else {
return new OptionEditor<>(fieldName, new TypeEditorViewModel(fieldName, suggestionProvider, fieldCheckers));
return new OptionEditor<>(new TypeEditorViewModel(fieldName, suggestionProvider, fieldCheckers));
}
} else if (fieldExtras.contains(FieldProperty.SINGLE_ENTRY_LINK) || fieldExtras.contains(FieldProperty.MULTIPLE_ENTRY_LINK)) {
return new LinkedEntriesEditor(fieldName, databaseContext, suggestionProvider, fieldCheckers);
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ public class OptionEditor<T> extends HBox implements FieldEditorFX {
@FXML private OptionEditorViewModel<T> viewModel;
@FXML private ComboBox<T> comboBox;

public OptionEditor(String fieldName, OptionEditorViewModel<T> viewModel) {
public OptionEditor(OptionEditorViewModel<T> viewModel) {
this.viewModel = viewModel;

ControlHelper.loadFXMLForControl(this);
8 changes: 4 additions & 4 deletions src/main/java/org/jabref/gui/fieldeditors/TextArea.java
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ public void setFieldName(String newName) {

@Override
public void setBackground(Color color) {

//not needed
}

@Override
@@ -124,12 +124,12 @@ public void setText(String newText) {

@Override
public void append(String text) {

// not needed
}

@Override
public void setEnabled(boolean enabled) {

// not needed
}

@Override
@@ -156,6 +156,6 @@ public void redo() {

@Override
public void requestFocus() {

// not needed
}
}
Original file line number Diff line number Diff line change
@@ -9,14 +9,12 @@
import java.util.List;
import java.util.function.Consumer;

import javax.swing.Icon;
import javax.swing.JTree;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
import javax.swing.undo.AbstractUndoableEdit;
import javax.swing.undo.UndoManager;

import org.jabref.gui.IconTheme;
import org.jabref.gui.undo.CountingUndoManager;
import org.jabref.model.FieldChange;
import org.jabref.model.entry.BibEntry;
@@ -33,11 +31,8 @@

public class GroupTreeNodeViewModel implements Transferable, TreeNode {

public static final DataFlavor FLAVOR;
private static final DataFlavor FLAVOR;
private static final Logger LOGGER = LoggerFactory.getLogger(GroupTreeNodeViewModel.class);
private static final Icon GROUP_REFINING_ICON = IconTheme.JabRefIcon.GROUP_REFINING.getSmallIcon();
private static final Icon GROUP_INCLUDING_ICON = IconTheme.JabRefIcon.GROUP_INCLUDING.getSmallIcon();
private static final Icon GROUP_REGULAR_ICON = null;
private static final DataFlavor[] FLAVORS;

static {
2 changes: 0 additions & 2 deletions src/main/java/org/jabref/gui/search/SearchResultFrame.java
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@

import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Rectangle;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ComponentAdapter;
@@ -101,7 +100,6 @@ public class SearchResultFrame {

private final JSplitPane contentPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);

private final Rectangle toRect = new Rectangle(0, 0, 1, 1);
private final EventList<BibEntry> entries = new BasicEventList<>();

private final Map<BibEntry, BasePanel> entryHome = new HashMap<>();
4 changes: 2 additions & 2 deletions src/main/java/org/jabref/logic/exporter/GroupSerializer.java
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
import org.jabref.model.strings.StringUtil;

public class GroupSerializer {
private static String serializeAllEntriesGroup(AllEntriesGroup group) {
private static String serializeAllEntriesGroup() {
return MetadataSerializationConfiguration.ALL_ENTRIES_GROUP_ID;
}

@@ -115,7 +115,7 @@ public List<String> serializeTree(GroupTreeNode node) {

private String serializeGroup(AbstractGroup group) {
if (group instanceof AllEntriesGroup) {
return serializeAllEntriesGroup((AllEntriesGroup)group);
return serializeAllEntriesGroup();
} else if (group instanceof ExplicitGroup) {
return serializeExplicitGroup((ExplicitGroup)group);
} else if (group instanceof KeywordGroup) {
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@
public class FieldContentParserTest {

private FieldContentParser parser;
private FieldContentParserPreferences prefs;


@BeforeEach
public void setUp() throws Exception {
prefs = new FieldContentParserPreferences(Collections.emptyList());
FieldContentParserPreferences prefs = new FieldContentParserPreferences(Collections.emptyList());
parser = new FieldContentParser(prefs);
}