Fix Codacy Unused Params, Fields#3753
Merged
Merged
Conversation
Member
Author
|
on hold to mitigate merge conflicts in other PRs. |
Member
|
@LinusDietz You can also use the maintable-beta branch as the base for this PR. |
Member
|
Rebasing this on maintable-beta sounds like a fine idea! And if you want to do more Codacy PRs on master, just make sure that they are limited to model or logic. |
# Conflicts: # src/main/java/org/jabref/gui/IconTheme.java # src/main/java/org/jabref/gui/exporter/CustomExportDialog.java # src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java # src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java
Member
Author
|
@tobiasdiez I have merged maintable-beta into this to fix the conflicts. I think it can be merged now. The failing tests are the same as in the base branch. |
Member
|
You could just fix the one checkstyle issue in the ActionFactory (unused import) |
Member
Author
|
@Siedlerchr That was part of the base branch. I fixed it there. |
tobiasdiez
approved these changes
Mar 5, 2018
tobiasdiez
left a comment
Member
There was a problem hiding this comment.
Code looks good. +1 for merge. (I would have merged directly, but wasn't sure if you want to keep the separate commits or want to squash it)
Member
Author
|
I guess here we can squash them. |
Siedlerchr
added a commit
that referenced
this pull request
Mar 9, 2018
…drop * upstream/maintable-beta: (24 commits) Fixes #3796: Pretend that we have every translation for every key (#3820) adjust line wrapping on column replace open office install selection dialog with choice dialog Wrap error messages in fx executor (because abstract worker is swing thread) Convert swing error dialog in save db action to custom fx dialog Replace swing export dialog in ExportToClipboardAction with fx choices dlg run find fulltext dialog in fx thread fix cut, copy & paste action from toolbar Set resizable for custom dialog with dialog pane convert merge entries dlg to javafx and make action working again checkstyle argh! Update test order -> Execute checkstyle first (#3807) embed cleanup dialog in javafx Fix some non FX Thread issues Main drawback: Cleanup panel is in backgroung due to swing thread) Allow search field to be smaller Fix Codacy Unused Params, Fields (#3753) Dialogstojavafx (#3801) Remove unused import Add group coloring in maintable as replacement for marked entries (#3769) Enable travis build for maintable-beta (#3804) Remove setting of tooltip manually Change open last edited dialgo to javafx (#3800) ... # Conflicts: # src/main/java/org/jabref/gui/maintable/MainTable.java
Siedlerchr
added a commit
that referenced
this pull request
Mar 10, 2018
…tomjfx * upstream/maintable-beta: (28 commits) Fixes #3796: Pretend that we have every translation for every key (#3820) adjust line wrapping on column replace open office install selection dialog with choice dialog Wrap error messages in fx executor (because abstract worker is swing thread) Convert swing error dialog in save db action to custom fx dialog Replace swing export dialog in ExportToClipboardAction with fx choices dlg run find fulltext dialog in fx thread fix cut, copy & paste action from toolbar Set resizable for custom dialog with dialog pane convert merge entries dlg to javafx and make action working again checkstyle argh! Update test order -> Execute checkstyle first (#3807) embed cleanup dialog in javafx Fix some non FX Thread issues Main drawback: Cleanup panel is in backgroung due to swing thread) Allow search field to be smaller Fix Codacy Unused Params, Fields (#3753) Dialogstojavafx (#3801) Remove unused import Add group coloring in maintable as replacement for marked entries (#3769) Enable travis build for maintable-beta (#3804) Remove setting of tooltip manually Change open last edited dialgo to javafx (#3800) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
follow up of #3724