Implemented #1682

JabRef · Aug 9, 2016 · 30124e5 · 30124e5
1 parent 12f5e29
commit 30124e5
Show file tree

Hide file tree

Showing 19 changed files with 77 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,6 +48,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - Fixed [#1643](https://github.com/JabRef/jabref/issues/1643): Searching with double quotes in a specific field ignores the last character
 - Fixed [#1288](https://github.com/JabRef/jabref/issues/1288): Newly opened bib-file is not focused
 - Fixed [#1669](https://github.com/JabRef/jabref/issues/1669): Dialog for manual connection to OpenOffice/LibreOffice works again on Linux
+- Fixed [#16682](https://github.com/JabRef/jabref/issues/1682): An entry now must have a BibTeX key to be cited in OpenOffice/LibreOffice
 
 
 ### Removed

diff --git a/src/main/java/net/sf/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/net/sf/jabref/gui/openoffice/OpenOfficePanel.java
@@ -57,9 +57,13 @@
 import net.sf.jabref.gui.actions.BrowseAction;
 import net.sf.jabref.gui.help.HelpAction;
 import net.sf.jabref.gui.keyboard.KeyBinding;
+import net.sf.jabref.gui.undo.NamedCompound;
+import net.sf.jabref.gui.undo.UndoableKeyChange;
 import net.sf.jabref.gui.worker.AbstractWorker;
 import net.sf.jabref.logic.help.HelpFile;
 import net.sf.jabref.logic.l10n.Localization;
+import net.sf.jabref.logic.labelpattern.LabelPatternPreferences;
+import net.sf.jabref.logic.labelpattern.LabelPatternUtil;
 import net.sf.jabref.logic.layout.LayoutFormatterPreferences;
 import net.sf.jabref.logic.openoffice.OOBibStyle;
 import net.sf.jabref.logic.openoffice.OpenOfficePreferences;
@@ -638,7 +642,8 @@ private void pushEntries(boolean inParenthesisIn, boolean withText, boolean addP
         if (panel != null) {
             final BibDatabase database = panel.getDatabase();
             List<BibEntry> entries = panel.getSelectedEntries();
-            if (!entries.isEmpty()) {
+            if (!entries.isEmpty() && checkThatEntriesHaveKeys(entries)) {
+
                 try {
                     if (style == null) {
                         style = loader.getUsedStyle();
@@ -669,6 +674,57 @@ private void pushEntries(boolean inParenthesisIn, boolean withText, boolean addP
 
     }
 
+    /**
+     * Check that all entries in the list have BibTeX keys, if not ask if they should be generated
+     *
+     * @param entries A list of entries to be checked
+     * @return true if all entries have BibTeX keys, if it so may be after generating them
+     */
+    private boolean checkThatEntriesHaveKeys(List<BibEntry> entries) {
+        // Check if there are empty keys
+        boolean emptyKeys = false;
+        for (BibEntry entry : entries) {
+            if (entry.getCiteKey() == null) {
+                // Found one, no need to look further for now
+                emptyKeys = true;
+                break;
+            }
+        }
+
+        // If no empty keys, return true
+        if (!emptyKeys) {
+            return true;
+        }
+
+        // Ask if keys should be generated
+        int answer = JOptionPane.showConfirmDialog(this.frame,
+                Localization.lang("Cannot cite entries without BibTeX keys. Generate keys now?"),
+                Localization.lang("Cite"), JOptionPane.YES_NO_OPTION);
+        BasePanel panel = frame.getCurrentBasePanel();
+        if ((answer == JOptionPane.YES_OPTION) && (panel != null)) {
+            // Generate keys
+            LabelPatternPreferences prefs = LabelPatternPreferences.fromPreferences(Globals.prefs);
+            NamedCompound undoCompound = new NamedCompound(Localization.lang("Cite"));
+            for (BibEntry entry : entries) {
+                if (entry.getCiteKey() == null) {
+                    // Generate key
+                    LabelPatternUtil.makeLabel(panel.getBibDatabaseContext().getMetaData(), panel.getDatabase(), entry,
+                            prefs);
+                    // Add undo change
+                    undoCompound.addEdit(new UndoableKeyChange(panel.getDatabase(), entry, null, entry.getCiteKey()));
+                }
+            }
+            undoCompound.end();
+            // Add all undos
+            panel.getUndoManager().addEdit(undoCompound);
+            // Now every entry has a key
+            return true;
+        } else {
+            // No, we canceled (or there is no panel to get the database from, highly unlikely)
+            return false;
+        }
+    }
+
     private void showConnectionLostErrorMessage() {
         JOptionPane.showMessageDialog(frame,
                 Localization.lang("Connection to OpenOffice/LibreOffice has been lost. "

diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
@@ -1740,3 +1740,5 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
+
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
@@ -2399,7 +2399,6 @@ Add_{}_around_selected_text=
 Format_field=
 New_protected_terms_file=
 
-
 change_field_%0_of_entry_%1_from_%2_to_%3=
 change_key_from_%0_to_%1=
 change_string_content_%0_to_%1=
@@ -2421,6 +2420,7 @@ Entry_from_%0=Eintrag_basierend_auf_%0
 
 Merge_entry_with_%0_information=Eintrag_mit_%0-Informationen_zusammenführen
 Updated_entry_with_info_from_%0=Eintrag_wurde_mit_%0-Information_aktualisiert.
+
 Connection=Verbindung
 Host=Host
 Port=Port
@@ -2455,3 +2455,4 @@ Shared_version\:_%0=Gemainsam_genutzte_Version\:_%0
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=Bitte_führen_Sie_den_gemeinsam_genutzten_Eintrag_mit_Ihrem_zusammen_und_klicken_Sie_auf_"Einträge_zuammenführen",_um_das_Problem_zu_beheben.
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=Durch_einen_Abbruch_dieser_Operation_werden_die_Änderungen_nicht_synchronisiert._Trotzdem_abbrechen?
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=Der_Eintrag,_welchen_Sie_zur_Zeit_bearbeiten,_ist_auf_der_gemeinsam_genutzen_Datenbank_nicht_mehr_vorhanden._Klicken_Sie_auf_"Behalten",_um_den_Eintrag_wiederherzustellen.
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
@@ -2284,3 +2284,4 @@ Shared_version\:_%0=Shared_version\:_%0
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
@@ -1642,3 +1642,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
@@ -2423,3 +2423,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
@@ -1683,3 +1683,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties
@@ -1605,7 +1605,6 @@ Add_{}_around_selected_text=
 Format_field=
 New_protected_terms_file=
 
-
 change_field_%0_of_entry_%1_from_%2_to_%3=
 change_key_from_%0_to_%1=
 change_string_content_%0_to_%1=
@@ -1659,3 +1658,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
@@ -1759,3 +1759,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
@@ -2400,3 +2400,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
@@ -2380,7 +2380,6 @@ Add_{}_around_selected_text=
 Format_field=
 New_protected_terms_file=
 
-
 change_field_%0_of_entry_%1_from_%2_to_%3=
 change_key_from_%0_to_%1=
 change_string_content_%0_to_%1=
@@ -2433,3 +2432,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
@@ -2773,7 +2773,6 @@ Add_{}_around_selected_text=
 Format_field=
 New_protected_terms_file=
 
-
 change_field_%0_of_entry_%1_from_%2_to_%3=
 change_key_from_%0_to_%1=
 change_string_content_%0_to_%1=
@@ -2825,3 +2824,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -1655,3 +1655,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
@@ -2401,3 +2401,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
@@ -1600,3 +1600,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=Kan_inte_citera_poster_utan_BibTeX-nycklar._Generera_nycklar_nu?
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
@@ -1673,3 +1673,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
@@ -2427,3 +2427,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties
@@ -1615,7 +1615,6 @@ Add_{}_around_selected_text=
 Format_field=
 New_protected_terms_file=
 
-
 change_field_%0_of_entry_%1_from_%2_to_%3=
 change_key_from_%0_to_%1=
 change_string_content_%0_to_%1=
@@ -1668,3 +1667,4 @@ Shared_version\:_%0=
 Please_merge_the_shared_entry_with_yours_and_press_"Merge_entries"_to_resolve_this_problem.=
 Canceling_this_operation_will_leave_your_changes_unsynchronized._Cancel_anyway?=
 The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side._Hit_"Keep"_to_recover_the_entry.=
+Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=