[jabref] 01/02: Add patch for compatibility with jgoodies-forms 1.9.0

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository jabref.

commit daacac5a1964968d0a0f158ce4298bbf816d68ff
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Nov 21 00:19:19 2016 +0100

    Add patch for compatibility with jgoodies-forms 1.9.0
    
    (currently in experimental).
    
    Thanks: Oliver Kopp for providing the building blocks for the patch.
---
 debian/patches/jgoodies-1.9.0.patch | 75 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 76 insertions(+)

diff --git a/debian/patches/jgoodies-1.9.0.patch b/debian/patches/jgoodies-1.9.0.patch
new file mode 100644
index 0000000..fe09cd7
--- /dev/null
+++ b/debian/patches/jgoodies-1.9.0.patch
@@ -0,0 +1,75 @@
+Description: compatibility with jgoodies-forms 1.9.0
+Origin: vendor
+Forwarded: not-needed
+Author: Oliver Kopp <kopp.dev at gmail.com>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2016-11-21
+
+--- a/src/java/net/sf/jabref/AppearancePrefsTab.java
++++ b/src/java/net/sf/jabref/AppearancePrefsTab.java
+@@ -65,7 +65,7 @@
+                 ("1dlu, 8dlu, left:pref, 4dlu, fill:pref, 4dlu, fill:60dlu, 4dlu, fill:pref",
+                         "");
+         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
+-        builder.setLeadingColumnOffset(2);
++        builder.leadingColumnOffset(2);
+         JLabel lab;
+         builder.appendSeparator(Globals.lang("General"));
+         JPanel p1 = new JPanel();
+--- a/src/java/net/sf/jabref/external/DroppedFileHandler.java
++++ b/src/java/net/sf/jabref/external/DroppedFileHandler.java
+@@ -40,6 +40,7 @@
+ import com.jgoodies.forms.debug.FormDebugPanel;
+ import com.jgoodies.forms.layout.CellConstraints;
+ import com.jgoodies.forms.layout.FormLayout;
++import com.jgoodies.forms.factories.Borders;
+ 
+ /**
+  * This class holds the functionality of autolinking to a file that's dropped
+@@ -87,7 +88,7 @@
+         FormLayout layout = new FormLayout("left:15dlu,pref,pref,pref","bottom:14pt,pref,pref,pref,pref");
+         layout.setRowGroups(new int[][]{{1, 2, 3, 4, 5}});
+         DefaultFormBuilder builder = new DefaultFormBuilder(layout,	optionsPanel);
+-        builder.setDefaultDialogBorder();
++        builder.border(Borders.DIALOG);
+         CellConstraints cc = new CellConstraints();
+         
+         builder.add(linkInPlace, cc.xyw(1, 1, 4));
+--- a/src/java/net/sf/jabref/gui/CleanUpAction.java
++++ b/src/java/net/sf/jabref/gui/CleanUpAction.java
+@@ -47,6 +47,7 @@
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+ import com.jgoodies.forms.layout.CellConstraints;
+ import com.jgoodies.forms.layout.FormLayout;
++import com.jgoodies.forms.factories.Borders;
+ 
+ public class CleanUpAction extends AbstractWorker {
+ 	private Logger logger = Logger.getLogger(CleanUpAction.class.getName());
+@@ -136,7 +137,7 @@
+ 
+ 		FormLayout layout = new FormLayout("left:15dlu,pref:grow", "pref, pref, pref, pref, pref, pref, pref, pref, pref, pref, pref, pref, pref, pref");
+         DefaultFormBuilder builder = new DefaultFormBuilder(layout,	optionsPanel);
+-        builder.setDefaultDialogBorder();
++        builder.border(Borders.DIALOG);
+         CellConstraints cc = new CellConstraints();
+         builder.add(cleanUpHTML, cc.xyw(1,1,2));
+         builder.add(cleanUpUnicode, cc.xyw(1,2,2));
+--- a/src/java/net/sf/jabref/groups/GroupDialog.java
++++ b/src/java/net/sf/jabref/groups/GroupDialog.java
+@@ -46,6 +46,7 @@
+ import com.jgoodies.forms.builder.ButtonBarBuilder;
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+ import com.jgoodies.forms.layout.FormLayout;
++import com.jgoodies.forms.factories.Borders;
+ 
+ /**
+  * Dialog for creating or modifying groups. Operates directly on the Vector
+@@ -193,7 +194,7 @@
+                                                 + "p, 3dlu, p, 3dlu, top:80dlu, 9dlu, p, 9dlu, p");
+ 
+                 DefaultFormBuilder builderAll = new DefaultFormBuilder(layoutAll);
+-                builderAll.setDefaultDialogBorder();
++                builderAll.border(Borders.DIALOG);
+                 builderAll.appendSeparator(Globals.lang("General"));
+                 builderAll.nextLine();
+                 builderAll.nextLine();
diff --git a/debian/patches/series b/debian/patches/series
index 5307253..2d4bcba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ mrDlib_jayatana.patch
 generated_JabRefPlugin.java.patch
 fix-headless-bibtex-output.diff
 upstream_1240.patch
+jgoodies-1.9.0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git