From 36d711d78795aeb264af840aed78932b51839309 Mon Sep 17 00:00:00 2001
From: Luis Romero <lromero@nearsoft.com>
Date: Wed, 11 Dec 2019 17:07:15 -0700
Subject: [PATCH 1/2] Added number of items found

---
 .../java/org/jabref/gui/importer/ImportEntriesDialog.fxml   | 6 ++++++
 .../java/org/jabref/gui/importer/ImportEntriesDialog.java   | 6 +++---
 src/main/resources/l10n/JabRef_en.properties                | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
index 005abb8ca28..335550e1552 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
@@ -19,6 +19,12 @@
                 <Button text="%Select all new entries" styleClass="text-button" onAction="#selectAllNewEntries"/>
                 <Button text="%Unselect all" styleClass="text-button" onAction="#unselectAll"/>
             </HBox>
+            <HBox>
+                <Label text="%Total items found:" styleClass="info-section"/>
+                <Label fx:id="totalItems"/>
+                <Label text="%Selected items:" styleClass="info-section"/>
+                <Label fx:id="selectedItems"/>
+            </HBox>
         </VBox>
     </content>
     <ButtonType fx:id="importButton" text="%Import entries" buttonData="OK_DONE"/>
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 26221ce81d2..ced459bb20c 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -48,6 +48,7 @@ public class ImportEntriesDialog extends BaseDialog<Void> {
 
     public CheckListView<BibEntry> entriesListView;
     public ButtonType importButton;
+    public Label totalItems;
     private final BackgroundTask<List<BibEntry>> task;
     private ImportEntriesViewModel viewModel;
     @Inject private TaskExecutor taskExecutor;
@@ -61,7 +62,6 @@ public class ImportEntriesDialog extends BaseDialog<Void> {
     public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<List<BibEntry>> task) {
         this.database = database;
         this.task = task;
-
         ViewLoader.view(this)
                   .load()
                   .setAsDialogPane(this);
@@ -84,7 +84,6 @@ public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<List<BibE
     @FXML
     private void initialize() {
         viewModel = new ImportEntriesViewModel(task, taskExecutor, database, dialogService, undoManager, preferences, stateManager, fileUpdateMonitor);
-
         Label placeholder = new Label();
         placeholder.textProperty().bind(viewModel.messageProperty());
         entriesListView.setPlaceholder(placeholder);
@@ -125,7 +124,8 @@ private void initialize() {
                     */
                     if (entriesListView.getItems().size() == 1) {
                         selectAllNewEntries();
-                      }
+                    }
+                    totalItems.textProperty().setValue(String.valueOf(entriesListView.getItems().size()));
 
                     return container;
                 })
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 8ebbe055303..d0f7a180a88 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1956,6 +1956,8 @@ Cancel\ import=Cancel import
 Continue\ with\ import=Continue with import
 Import\ canceled=Import canceled
 Select\ all\ new\ entries=Select all new entries
+Total\ items\ found\:=Total items found:
+Selected\ items\:=Selected items:
 Select\ the\ entries\ to\ be\ imported\:=Select the entries to be imported\:
 Add\ new\ String=Add new String
 Remove\ selected\ Strings=Remove selected Strings

From e9d2f7878f92edb1ee609895e9999574bcdc1bab Mon Sep 17 00:00:00 2001
From: Luis Romero <lromero@nearsoft.com>
Date: Mon, 16 Dec 2019 01:43:26 -0700
Subject: [PATCH 2/2] Added the number of selected items

---
 .../gui/importer/ImportEntriesDialog.fxml     |  6 +++--
 .../gui/importer/ImportEntriesDialog.java     | 23 ++++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
index 335550e1552..424afa144a7 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
@@ -12,7 +12,7 @@
             fx:controller="org.jabref.gui.importer.ImportEntriesDialog"
             prefHeight="700.0" prefWidth="1000.0">
     <content>
-        <VBox spacing="10">
+        <VBox spacing="20">
             <Label text="%Select the entries to be imported:"/>
             <CheckListView fx:id="entriesListView" VBox.vgrow="ALWAYS"/>
             <HBox>
@@ -21,7 +21,9 @@
             </HBox>
             <HBox>
                 <Label text="%Total items found:" styleClass="info-section"/>
-                <Label fx:id="totalItems"/>
+                <Label fx:id="totalItems" />
+            </HBox>
+            <HBox>
                 <Label text="%Selected items:" styleClass="info-section"/>
                 <Label fx:id="selectedItems"/>
             </HBox>
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index ced459bb20c..285b3babc50 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -5,7 +5,6 @@
 
 import javax.inject.Inject;
 import javax.swing.undo.UndoManager;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.css.PseudoClass;
@@ -49,6 +48,7 @@ public class ImportEntriesDialog extends BaseDialog<Void> {
     public CheckListView<BibEntry> entriesListView;
     public ButtonType importButton;
     public Label totalItems;
+    public Label selectedItems;
     private final BackgroundTask<List<BibEntry>> task;
     private ImportEntriesViewModel viewModel;
     @Inject private TaskExecutor taskExecutor;
@@ -88,7 +88,8 @@ private void initialize() {
         placeholder.textProperty().bind(viewModel.messageProperty());
         entriesListView.setPlaceholder(placeholder);
         entriesListView.setItems(viewModel.getEntries());
-
+        totalItems.setText("0");
+        selectedItems.setText("0");
         PseudoClass entrySelected = PseudoClass.getPseudoClass("entry-selected");
         new ViewModelListCellFactory<BibEntry>()
                 .withGraphic(entry -> {
@@ -102,6 +103,19 @@ private void initialize() {
                     });
                     addToggle.getStyleClass().add("addEntryButton");
                     addToggle.selectedProperty().bindBidirectional(entriesListView.getItemBooleanProperty(entry));
+                    addToggle.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                        if(observable.getValue()){
+                            ++numberOfSelectedItems;
+                            selectedItems.setText(String.valueOf(numberOfSelectedItems));
+                        }else
+                            if(numberOfSelectedItems == 0){
+                                return;
+                            }
+                             else{
+                                --numberOfSelectedItems;
+                                selectedItems.setText(String.valueOf(numberOfSelectedItems));
+                            }
+                    });
                     HBox separator = new HBox();
                     HBox.setHgrow(separator, Priority.SOMETIMES);
                     Node entryNode = getEntryNode(entry);
@@ -126,12 +140,9 @@ private void initialize() {
                         selectAllNewEntries();
                     }
                     totalItems.textProperty().setValue(String.valueOf(entriesListView.getItems().size()));
-
                     return container;
                 })
-                .withOnMouseClickedEvent((entry, event) -> entriesListView.getCheckModel().toggleCheckState(entry))
-                .withPseudoClass(entrySelected, entriesListView::getItemBooleanProperty)
-                .install(entriesListView);
+                .withOnMouseClickedEvent((entry, event) -> entriesListView.getCheckModel().toggleCheckState(entry)).withPseudoClass(entrySelected, entriesListView::getItemBooleanProperty).install(entriesListView);
         entriesListView.setSelectionModel(new NoSelectionModel<>());
     }