-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Fix copy to #13741
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
+33
−42
Merged
Fix copy to #13741
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
203f8a2
Fix copy to
koppor 27e90ef
Fix number
koppor 94adce0
Merge remote-tracking branch 'origin/main' into fix-copy-to
koppor 5cacd68
Apply suggestions from code review
koppor 7c9609b
Merge branch 'fix-copy-to' of github.com:JabRef/jabref into fix-copy-to
koppor b6d3ae6
Refactor: ActionHelper.needsMultipleDatabases requires stateManager (…
koppor 41599da
No need for automatic refresh...
koppor 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,7 @@ | ||
package org.jabref.gui.maintable; | ||
|
||
import java.util.Optional; | ||
|
||
import javax.swing.undo.UndoManager; | ||
|
||
import javafx.beans.binding.Bindings; | ||
import javafx.collections.ObservableList; | ||
import javafx.scene.control.ContextMenu; | ||
import javafx.scene.control.Menu; | ||
import javafx.scene.control.MenuItem; | ||
|
@@ -16,6 +12,7 @@ | |
import org.jabref.gui.LibraryTab; | ||
import org.jabref.gui.StateManager; | ||
import org.jabref.gui.actions.ActionFactory; | ||
import org.jabref.gui.actions.ActionHelper; | ||
import org.jabref.gui.actions.StandardActions; | ||
import org.jabref.gui.edit.CopyMoreAction; | ||
import org.jabref.gui.edit.CopyTo; | ||
|
@@ -127,45 +124,38 @@ private static Menu createCopyToMenu(ActionFactory factory, | |
ImportHandler importHandler) { | ||
Menu copyToMenu = factory.createMenu(StandardActions.COPY_TO); | ||
copyToMenu.disableProperty().bind( | ||
Bindings.size(stateManager.getOpenDatabases()).lessThan(2) | ||
ActionHelper.needsMultipleDatabases(stateManager).not() | ||
); | ||
|
||
ObservableList<BibDatabaseContext> openDatabases = stateManager.getOpenDatabases(); | ||
// Menu is created on each right-click, thus we can always assume that the list of open databases is up-to-date | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Comment restates what is obvious from the code context and doesn't provide additional value or reasoning. Comments should add new information not derivable from code. |
||
|
||
BibDatabaseContext sourceDatabaseContext = libraryTab.getBibDatabaseContext(); | ||
|
||
Optional<String> sourceDatabaseName = libraryTab | ||
.getBibDatabaseContext().getDatabasePath().stream() | ||
.flatMap(path -> FileUtil.getUniquePathFragment(stateManager.getAllDatabasePaths(), path).stream()) | ||
.findFirst(); | ||
|
||
if (!openDatabases.isEmpty()) { | ||
openDatabases.forEach(bibDatabaseContext -> { | ||
Optional<String> destinationPath = Optional.empty(); | ||
String destinationDatabaseName = ""; | ||
|
||
if (bibDatabaseContext.getDatabasePath().isPresent()) { | ||
Optional<String> uniqueFilePathFragment = FileUtil.getUniquePathFragment(stateManager.getAllDatabasePaths(), bibDatabaseContext.getDatabasePath().get()); | ||
if (uniqueFilePathFragment.equals(sourceDatabaseName)) { | ||
return; | ||
} | ||
if (uniqueFilePathFragment.isPresent()) { | ||
destinationDatabaseName = uniqueFilePathFragment.get(); | ||
} | ||
} else if (bibDatabaseContext.getLocation() == DatabaseLocation.SHARED) { | ||
destinationDatabaseName = bibDatabaseContext.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared") + "]"; | ||
} else { | ||
destinationDatabaseName = destinationPath.orElse(Localization.lang("untitled")); | ||
} | ||
|
||
copyToMenu.getItems().addAll( | ||
factory.createCustomMenuItem( | ||
StandardActions.COPY_TO, | ||
new CopyTo(dialogService, stateManager, preferences.getCopyToPreferences(), importHandler, sourceDatabaseContext, bibDatabaseContext), | ||
destinationDatabaseName | ||
) | ||
); | ||
}); | ||
for (BibDatabaseContext targetDatabaseContext : stateManager.getOpenDatabases()) { | ||
if (targetDatabaseContext == sourceDatabaseContext) { | ||
continue; | ||
} | ||
String targetDatabaseName; | ||
|
||
if (targetDatabaseContext.getDatabasePath().isPresent()) { | ||
targetDatabaseName = FileUtil.getUniquePathFragment( | ||
stateManager.getAllDatabasePaths(), | ||
targetDatabaseContext.getDatabasePath().get() | ||
).orElse(Localization.lang("untitled")); | ||
} else if (targetDatabaseContext.getLocation() == DatabaseLocation.SHARED) { | ||
targetDatabaseName = targetDatabaseContext.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared") + "]"; | ||
} else { | ||
targetDatabaseName = Localization.lang("untitled"); | ||
} | ||
|
||
copyToMenu.getItems().add( | ||
factory.createCustomMenuItem( | ||
StandardActions.COPY_TO, | ||
new CopyTo(dialogService, stateManager, preferences.getCopyToPreferences(), | ||
importHandler, sourceDatabaseContext, targetDatabaseContext), | ||
targetDatabaseName | ||
) | ||
); | ||
} | ||
|
||
return copyToMenu; | ||
|
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.