Do not show fields that are displayed in general fields etc.

JabRef · Feb 23, 2016 · a3a36c9 · a3a36c9
1 parent d123928
commit a3a36c9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/main/java/net/sf/jabref/JabRefPreferences.java b/src/main/java/net/sf/jabref/JabRefPreferences.java
@@ -809,6 +809,24 @@ private JabRefPreferences() {
         }
     }
 
+    public List<String> getCustomTabFieldNames() {
+        List<String> customFields = new ArrayList<>();
+
+        int defNumber = 0;
+        while(true) {
+            // saved as CUSTOMTABNAME_def{number} and ; separated
+            String fields = (String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber);
+
+            if(fields == null || fields.isEmpty()) {
+                break;
+            }
+
+            customFields.addAll(Arrays.asList(fields.split(";")));
+            defNumber++;
+        }
+        return customFields;
+    }
+
     public void setLanguageDependentDefaultValues() {
         // Entry editor tab 0:
         defaults.put(CUSTOM_TAB_NAME + "_def0", Localization.lang("General"));

diff --git a/src/main/java/net/sf/jabref/gui/GenFieldsCustomizer.java b/src/main/java/net/sf/jabref/gui/GenFieldsCustomizer.java
@@ -136,11 +136,6 @@ void okActionPerformed() {
         Globals.prefs.purgeSeries(JabRefPreferences.CUSTOM_TAB_NAME, i);
         Globals.prefs.purgeSeries(JabRefPreferences.CUSTOM_TAB_FIELDS, i);
         Globals.prefs.updateEntryEditorTabList();
-        /*
-        String delimStr = fieldsArea.getText().replaceAll("\\s+","")
-          .replaceAll("\\n+","").trim();
-        parent.prefs.putStringArray(JabRefPreferences.GENERAL_FIELDS, Util.split(delimStr, ";"));
-        */
 
         parentFrame.removeCachedEntryEditors();
         dispose();
@@ -219,8 +214,8 @@ class GenFieldsCustomizerRevertActionAdapter implements ActionListener {
     private final GenFieldsCustomizer adaptee;
 
 
-    GenFieldsCustomizerRevertActionAdapter(GenFieldsCustomizer adaptee) {
-        this.adaptee = adaptee;
+    GenFieldsCustomizerRevertActionAdapter(GenFieldsCustomizer adapter) {
+        this.adaptee = adapter;
     }
 
     @Override

diff --git a/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/net/sf/jabref/gui/entryeditor/EntryEditor.java
@@ -287,6 +287,7 @@ private void setupFieldPanels() {
         List<String> displayedFields = Stream.concat(requiredFields.stream(), displayedOptionalFields.stream()).map(String::toLowerCase).collect(Collectors.toList());
         List<String> otherFields = this.entry.getFieldNames().stream().map(String::toLowerCase).filter(f -> !displayedFields.contains(f)).collect(Collectors.toList());
         otherFields.remove("bibtexkey");
+        otherFields.removeAll(prefs.getCustomTabFieldNames());
 
         if(!otherFields.isEmpty()) {
             EntryEditorTab otherPanel = new EntryEditorTab(frame, panel, otherFields, this,