Add patch to fix JComboBox errors.
authorgregor herrmann <gregoa@debian.org>
Fri, 29 Mar 2013 20:08:51 +0000 (21:08 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 29 Mar 2013 20:08:51 +0000 (21:08 +0100)
debian/patches/jcombobox-parameter.patch [new file with mode: 0644]
debian/patches/series

diff --git a/debian/patches/jcombobox-parameter.patch b/debian/patches/jcombobox-parameter.patch
new file mode 100644 (file)
index 0000000..3bc13f2
--- /dev/null
@@ -0,0 +1,30 @@
+Description: workaround error:
+    [javac] /tmp/buildd/jabref-2.10~beta1+ds/src/java/net/sf/jabref/FileTab.java:40: type javax.swing.JComboBox does not take parameters
+    [javac]     private JComboBox<String> valueDelimiter;
+    [javac]                      ^
+
+    [javac] /tmp/buildd/jabref-2.10~beta1+ds/src/java/net/sf/jabref/FileTab.java:70: type javax.swing.JComboBox does not take parameters
+    [javac]         valueDelimiter = new JComboBox<String>(new String[]{
+    [javac]                                       ^
+
+
+--- a/src/java/net/sf/jabref/FileTab.java
++++ b/src/java/net/sf/jabref/FileTab.java
+@@ -37,7 +37,7 @@
+     private JCheckBox backup, openLast, autoDoubleBraces, autoSave,
+             promptBeforeUsingAutoSave, includeEmptyFields, camelCase, sameColumn;
+-    private JComboBox<String> valueDelimiter;
++    private JComboBox valueDelimiter;
+     private JRadioButton
+         saveOriginalOrder, saveAuthorOrder, saveTableOrder, saveTitleOrder,
+         exportOriginalOrder, exportAuthorOrder, exportTableOrder, exportTitleOrder,
+@@ -67,7 +67,7 @@
+         autoSave = new JCheckBox(Globals.lang("Autosave"));
+         promptBeforeUsingAutoSave = new JCheckBox(Globals.lang("Prompt before recovering a database from an autosave file"));
+         autoSaveInterval = new JSpinner(new SpinnerNumberModel(1, 1, 60, 1));
+-        valueDelimiter = new JComboBox<String>(new String[]{
++        valueDelimiter = new JComboBox(new String[]{
+                 Globals.lang("Quotes") + ": \", \"",
+                 Globals.lang("Curly Brackets") + ": {, }" });
+         includeEmptyFields = new JCheckBox(Globals.lang("Include empty fields"));
index 9ed273d..f9ab484 100644 (file)
@@ -1,3 +1,4 @@
 debian_libs.patch
 mrDlib_jayatana.patch
 generated_JabRefPlugin.java.patch
+jcombobox-parameter.patch