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

Enable editing typo with double clicking on field name in custom entry type #9977

Merged
merged 15 commits into from
Jun 8, 2023
Merged

Enable editing typo with double clicking on field name in custom entry type #9977

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b7b6b49
Merge pull request #1 from JabRef/main
DinjerChang Jun 5, 2023
ab673dc
frontend custom entry type edit feature
DinjerChang Jun 5, 2023
fc6c245
new function setName() in UnkownField.java added so we could update t…
DinjerChang Jun 6, 2023
ed7373c
CHANGELOG.MD added
DinjerChang Jun 6, 2023
8a2daa0
checkstyle fixed, better varible name modified in CustomEntryTypesTab…
DinjerChang Jun 6, 2023
d653fc5
dialog with notify functionality and use equalsIgnoreCase when compar…
DinjerChang Jun 6, 2023
2be4ccb
add Localization.lang("key") to JabRed_en.properties
DinjerChang Jun 7, 2023
b6cd9b7
Capitalizing first letter when displaying on coulumn after edit
DinjerChang Jun 7, 2023
e7d288c
fix when user input the original field name or doesnt edit anything a…
DinjerChang Jun 7, 2023
6d4e751
Merge branch 'main' into fix-for-issue-9840
DinjerChang Jun 7, 2023
574cd4e
fix wrong placement of predicate: !newFieldValue.equals(field.getDisp…
DinjerChang Jun 8, 2023
45681d9
Merge branch 'fix-for-issue-9840' of https://github.com/DinjerChang/j…
DinjerChang Jun 8, 2023
66bc727
Merge branch 'main' into fix-for-issue-9840
koppor Jun 8, 2023
ee41ca9
Update CHANGELOG.md
calixtus Jun 8, 2023
d19f84f
Fix localization
koppor Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,20 +151,23 @@ private void setupFieldsTable() {
fieldNameColumn.setEditable(true);
fieldNameColumn.setOnEditCommit(
(TableColumn.CellEditEvent<FieldViewModel, String> event) -> {
// This makes the displayed name consistent to org.jabref.model.entry.field.Field #getDisplayName()
String newFieldValue = StringUtil.capitalizeFirst(event.getNewValue());
DinjerChang marked this conversation as resolved.
Show resolved Hide resolved
UnknownField field = (UnknownField) event.getRowValue().getField();
EntryTypeViewModel selectedEntryType = viewModel.selectedEntryTypeProperty().get();
ObservableList<FieldViewModel> entryFields = selectedEntryType.fields();
// The second predicate will check if the user input the original field name or doesn't edit anything after double click
boolean fieldExists = entryFields.stream().anyMatch(fieldViewModel ->
fieldViewModel.nameProperty().getValue().equalsIgnoreCase(newFieldValue));
fieldViewModel.nameProperty().getValue().equalsIgnoreCase(newFieldValue) && !newFieldValue.equals(field.getDisplayName()));
Copy link
Member

Choose a reason for hiding this comment

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

The new condition does not make use of ´fieldViewModel `

I think, following code matches your intention:

boolean fieldExists = !newFieldValue.equals(field.getDisplayName()) && entryFields.stream().anyMatch(fieldViewModel ->
                            fieldViewModel.nameProperty().getValue().equalsIgnoreCase(newFieldValue));

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right. I shouldn't put it in the anyMatch() method when streaming


if (!fieldExists) {
event.getRowValue().setField(newFieldValue);
field.setName(newFieldValue);
} else {
if (fieldExists) {
dialogService.notify(Localization.lang("Duplicate fields: You added field \"%0\" twice. Only one will be kept.", newFieldValue));
event.getTableView().edit(-1, null);
event.getTableView().refresh();
} else {
event.getRowValue().setField(newFieldValue);
field.setName(newFieldValue);
event.getTableView().refresh();
}
});

Expand Down