Now two IEEE abbreviation files exist: one for official ieee latex ke…

…ys, one for textual ones.
JabRef · Oct 8, 2015 · 38afd66 · 38afd66
1 parent 3bcf7d5
commit 38afd66
Show file tree

Hide file tree

Showing 4 changed files with 2,392 additions and 2,523 deletions.
diff --git a/src/main/java/net/sf/jabref/logic/journals/Abbreviations.java b/src/main/java/net/sf/jabref/logic/journals/Abbreviations.java
@@ -13,15 +13,20 @@ public class Abbreviations {
 
     // journal initialization
     public static final String JOURNALS_FILE_BUILTIN = "/journals/journalList.txt";
-    public static final String JOURNALS_IEEE_INTERNAL_LIST = "/journals/IEEEJournalList.txt";
+    public static final String JOURNALS_IEEE_OFFICIAL_ABBREVIATION_LIST = "/journals/IEEEJournalList.txt";
+    public static final String JOURNALS_IEEE_STANDARD_ABBREVIATION_LIST = "/journals/IEEEJournalListText.txt";
     public static JournalAbbreviationRepository journalAbbrev;
 
     public static void initializeJournalNames(JabRefPreferences jabRefPreferences) {
         // Read internal lists:
         journalAbbrev = new JournalAbbreviationRepository();
+
         journalAbbrev.readJournalListFromResource(JOURNALS_FILE_BUILTIN);
+
         if (jabRefPreferences.getBoolean(JabRefPreferences.USE_IEEE_ABRV)) {
-            journalAbbrev.readJournalListFromResource(JOURNALS_IEEE_INTERNAL_LIST);
+            journalAbbrev.readJournalListFromResource(JOURNALS_IEEE_OFFICIAL_ABBREVIATION_LIST);
+        } else {
+            journalAbbrev.readJournalListFromResource(JOURNALS_IEEE_STANDARD_ABBREVIATION_LIST);
         }
 
         // Read external lists, if any (in reverse order, so the upper lists