[med-svn] [tn-seqexplorer] 01/01: Deal with errors in jgoodies-form

Andreas Tille tille at debian.org
Sun May 7 14:24:55 UTC 2017


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

tille pushed a commit to branch master
in repository tn-seqexplorer.

commit 1bfaa23f2096fb219042ca335a7029bdfcdfcbac
Author: Andreas Tille <tille at debian.org>
Date:   Sun May 7 16:24:25 2017 +0200

    Deal with errors in jgoodies-form
---
 debian/patches/libjgoodies-from-java.patch | 162 +++++++++++++++++++++++++++++
 debian/patches/series                      |   1 +
 2 files changed, 163 insertions(+)

diff --git a/debian/patches/libjgoodies-from-java.patch b/debian/patches/libjgoodies-from-java.patch
new file mode 100644
index 0000000..c1d61bf
--- /dev/null
+++ b/debian/patches/libjgoodies-from-java.patch
@@ -0,0 +1,162 @@
+Author: Andreas Tille <tille at debian.org>
+Forwarded: no
+Description: libjgoodies-form-java has been updated to version >= 1.9
+ in Debian repo. Releases have broken some interfaces, failing biomaj.
+ This patch updates code to make the library modifications
+Last-Updated: 2017-05-07
+
+--- a/src/CompareUtilities/Compare.java
++++ b/src/CompareUtilities/Compare.java
+@@ -22,10 +22,12 @@ import javax.swing.border.EmptyBorder;
+ 
+ import org.apache.log4j.Logger;
+ 
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.factories.FormSpecs;
+ import com.jgoodies.forms.layout.ColumnSpec;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.layout.RowSpec;
++import com.jgoodies.forms.factories.*;
++import com.jgoodies.forms.layout.*;
+ 
+ public class Compare extends JFrame {
+ 
+@@ -73,47 +75,47 @@ public class Compare extends JFrame {
+ 		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
+ 		setContentPane(contentPane);
+ 		contentPane.setLayout(new FormLayout(new ColumnSpec[] {
+-				FormFactory.RELATED_GAP_COLSPEC,
++				FormSpecs.RELATED_GAP_COLSPEC,
+ 				ColumnSpec.decode("max(87dlu;default)"),
+-				FormFactory.RELATED_GAP_COLSPEC,
++				FormSpecs.RELATED_GAP_COLSPEC,
+ 				ColumnSpec.decode("default:grow"),
+-				FormFactory.RELATED_GAP_COLSPEC,
+-				FormFactory.DEFAULT_COLSPEC,},
++				FormSpecs.RELATED_GAP_COLSPEC,
++				FormSpecs.DEFAULT_COLSPEC,},
+ 			new RowSpec[] {
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,}));
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,}));
+ 		
+ 		JLabel lblInputDataSet = new JLabel("Input data set one");
+ 		contentPane.add(lblInputDataSet, "2, 2, left, default");
+--- a/src/GUI/PlotViewer.java
++++ b/src/GUI/PlotViewer.java
+@@ -20,8 +20,10 @@ import org.jfree.data.Range;
+ 
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.layout.ColumnSpec;
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.factories.FormSpecs;
+ import com.jgoodies.forms.layout.RowSpec;
++import com.jgoodies.forms.factories.*;
++import com.jgoodies.forms.layout.*;
+ import java.awt.Font;
+ 
+ @SuppressWarnings("serial")
+@@ -63,27 +65,27 @@ public class PlotViewer extends JFrame {
+ 		contentPane.add(parametersPanel);
+ 		parametersPanel.setLayout(new FormLayout(new ColumnSpec[] {
+ 				ColumnSpec.decode("155px"),
+-				FormFactory.RELATED_GAP_COLSPEC,
++				FormSpecs.RELATED_GAP_COLSPEC,
+ 				ColumnSpec.decode("max(47dlu;default)"),
+ 				ColumnSpec.decode("67px"),
+-				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++				FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ 				ColumnSpec.decode("59px"),
+-				FormFactory.RELATED_GAP_COLSPEC,
++				FormSpecs.RELATED_GAP_COLSPEC,
+ 				ColumnSpec.decode("max(41dlu;default)"),
+-				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++				FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ 				ColumnSpec.decode("61px"),
+-				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++				FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ 				ColumnSpec.decode("23px"),
+-				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++				FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ 				ColumnSpec.decode("32px"),
+-				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++				FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ 				ColumnSpec.decode("89px"),},
+ 			new RowSpec[] {
+-				FormFactory.LINE_GAP_ROWSPEC,
++				FormSpecs.LINE_GAP_ROWSPEC,
+ 				RowSpec.decode("20px"),
+-				FormFactory.RELATED_GAP_ROWSPEC,
+-				FormFactory.DEFAULT_ROWSPEC,
+-				FormFactory.LINE_GAP_ROWSPEC,
++				FormSpecs.RELATED_GAP_ROWSPEC,
++				FormSpecs.DEFAULT_ROWSPEC,
++				FormSpecs.LINE_GAP_ROWSPEC,
+ 				RowSpec.decode("23px"),}));
+ 		
+ 		JLabel lblChangePlotRanges = new JLabel("Change plot ranges:");
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..545c2cd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+libjgoodies-from-java.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/tn-seqexplorer.git



More information about the debian-med-commit mailing list