debian/patches/06_BibtexEntry.patch

   1 Author: Philip Rinn <rinni@gmx.net>
   2 Description: Fixing incompatible types
   3 --- a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
   4 +++ b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
   5 @@ -1319,7 +1319,7 @@ public class ImportInspectionDialog exte
   6      @SuppressWarnings("unchecked")
   7      protected void setupComparatorChooser() {
   8          // First column:
   9 -        java.util.List<Comparator<BibtexEntry>> comparators = comparatorChooser
  10 +        java.util.List<Comparator> comparators = comparatorChooser
  11              .getComparatorsForColumn(0);
  12          comparators.clear();
  13
  14 @@ -1478,4 +1478,4 @@ public class ImportInspectionDialog exte
  15      public void toFront() {
  16          super.toFront();
  17      }
  18 -}
  19 \ No newline at end of file
  20 +}
  21 --- a/src/java/net/sf/jabref/gui/MainTable.java
  22 +++ b/src/java/net/sf/jabref/gui/MainTable.java
  23 @@ -323,7 +323,7 @@ public class MainTable extends JTable {
  24      @SuppressWarnings("unchecked")
  25         private void setupComparatorChooser() {
  26          // First column:
  27 -        List<Comparator<BibtexEntry>> comparators = comparatorChooser.getComparatorsForColumn(0);
  28 +        List<Comparator> comparators = comparatorChooser.getComparatorsForColumn(0);
  29          comparators.clear();
  30          comparators.add(new FirstColumnComparator(panel.database()));
  31
  32 @@ -624,7 +624,7 @@ public class MainTable extends JTable {
  33       */
  34      @SuppressWarnings("unchecked")
  35         public Comparator<BibtexEntry> getComparatorForColumn(int index) {
  36 -        List<Comparator<BibtexEntry>> l = comparatorChooser.getComparatorsForColumn(index);
  37 +        List<Comparator> l = comparatorChooser.getComparatorsForColumn(index);
  38          return l.size() == 0 ? null : l.get(0);
  39      }
  40
  41 --- a/src/java/net/sf/jabref/gui/SearchResultsDialog.java
  42 +++ b/src/java/net/sf/jabref/gui/SearchResultsDialog.java
  43 @@ -176,7 +176,7 @@ public class SearchResultsDialog {
  44      @SuppressWarnings("unchecked")
  45      protected void setupComparatorChooser(TableComparatorChooser<BibtexEntry> comparatorChooser) {
  46          // First column:
  47 -        java.util.List<Comparator<BibtexEntry>> comparators = comparatorChooser
  48 +        java.util.List<Comparator> comparators = comparatorChooser
  49              .getComparatorsForColumn(0);
  50          comparators.clear();
  51