Revise maintable

CHANGELOG.md

@@ -21,6 +21,9 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 - Move Bibtex and Biblatex mode switcher to File menu
 - Display active edit mode (BibTeX or Biblatex) at window title
 - Implements #444: The search is cleared by either clicking the clear-button or by pressing ESC with having focus in the search field. 
+- Icons are shown as Header for icon columns in the entry table (#315)
+- Tooltips are shown for header columns and contents which are too wide to be displayed in the entry table (#384)
+- Default order in entry table:  # | all file based icons (file, URL/DOI, ...) | all bibtex field based icons (bibtexkey, entrytype, author, title, ...) | all activated special field icons (ranking, quality, ...)
 
 ### Fixed
 - Fixed #434: Revert to old 'JabRef' installation folder name instead of 'jabref'
@@ -32,11 +35,14 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 - Fixes #412: Biblatex preserves capital letters, checking whether letters may be converted to lowercase within the Integrity Check action is obsolete.
 - Fixed #437: The toolbar after the search field is now correctly wrapped when using a small window size for JabRef
 - Fixed #438: Cut, Copy and Paste are now translated correctly in the menu
+- Fixed #443/#445: Fixed sorting and moving special field columns
+- Fixed #498: non-working legacy PDF/PS column removed
 
 ### Removed
 - Removed file history size preference (never available from the UI)
 - Removed jstorImporter because it's hardly ever used, even Jstor.org doesn't support/export said format anymore
-
+- Removed option "Show one letter heading for icon columns" which is obsolete with the fix of #315/384
+- Removed table column "PDF/PS" which refers to legacy fields "ps" resp. "pdf" which are no longer supported (see also fix #498)
 
 
 

src/main/java/net/sf/jabref/JabRefPreferences.java

@@ -41,6 +41,7 @@
 import net.sf.jabref.gui.actions.CleanUpAction;
 import net.sf.jabref.gui.entryeditor.EntryEditorTabList;
 import net.sf.jabref.gui.keyboard.KeyBinds;
+import net.sf.jabref.gui.maintable.PersistenceTableColumnListener;
 import net.sf.jabref.gui.preftabs.ImportSettingsTab;
 import net.sf.jabref.importer.fileformat.ImportFormat;
 import net.sf.jabref.logic.autocompleter.AutoCompletePreferences;
@@ -192,7 +193,6 @@ public class JabRefPreferences {
     public static final String FILE_COLUMN = "fileColumn";
     public static final String PREFER_URL_DOI = "preferUrlDoi";
     public static final String URL_COLUMN = "urlColumn";
-    public static final String PDF_COLUMN = "pdfColumn";
     public static final String DISABLE_ON_MULTIPLE_SELECTION = "disableOnMultipleSelection";
     public static final String CTRL_CLICK = "ctrlClick";
     public static final String INCOMPLETE_ENTRY_BACKGROUND = "incompleteEntryBackground";
@@ -231,7 +231,6 @@ public class JabRefPreferences {
     public static final String TOOLBAR_VISIBLE = "toolbarVisible";
     public static final String HIGHLIGHT_GROUPS_MATCHING_ALL = "highlightGroupsMatchingAll";
     public static final String HIGHLIGHT_GROUPS_MATCHING_ANY = "highlightGroupsMatchingAny";
-    public static final String SHOW_ONE_LETTER_HEADING_FOR_ICON_COLUMNS = "showOneLetterHeadingForIconColumns";
     public static final String UPDATE_TIMESTAMP = "updateTimestamp";
     public static final String TIME_STAMP_FIELD = "timeStampField";
     public static final String TIME_STAMP_FORMAT = "timeStampFormat";
@@ -617,7 +616,6 @@ private JabRefPreferences() {
 
         defaults.put(CTRL_CLICK, Boolean.FALSE);
         defaults.put(DISABLE_ON_MULTIPLE_SELECTION, Boolean.FALSE);
-        defaults.put(PDF_COLUMN, Boolean.FALSE);
         defaults.put(URL_COLUMN, Boolean.TRUE);
         defaults.put(PREFER_URL_DOI, Boolean.FALSE);
         defaults.put(FILE_COLUMN, Boolean.TRUE);
@@ -636,8 +634,6 @@ private JabRefPreferences() {
         defaults.put(SpecialFieldsUtils.PREF_AUTOSYNCSPECIALFIELDSTOKEYWORDS, SpecialFieldsUtils.PREF_AUTOSYNCSPECIALFIELDSTOKEYWORDS_DEFAULT);
         defaults.put(SpecialFieldsUtils.PREF_SERIALIZESPECIALFIELDS, SpecialFieldsUtils.PREF_SERIALIZESPECIALFIELDS_DEFAULT);
 
-        defaults.put(SHOW_ONE_LETTER_HEADING_FOR_ICON_COLUMNS, Boolean.FALSE);
-
         defaults.put(USE_OWNER, Boolean.FALSE);
         defaults.put(OVERWRITE_OWNER, Boolean.FALSE);
         defaults.put(ALLOW_TABLE_EDITING, Boolean.FALSE);

src/main/java/net/sf/jabref/bibtex/comparator/FieldComparator.java

@@ -16,7 +16,7 @@
 package net.sf.jabref.bibtex.comparator;
 
 import net.sf.jabref.gui.BibtexFields;
-import net.sf.jabref.gui.MainTableFormat;
+import net.sf.jabref.gui.maintable.MainTableFormat;
 import net.sf.jabref.model.entry.AuthorList;
 import net.sf.jabref.model.entry.MonthUtil;
 import net.sf.jabref.model.entry.YearUtil;

src/main/java/net/sf/jabref/external/DroppedFileHandler.java

@@ -25,6 +25,7 @@
 
 import net.sf.jabref.*;
 import net.sf.jabref.gui.*;
+import net.sf.jabref.gui.maintable.MainTable;
 import net.sf.jabref.gui.undo.NamedCompound;
 import net.sf.jabref.gui.undo.UndoableFieldChange;
 import net.sf.jabref.gui.undo.UndoableInsertEntry;

src/main/java/net/sf/jabref/groups/EntryTableTransferHandler.java

@@ -43,8 +43,8 @@
 import net.sf.jabref.external.DroppedFileHandler;
 import net.sf.jabref.external.ExternalFileType;
 import net.sf.jabref.external.TransferableFileLinkSelection;
-import net.sf.jabref.gui.MainTable;
-import net.sf.jabref.gui.MainTableFormat;
+import net.sf.jabref.gui.maintable.MainTable;
+import net.sf.jabref.gui.maintable.MainTableFormat;
 import net.sf.jabref.importer.ImportMenuItem;
 import net.sf.jabref.importer.OpenDatabaseAction;
 import net.sf.jabref.pdfimport.PdfImporter;
@@ -187,17 +187,10 @@ public boolean canImport(JComponent comp, DataFlavor[] transferFlavors) {
 
     @Override
     public void exportAsDrag(JComponent comp, InputEvent e, int action) {
-        /* TODO: add support for dragging file link from table icon into other apps */
         if (e instanceof MouseEvent) {
-            MouseEvent me = (MouseEvent) e;
-            int col = entryTable.columnAtPoint(me.getPoint());
-            String[] res = entryTable.getIconTypeForColumn(col);
-            if (res == null) {
-                super.exportAsDrag(comp, e, DnDConstants.ACTION_LINK);
-                return;
-            }
-            // We have an icon column:
-            if (res == MainTableFormat.FILE) {
+            int columnIndex = entryTable.columnAtPoint(((MouseEvent) e).getPoint());
+            int modelIndex = entryTable.getColumnModel().getColumn(columnIndex).getModelIndex();
+            if(entryTable.isFileColumn(modelIndex)) {
                 LOGGER.info("Dragging file");
                 draggingFile = true;
             }

src/main/java/net/sf/jabref/gui/BasePanel.java

@@ -45,6 +45,9 @@
 import net.sf.jabref.gui.journals.AbbreviateAction;
 import net.sf.jabref.gui.journals.UnabbreviateAction;
 import net.sf.jabref.gui.labelPattern.SearchFixDuplicateLabels;
+import net.sf.jabref.gui.maintable.MainTable;
+import net.sf.jabref.gui.maintable.MainTableFormat;
+import net.sf.jabref.gui.maintable.MainTableSelectionListener;
 import net.sf.jabref.gui.mergeentries.MergeEntriesDialog;
 import net.sf.jabref.gui.mergeentries.MergeEntryDOIDialog;
 import net.sf.jabref.gui.search.SearchBar;
@@ -1505,7 +1508,7 @@ private void createMainTable() {
         if (filterSearchToggle != null) {
             filterSearchToggle.updateFilterList(searchFilterList);
         }
-        tableFormat = new MainTableFormat(this);
+        tableFormat = new MainTableFormat(database);
         tableFormat.updateTableFormat();
         mainTable = new MainTable(tableFormat, searchFilterList, frame, this);
 

src/main/java/net/sf/jabref/gui/GUIGlobals.java

@@ -150,7 +150,7 @@ public class GUIGlobals {
 
     public static final int WIDTH_ICON_COL_RANKING = 80; // Width of Ranking Icon Column
 
-    public static final int WIDTH_ICON_COL = 19;
+    public static final int WIDTH_ICON_COL = 26;
 
     // Column widths for export customization dialog table:
     public static final int EXPORT_DIALOG_COL_0_WIDTH = 50;

src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java

@@ -26,14 +26,7 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import javax.swing.AbstractAction;
 import javax.swing.ActionMap;
@@ -417,7 +410,7 @@ public void addEntries(Collection<BibtexEntry> entriesToAdd) {
      * Checks if there are duplicates to the given entry in the Collection. Does
      * not report the entry as duplicate of itself if it is in the Collection.
      *
-     * @param entries A Collection of BibtexEntry instances.
+     * @param entriesDupe A Collection of BibtexEntry instances.
      * @param entry   The entry to search for duplicates of.
      * @return A possible duplicate, if any, or null if none were found.
      */
@@ -1391,9 +1384,9 @@ private void setupComparatorChooser() {
             comparators = comparatorChooser.getComparatorsForColumn(i);
             comparators.clear();
             if (i == FILE_COL) {
-                comparators.add(new IconComparator(new String[]{Globals.FILE_FIELD}));
+                comparators.add(new IconComparator(Collections.singletonList(Globals.FILE_FIELD)));
             } else if (i == URL_COL) {
-                comparators.add(new IconComparator(new String[]{"url"}));
+                comparators.add(new IconComparator(Collections.singletonList("url")));
             }
 
         }