1 Description: workaround error:
2 [javac] /tmp/buildd/jabref-2.10~beta1+ds/src/java/net/sf/jabref/FileTab.java:40: type javax.swing.JComboBox does not take parameters
3 [javac] private JComboBox<String> valueDelimiter;
6 [javac] /tmp/buildd/jabref-2.10~beta1+ds/src/java/net/sf/jabref/FileTab.java:70: type javax.swing.JComboBox does not take parameters
7 [javac] valueDelimiter = new JComboBox<String>(new String[]{
10 Forwarded: via private mail
11 Author: gregor herrmann <gregoa@debian.org>
12 Last-Update: 2013-03-30
13 Applied-Upstream: git, beta_2.10 branch, 2711226bada0120f9a98d78834e7f46f3e9a3390
15 --- a/src/java/net/sf/jabref/FileTab.java
16 +++ b/src/java/net/sf/jabref/FileTab.java
19 private JCheckBox backup, openLast, autoDoubleBraces, autoSave,
20 promptBeforeUsingAutoSave, includeEmptyFields, camelCase, sameColumn;
21 - private JComboBox<String> valueDelimiter;
22 + private JComboBox valueDelimiter;
24 saveOriginalOrder, saveAuthorOrder, saveTableOrder, saveTitleOrder,
25 exportOriginalOrder, exportAuthorOrder, exportTableOrder, exportTitleOrder,
27 autoSave = new JCheckBox(Globals.lang("Autosave"));
28 promptBeforeUsingAutoSave = new JCheckBox(Globals.lang("Prompt before recovering a database from an autosave file"));
29 autoSaveInterval = new JSpinner(new SpinnerNumberModel(1, 1, 60, 1));
30 - valueDelimiter = new JComboBox<String>(new String[]{
31 + valueDelimiter = new JComboBox(new String[]{
32 Globals.lang("Quotes") + ": \", \"",
33 Globals.lang("Curly Brackets") + ": {, }" });
34 includeEmptyFields = new JCheckBox(Globals.lang("Include empty fields"));