Remove patch 06_BibtexEntry.patch, applied upstream.
authorgregor herrmann <gregoa@debian.org>
Mon, 29 Oct 2012 18:06:45 +0000 (19:06 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 29 Oct 2012 18:11:50 +0000 (19:11 +0100)
debian/patches/06_BibtexEntry.patch [deleted file]
debian/patches/series

diff --git a/debian/patches/06_BibtexEntry.patch b/debian/patches/06_BibtexEntry.patch
deleted file mode 100644 (file)
index f7f46fd..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-Author: Philip Rinn <rinni@gmx.net>
-Description: Fixing incompatible types
---- a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
-+++ b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
-@@ -1319,7 +1319,7 @@ public class ImportInspectionDialog exte
-     @SuppressWarnings("unchecked")
-     protected void setupComparatorChooser() {
-         // First column:
--        java.util.List<Comparator<BibtexEntry>> comparators = comparatorChooser
-+        java.util.List<Comparator> comparators = comparatorChooser
-             .getComparatorsForColumn(0);
-         comparators.clear();
-@@ -1478,4 +1478,4 @@ public class ImportInspectionDialog exte
-     public void toFront() {
-         super.toFront();
-     }
--}
-\ No newline at end of file
-+}
---- a/src/java/net/sf/jabref/gui/MainTable.java
-+++ b/src/java/net/sf/jabref/gui/MainTable.java
-@@ -323,7 +323,7 @@ public class MainTable extends JTable {
-     @SuppressWarnings("unchecked")
-       private void setupComparatorChooser() {
-         // First column:
--        List<Comparator<BibtexEntry>> comparators = comparatorChooser.getComparatorsForColumn(0);
-+        List<Comparator> comparators = comparatorChooser.getComparatorsForColumn(0);
-         comparators.clear();
-         comparators.add(new FirstColumnComparator(panel.database()));
-@@ -624,7 +624,7 @@ public class MainTable extends JTable {
-      */
-     @SuppressWarnings("unchecked")
-       public Comparator<BibtexEntry> getComparatorForColumn(int index) {
--        List<Comparator<BibtexEntry>> l = comparatorChooser.getComparatorsForColumn(index);
-+        List<Comparator> l = comparatorChooser.getComparatorsForColumn(index);
-         return l.size() == 0 ? null : l.get(0);
-     }
---- a/src/java/net/sf/jabref/gui/SearchResultsDialog.java
-+++ b/src/java/net/sf/jabref/gui/SearchResultsDialog.java
-@@ -176,7 +176,7 @@ public class SearchResultsDialog {
-     @SuppressWarnings("unchecked")
-     protected void setupComparatorChooser(TableComparatorChooser<BibtexEntry> comparatorChooser) {
-         // First column:
--        java.util.List<Comparator<BibtexEntry>> comparators = comparatorChooser
-+        java.util.List<Comparator> comparators = comparatorChooser
-             .getComparatorsForColumn(0);
-         comparators.clear();
index db9175d..179445a 100644 (file)
@@ -1,6 +1,5 @@
 02_libs.patch
 05_antlr32.patch
-06_BibtexEntry.patch
 07_pdfbox1.5.patch
 08_doubleextensions.patch
 09_looks2.5.patch