JabRef · antalk2 · May 23, 2021 · May 23, 2021 · May 23, 2021 · May 23, 2021
diff --git a/src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java b/src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java
diff --git a/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java b/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
@@ -3,7 +3,7 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
-import org.jabref.logic.openoffice.CitationEntry;
+import org.jabref.model.openoffice.CitationEntry;
 
 public class CitationEntryViewModel {
 

diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
@@ -15,6 +15,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ValueTableCellFactory;
+import org.jabref.logic.JabRefException;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
@@ -56,7 +57,7 @@ public ManageCitationsDialogView(OOBibBase ooBase) {
     }
 
     @FXML
-    private void initialize() throws NoSuchElementException, WrappedTargetException, UnknownPropertyException {
+    private void initialize() throws NoSuchElementException, WrappedTargetException, UnknownPropertyException, JabRefException {
 
         viewModel = new ManageCitationsDialogViewModel(ooBase, dialogService);
 

diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
@@ -1,23 +1,25 @@
 package org.jabref.gui.openoffice;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
+import org.jabref.logic.JabRefException;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.openoffice.CitationEntry;
+import org.jabref.logic.openoffice.CreationException;
+import org.jabref.logic.openoffice.NoDocumentException;
+import org.jabref.model.openoffice.CitationEntry;
 
 import com.sun.star.beans.IllegalTypeException;
 import com.sun.star.beans.NotRemoveableException;
 import com.sun.star.beans.PropertyExistException;
+import com.sun.star.beans.PropertyVetoException;
 import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.container.NoSuchElementException;
-import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.WrappedTargetException;
 import org.slf4j.Logger;
@@ -31,33 +33,37 @@ public class ManageCitationsDialogViewModel {
     private final OOBibBase ooBase;
     private final DialogService dialogService;
 
-    public ManageCitationsDialogViewModel(OOBibBase ooBase, DialogService dialogService) throws NoSuchElementException, WrappedTargetException, UnknownPropertyException {
+    public ManageCitationsDialogViewModel(OOBibBase ooBase, DialogService dialogService)
+        throws
+        NoSuchElementException,
+        WrappedTargetException,
+        UnknownPropertyException,
+        JabRefException {
         this.ooBase = ooBase;
         this.dialogService = dialogService;
 
-        XNameAccess nameAccess = ooBase.getReferenceMarks();
-        List<String> names = ooBase.getJabRefReferenceMarks(nameAccess);
-        for (String name : names) {
-
-            CitationEntry entry = new CitationEntry(name,
-                    ooBase.getCitationContext(nameAccess, name, 30, 30, true),
-                    ooBase.getCustomProperty(name));
-
-            CitationEntryViewModel itemViewModelEntry = new CitationEntryViewModel(entry);
-            citations.add(itemViewModelEntry);
+        try {
+            List<CitationEntry> cts = ooBase.getCitationEntries();
+            for (CitationEntry entry : cts) {
+                CitationEntryViewModel itemViewModelEntry = new CitationEntryViewModel(entry);
+                citations.add(itemViewModelEntry);
+            }
+        } catch (UnknownPropertyException
+                 | WrappedTargetException
+                 | NoDocumentException
+                 | PropertyVetoException
+                 | CreationException ex) {
+            LOGGER.warn("Problem collecting citations", ex);
+            dialogService.showErrorDialogAndWait(Localization.lang("Problem collecting citations"), ex);
         }
     }
 
     public void storeSettings() {
         List<CitationEntry> ciationEntries = citations.stream().map(CitationEntryViewModel::toCitationEntry).collect(Collectors.toList());
         try {
-            for (CitationEntry entry : ciationEntries) {
-                Optional<String> pageInfo = entry.getPageInfo();
-                if (pageInfo.isPresent()) {
-                    ooBase.setCustomProperty(entry.getRefMarkName(), pageInfo.get());
-                }
-            }
+            ooBase.applyCitationEntries(ciationEntries);
         } catch (UnknownPropertyException | NotRemoveableException | PropertyExistException | IllegalTypeException |
+                 NoDocumentException | WrappedTargetException |
                 IllegalArgumentException ex) {
             LOGGER.warn("Problem modifying citation", ex);
             dialogService.showErrorDialogAndWait(Localization.lang("Problem modifying citation"), ex);