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.

Sign up for GitHub

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

Jump to bottom

Convert "From Aux file" dialog to JavaFX #4607

Merged
merged 1 commit into from
Jan 24, 2019
Merged

Convert "From Aux file" dialog to JavaFX #4607

merged 1 commit into from
Jan 24, 2019

Conversation

tobiasdiez
Copy link
Member

image

  • Change in CHANGELOG.md described
  • Tests created for changes
  • Manually tested changed features in running JabRef
  • Screenshots added in PR description (for bigger UI changes)
  • Ensured that the git commit message is a good one
  • Check documentation status (Issue created for outdated help page at help.jabref.org?)

@tobiasdiez tobiasdiez added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jan 23, 2019
Siedlerchr
Siedlerchr reviewed Jan 24, 2019
View reviewed changes
src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
BibDatabase refBase = bp.getDatabase();
notFoundList.getItems().clear();
statusInfos.setText("");
BibDatabase refBase = basePanel.getDatabase();
String auxName = auxFileField.getText();

if ((auxName != null) && (refBase != null) && !auxName.isEmpty()) {
AuxParser auxParser = new DefaultAuxParser(refBase);
auxParserResult = auxParser.parse(Paths.get(auxName));
Copy link
Member

Choose a reason for hiding this comment

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

shoudn't this be implemented in the view model?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, I went for the low-implementation-cost solution and didn't separate the logic from the view. Let's do this later and for now get rid of the remaining swing dialogs.

@tobiasdiez tobiasdiez merged commit b66fa42 into master Jan 24, 2019
@tobiasdiez tobiasdiez deleted the convertFromAuxToFxml branch January 24, 2019 19:06
Siedlerchr added a commit that referenced this pull request Jan 27, 2019
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into jdk9
0a54822 
* upstream/master: (229 commits)
  Try to fix not on FX thread for search and autocomplete (#4618)
  Convert DuplicateResolverDialog to javafx (#4601)
  Fix for BibTex source tab parsing issue if field contains {} (#4581)
  Convert OO/LO SidePanel to javafx (#4341)
  Convert "Customize importer" dialog to JavaFX (#4608)
  Convert "From Aux file" dialog to JavaFX (#4607)
  Convert "Show preferences" dialog to JavaFX (#4605)
  Fix not on FX thread exception
  Force javafx to run thread (#4604)
  Convert new version dialog to JavaFX (#4602)
  Add a variable to track the change in preview style (#4587)
  Solution for submitting dialog with Ctrl + Enter (#4496) (#4592)
  Bump mysql-connector-java from 8.0.13 to 8.0.14 (#4599)
  Fix overlapping font in id entry type (#4595)
  update jfoenix and gradle plugins Replace outdated transformer log4j2 with official new one
  Update journalList.txt
  Fix for Issue #4437 - Some bugs in preference->Entry table columns (#4546)
  Don't set column sort type at startup (#4577)
  Add uncaught exception message (#4565)
  Converts integrity check dialog to JavaFX (#4559)
  ...

# Conflicts:
#	build.gradle
#	src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java
#	src/main/java/org/jabref/gui/JabRefFrame.java
#	src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
#	src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
#	src/main/java/org/jabref/gui/openoffice/CitationManager.java
#	src/main/java/org/jabref/gui/openoffice/OOBibBase.java
#	src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
#	src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java
Siedlerchr added a commit that referenced this pull request Feb 1, 2019
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into editStringsjavafx
c273ecb 
* upstream/master:
  Fix NPE and not on FX Thread in PreviewPrefs Tabs (#4624)
  Fix preview style configuration (#4613)
  Bump wiremock from 2.20.0 to 2.21.0 (#4623)
  snap: disable tests build, add removable media and specify architectures (#4619)
  Bump checkstyle from 8.16 to 8.17 (#4620)
  Fix preferences path: use _JAVA_OPTIONS
  Try to fix not on FX thread for search and autocomplete (#4618)
  Update snapcraft.yaml Move to snap folder
  Convert DuplicateResolverDialog to javafx (#4601)
  Fix for BibTex source tab parsing issue if field contains {} (#4581)
  Convert OO/LO SidePanel to javafx (#4341)
  Convert "Customize importer" dialog to JavaFX (#4608)
  Convert "From Aux file" dialog to JavaFX (#4607)
  Convert "Show preferences" dialog to JavaFX (#4605)
  Fix not on FX thread exception
  Force javafx to run thread (#4604)
  Convert new version dialog to JavaFX (#4602)
  Add a variable to track the change in preview style (#4587)
  Solution for submitting dialog with Ctrl + Enter (#4496) (#4592)
  Bump mysql-connector-java from 8.0.13 to 8.0.14 (#4599)

# Conflicts:
#	src/main/resources/l10n/JabRef_en.properties
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Siedlerchr Siedlerchr Siedlerchr left review comments

Assignees
No one assigned
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tobiasdiez @Siedlerchr