Skip to content

Commit ea946c4

Browse files
Merge pull request #14 from DD2480-Group1/issue-13/null-when-copying
[Fix] Fix Null when copying
2 parents 5e98a05 + 765cb0e commit ea946c4

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

src/main/java/org/jabref/gui/ClipBoardManager.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,11 @@ public void setContent(List<BibEntry> entries, BibEntryTypesManager entryTypesMa
171171
final ClipboardContent content = new ClipboardContent();
172172
BibEntryWriter writer = new BibEntryWriter(new FieldWriter(preferencesService.getFieldPreferences()), entryTypesManager);
173173
StringBuilder builder = new StringBuilder();
174-
stringConstants.forEach(strConst -> builder.append(strConst.getParsedSerialization()));
174+
for (BibtexString strConst : stringConstants) {
175+
if (strConst.getParsedSerialization() != null) {
176+
builder.append(strConst.getParsedSerialization());
177+
}
178+
}
175179
String serializedEntries = writer.serializeAll(entries, BibDatabaseMode.BIBTEX);
176180
builder.append(serializedEntries);
177181
// BibEntry is not Java serializable. Thus, we need to do the serialization manually

src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.jabref.gui.libraryproperties.constants;
22

33
import java.util.Comparator;
4+
import java.util.List;
45
import java.util.Locale;
56
import java.util.Optional;
67
import java.util.stream.Collectors;
@@ -86,9 +87,12 @@ private ConstantsItemModel convertFromBibTexString(BibtexString bibtexString) {
8687

8788
@Override
8889
public void storeSettings() {
89-
databaseContext.getDatabase().setStrings(stringsListProperty.stream()
90-
.map(this::fromBibtexStringViewModel)
91-
.collect(Collectors.toList()));
90+
List<BibtexString> strings = stringsListProperty.stream()
91+
.map(this::fromBibtexStringViewModel)
92+
.toList();
93+
strings.forEach(string -> string.setParsedSerialization("@String{" +
94+
string.getName() + " = " + string.getContent() + "}\n"));
95+
databaseContext.getDatabase().setStrings(strings);
9296
}
9397

9498
private BibtexString fromBibtexStringViewModel(ConstantsItemModel viewModel) {

0 commit comments

Comments
 (0)