-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Refactor unlinked files #7209
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
Refactor unlinked files #7209
Changes from all commits
Commits
Show all changes
91 commits
Select commit
Hold shift + click to select a range
57f210e
[WIP] Refactor unlinked files
Siedlerchr 803c56e
add controller
Siedlerchr 3685516
inject stuff
Siedlerchr 2cb8a2d
empty line
Siedlerchr 8d429cd
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr 6bdb2c6
add progreess indicator
Siedlerchr 98770bb
finish export implementation
Siedlerchr f3d2cca
prepare background task for import
Siedlerchr 10db39a
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr 9e89c91
prepare eception handling
Siedlerchr eb44469
add further logging
Siedlerchr 1a732cb
add progrees indicator linkage
Siedlerchr f0b3f79
Fix threading issues, report progress
Siedlerchr a05ba1f
remove useless undo stuff
Siedlerchr 1d25e30
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr 3f93cef
wire buttons to the viewModel
Siedlerchr e7dddd4
show import results dialog view
Siedlerchr b7fcd2f
better error messages
Siedlerchr ad50cc9
Rename files, fix cancel, fix gui
Siedlerchr 082580c
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr 4e37d44
Cleanup
Siedlerchr 6f61e8e
checkstyle
Siedlerchr 2ae183d
fix checkstyle in md
Siedlerchr 27cf98d
Make table columns more wider
Siedlerchr 98c6a7f
preapre localization
Siedlerchr 6219364
fix typo
Siedlerchr ebd0457
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr f722286
fix md errors
Siedlerchr a1da392
fix l10n key
Siedlerchr e2fd3ba
add l10n
Siedlerchr bee42c6
further l10n fixes
Siedlerchr 5cdfa69
further l10n fixs to reuse
Siedlerchr 15bbee1
remove one dot
Siedlerchr a6d17f9
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr 1918893
idea extend filenode wrapper
Siedlerchr 37f6b5b
Remove extra dialog
Siedlerchr 6b69465
fix progressIndicator still visible
Siedlerchr babad73
replace with spaces
Siedlerchr 1d9bf7c
fix checkstyle
Siedlerchr a1dc057
add titled pane
Siedlerchr 3683a2c
fix checkstyle
Siedlerchr ce21003
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr 78cf06b
fix duplicate method
Siedlerchr 7f776b2
Merge and remove unceessary dependencies
Siedlerchr b036f11
align browse button
Siedlerchr 82ae9ea
adjust combobox display
Siedlerchr 380f4d1
Fixed whitespaces, fxml and refactored for some readability
calixtus fe59fb9
Fixed accordion and l10n
calixtus 4b3a922
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr e9b38ab
Add changelog
Siedlerchr e046637
fix link in changelog
Siedlerchr 0d439a8
fix changelog
Siedlerchr 408f6e6
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr 6bc4acb
fix wrong loop var
Siedlerchr 9e7544a
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr e059988
refactor
Siedlerchr 179c349
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr c52f0d7
create viewModel for filter model
Siedlerchr 266a8c3
wip refactor like in parse latex
Siedlerchr 81e7b44
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr b5b21f2
fix view model stuff
Siedlerchr d50a9d6
add validator
Siedlerchr 0cd75e5
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr aebd602
fix selection and export
Siedlerchr 0e8cfbb
fix bug using wrong parameter
Siedlerchr 950655c
Refactored some style issues and a minor suggestions of IntelliJ
calixtus 4503d1e
l10n
calixtus 0426fd2
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr 3d1dd90
only show results after import
Siedlerchr 2bc1ddc
Merge branch 'importerbackgroundtask' of github.com:JabRef/jabref int…
Siedlerchr b8e4e35
Add custom skin for putting arrow to the right
Siedlerchr 9778d01
add checkstyle exception
Siedlerchr c3acb2b
only change import order
Siedlerchr 473aac7
checkstyle
Siedlerchr bbe2210
load custom skin only on accordion
Siedlerchr 35fcac9
Add arrow rotation hack
Siedlerchr e21a060
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr 7ec2651
Fix merge conflict
Siedlerchr c11d0c3
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr 686af8f
Set disable instead of visible
Siedlerchr ef0cc31
Fixed jumping arrow
calixtus b1ef474
Refactored for mvvm pattern and optics
calixtus 9b28692
Remove obsolete language key
koppor 2fec815
Merge remote-tracking branch 'upstream/master' into importerbackgroun…
Siedlerchr 4efa5b9
refactor
Siedlerchr 7ec8e38
Merge remote-tracking branch 'upstream/importerbackgroundtask' into i…
Siedlerchr 7c41e9a
cleanup
Siedlerchr bc6c9e1
fix checkstyle
Siedlerchr 443c14c
move vars down to background task
Siedlerchr ecaa23a
Made treeRootProperty a property of Optional
calixtus 6362584
l10n
calixtus File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
40 changes: 40 additions & 0 deletions
40
src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package org.jabref.gui.externalfiles; | ||
|
|
||
| import java.nio.file.DirectoryStream.Filter; | ||
| import java.nio.file.Path; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import org.jabref.gui.externalfiletype.ExternalFileType; | ||
| import org.jabref.gui.externalfiletype.ExternalFileTypes; | ||
| import org.jabref.gui.icon.JabRefIcon; | ||
| import org.jabref.gui.util.FileFilterConverter; | ||
| import org.jabref.logic.l10n.Localization; | ||
| import org.jabref.logic.util.FileType; | ||
|
|
||
| public class FileExtensionViewModel { | ||
|
|
||
| private final String description; | ||
| private final List<String> extensions; | ||
| private final ExternalFileTypes externalFileTypes; | ||
|
|
||
| FileExtensionViewModel(FileType fileType, ExternalFileTypes externalFileTypes) { | ||
| this.description = Localization.lang("%0 file", fileType.toString()); | ||
| this.extensions = fileType.getExtensionsWithDot(); | ||
| this.externalFileTypes = externalFileTypes; | ||
| } | ||
|
|
||
| public String getDescription() { | ||
| return this.description + extensions.stream().collect(Collectors.joining(", ", " (", ")")); | ||
| } | ||
|
|
||
| public JabRefIcon getIcon() { | ||
| return externalFileTypes.getExternalFileTypeByExt(extensions.get(0)) | ||
| .map(ExternalFileType::getIcon) | ||
| .orElse(null); | ||
| } | ||
|
|
||
| public Filter<Path> dirFilter() { | ||
| return FileFilterConverter.toDirFilter(extensions); | ||
| } | ||
| } |
13 changes: 2 additions & 11 deletions
13
src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,25 @@ | ||
| package org.jabref.gui.externalfiles; | ||
|
|
||
| import javax.swing.undo.UndoManager; | ||
|
|
||
| import org.jabref.gui.DialogService; | ||
| import org.jabref.gui.StateManager; | ||
| import org.jabref.gui.actions.SimpleCommand; | ||
| import org.jabref.model.database.BibDatabaseContext; | ||
| import org.jabref.preferences.PreferencesService; | ||
|
|
||
| import static org.jabref.gui.actions.ActionHelper.needsDatabase; | ||
|
|
||
| public class FindUnlinkedFilesAction extends SimpleCommand { | ||
|
|
||
| private final DialogService dialogService; | ||
| private final PreferencesService preferencesService; | ||
| private final UndoManager undoManager; | ||
| private final StateManager stateManager; | ||
|
|
||
| public FindUnlinkedFilesAction(DialogService dialogService, PreferencesService preferencesService, UndoManager undoManager, StateManager stateManager) { | ||
| public FindUnlinkedFilesAction(DialogService dialogService, StateManager stateManager) { | ||
| this.dialogService = dialogService; | ||
| this.preferencesService = preferencesService; | ||
| this.undoManager = undoManager; | ||
| this.stateManager = stateManager; | ||
|
|
||
| this.executable.bind(needsDatabase(this.stateManager)); | ||
| } | ||
|
|
||
| @Override | ||
| public void execute() { | ||
| BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null")); | ||
| dialogService.showCustomDialogAndWait(new FindUnlinkedFilesDialog(database, dialogService, preferencesService, undoManager)); | ||
| dialogService.showCustomDialogAndWait(new UnlinkedFilesDialogView()); | ||
| } | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.