This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit d8092891223aa3044a48f0a3e71f831b0d007ec5 Author: gregor herrmann <[email protected]> Date: Fri Mar 29 21:08:51 2013 +0100 Add patch to fix JComboBox errors. --- debian/patches/jcombobox-parameter.patch | 30 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 31 insertions(+) diff --git a/debian/patches/jcombobox-parameter.patch b/debian/patches/jcombobox-parameter.patch new file mode 100644 index 0000000..3bc13f2 --- /dev/null +++ b/debian/patches/jcombobox-parameter.patch @@ -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")); diff --git a/debian/patches/series b/debian/patches/series index 9ed273d..f9ab484 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ debian_libs.patch mrDlib_jayatana.patch generated_JabRefPlugin.java.patch +jcombobox-parameter.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
