[med-svn] [tn-seqexplorer] 02/02: Fix jgoodies-forms patch

[Andreas Tille]

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

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

commit 117c332c18df7bd0e3d348690926e117716fe298
Author: Andreas Tille <tille at debian.org>
Date:   Mon May 8 09:35:52 2017 +0200

    Fix jgoodies-forms patch
---
 debian/control                             | 1 -
 debian/patches/libjgoodies-from-java.patch | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 19d068b..820eaa3 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends: debhelper (>= 10),
                libjgoodies-forms-java,
                libswingx-java,
                libexternalsortinginjava-java,
-               libjgoodies-forms-java
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/tn-seqexplorer.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/tn-seqexplorer.git
diff --git a/debian/patches/libjgoodies-from-java.patch b/debian/patches/libjgoodies-from-java.patch
index c1d61bf..ec36978 100644
--- a/debian/patches/libjgoodies-from-java.patch
+++ b/debian/patches/libjgoodies-from-java.patch
@@ -12,7 +12,7 @@ Last-Updated: 2017-05-07
  import org.apache.log4j.Logger;
  
 -import com.jgoodies.forms.factories.FormFactory;
-+import com.jgoodies.forms.factories.FormSpecs;
++//import com.jgoodies.forms.layout.FormLayout;
  import com.jgoodies.forms.layout.ColumnSpec;
  import com.jgoodies.forms.layout.FormLayout;
  import com.jgoodies.forms.layout.RowSpec;
@@ -109,19 +109,18 @@ Last-Updated: 2017-05-07
  		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;
+@@ -20,8 +20,9 @@ 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 {
+@@ -63,27 +64,27 @@ public class PlotViewer extends JFrame {
  		contentPane.add(parametersPanel);
  		parametersPanel.setLayout(new FormLayout(new ColumnSpec[] {
  				ColumnSpec.decode("155px"),

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