add philip's changes as quilt patches, remove old dpatch patches, hook quilt into...
[debian/jabref.git] / debian / patches / BibtexEntry.patch
1 --- a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
2 +++ b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
3 @@ -1319,7 +1319,7 @@
4      @SuppressWarnings("unchecked")
5      protected void setupComparatorChooser() {
6          // First column:
7 -        java.util.List<Comparator<BibtexEntry>> comparators = comparatorChooser
8 +        java.util.List<Comparator> comparators = comparatorChooser
9              .getComparatorsForColumn(0);
10          comparators.clear();
11  
12 @@ -1477,4 +1477,4 @@
13      public void toFront() {
14          super.toFront();
15      }
16 -}
17 \ No newline at end of file
18 +}
19 --- a/src/java/net/sf/jabref/gui/MainTable.java
20 +++ b/src/java/net/sf/jabref/gui/MainTable.java
21 @@ -319,7 +319,7 @@
22      @SuppressWarnings("unchecked")
23         private void setupComparatorChooser() {
24          // First column:
25 -        List<Comparator<BibtexEntry>> comparators = comparatorChooser.getComparatorsForColumn(0);
26 +        List<Comparator> comparators = comparatorChooser.getComparatorsForColumn(0);
27          comparators.clear();
28          comparators.add(new FirstColumnComparator(panel.database()));
29  
30 @@ -618,7 +618,7 @@
31       */
32      @SuppressWarnings("unchecked")
33         public Comparator<BibtexEntry> getComparatorForColumn(int index) {
34 -        List<Comparator<BibtexEntry>> l = comparatorChooser.getComparatorsForColumn(index);
35 +        List<Comparator> l = comparatorChooser.getComparatorsForColumn(index);
36          return l.size() == 0 ? null : l.get(0);
37      }
38  
39 --- a/src/java/net/sf/jabref/gui/SearchResultsDialog.java
40 +++ b/src/java/net/sf/jabref/gui/SearchResultsDialog.java
41 @@ -166,7 +166,7 @@
42      @SuppressWarnings("unchecked")
43      protected void setupComparatorChooser(TableComparatorChooser<BibtexEntry> comparatorChooser) {
44          // First column:
45 -        java.util.List<Comparator<BibtexEntry>> comparators = comparatorChooser
46 +        java.util.List<Comparator> comparators = comparatorChooser
47              .getComparatorsForColumn(0);
48          comparators.clear();
49