further changes... (JabRef#560)

MrMachiei · Jan 24, 2024 · e58f5f3 · e58f5f3
1 parent 5c0496e
commit e58f5f3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
@@ -54,7 +54,7 @@
             </HBox>
             <HBox spacing="4">
                 <CheckBox fx:id="downloadLinkedOnlineFiles" text="%Download linked online files"/>
-                <CheckBox fx:id="showEntryInformation" text="%Show BibTeX"/>
+                <CheckBox fx:id="showEntryInformation" text="%Show BibTeX source"/>
             </HBox>
         </VBox>
     </content>

diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -200,7 +200,7 @@ private void displayBibTeX(BibEntry entry, String bibTeX) {
     }
 
     private void initBibTeX() {
-        bibTeXDataLabel.setText(Localization.lang("%0 source", "BibTeX") + ":");
+        bibTeXDataLabel.setText(Localization.lang("%0 source", "BibTeX"));
         bibTeXData.setBorder(new Border(new BorderStroke(Color.GREY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
         bibTeXData.setPadding(new Insets(5.0));
         showEntryInformation.selectedProperty().addListener((observableValue, old_val, new_val) -> {
@@ -255,6 +255,7 @@ public void selectAllNewEntries() {
         for (BibEntry entry : entriesListView.getItems()) {
             if (!viewModel.hasDuplicate(entry)) {
                 entriesListView.getCheckModel().check(entry);
+                displayBibTeX(entry, viewModel.getSourceString(entry));
             }
         }
     }

diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -131,7 +131,7 @@ public String getSourceString(BibEntry entry) {
             new BibEntryWriter(fieldWriter, entryTypesManager).write(entry, bibWriter, selectedDb.getValue().getMode());
         } catch (
                 IOException ioException) {
-            return null;
+            return "";
         }
         return writer.toString();
     }

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
@@ -104,6 +104,8 @@ Available\ export\ formats=Available export formats
 Available\ import\ formats=Available import formats
 
 %0\ source=%0 source
+Show\ BibTeX\ source=Show BibTeX source
+Show/edit\ %0\ source=Show/edit %0 source
 
 Background\ Tasks=Background Tasks
 
@@ -843,7 +845,6 @@ Settings=Settings
 
 Shortcut=Shortcut
 
-Show/edit\ %0\ source=Show/edit %0 source
 
 Show\ 'Firstname\ Lastname'=Show 'Firstname Lastname'
 
@@ -1986,7 +1987,6 @@ Total\ items\ found\:=Total items found:
 Selected\ items\:=Selected items:
 Download\ linked\ online\ files=Download linked online files
 Select\ the\ entries\ to\ be\ imported\:=Select the entries to be imported\:
-Show\ BibTeX=Show BibTeX
 Add\ new\ String=Add new String
 Must\ not\ be\ empty\!=Must not be empty\!
 Open\ Help\ page=Open Help page