Skip to content
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

Fix Codacy Unused Params, Fields #3753

Merged
merged 20 commits into from
Mar 5, 2018
Merged

Conversation

LinusDietz
Copy link
Member

follow up of #3724

@LinusDietz LinusDietz added status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers type: code-quality Issues related to code or architecture decisions labels Feb 20, 2018
@LinusDietz
Copy link
Member Author

on hold to mitigate merge conflicts in other PRs.

@LinusDietz LinusDietz added after-migration-to-javafx and removed status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers labels Feb 20, 2018
@tobiasdiez
Copy link
Member

@LinusDietz You can also use the maintable-beta branch as the base for this PR.

@lenhard
Copy link
Member

lenhard commented Feb 21, 2018

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.

@LinusDietz LinusDietz changed the base branch from master to maintable-beta February 21, 2018 10:50
# 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
@LinusDietz LinusDietz added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Mar 5, 2018
@LinusDietz
Copy link
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.

@Siedlerchr
Copy link
Member

You could just fix the one checkstyle issue in the ActionFactory (unused import)

@LinusDietz
Copy link
Member Author

@Siedlerchr That was part of the base branch. I fixed it there.

Copy link
Member

@tobiasdiez tobiasdiez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)

@LinusDietz
Copy link
Member Author

I guess here we can squash them.

@LinusDietz LinusDietz merged commit 2eee861 into maintable-beta Mar 5, 2018
@LinusDietz LinusDietz deleted the fix-codacy-unused branch March 5, 2018 15:21
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)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers type: code-quality Issues related to code or architecture decisions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants