[med-svn] [mauve] 01/01: Adapt to latest zeus-jscl

[Andreas Tille]

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

tille pushed a commit to branch master
in repository mauve.

commit cf6629282154d4db3fe5c742a9b7816cf9933aef
Author: Andreas Tille <tille at debian.org>
Date:   Mon Apr 27 12:35:40 2015 +0200

    Adapt to latest zeus-jscl
---
 debian/get-orig-source                             |  3 +-
 debian/patches/revert_zeus-jscl_from_debian.patch  | 17 ------
 debian/patches/series                              |  2 +-
 .../use_JConsole_of_zeus-jscl_properly.patch       | 68 ++++++++++++++++++++++
 4 files changed, 70 insertions(+), 20 deletions(-)

diff --git a/debian/get-orig-source b/debian/get-orig-source
index 237fd4b..ea26fb9 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -28,8 +28,7 @@ LC_ALL=C svn export ${SVNURI} ${TARDIR} >/dev/null 2>/dev/null
 cd ${TARDIR}
 rm -rf osx win32 win64
 rm -rf linux-x64/mauveAligner linux-x86/mauveAligner linux-x64/progressiveMauve linux-x86/progressiveMauve
-# zeus-jscl should be removable as well but when using libzeus-jscl-java the build fails ...
-for libjava in ant bytecode commons-cli core dbus gui jebl postgres ; do
+for libjava in ant bytecode commons-cli core dbus gui jebl postgres zeus-jscl ; do
    find . -name "*${libjava}*.jar" -delete
 done
 rm -rf build_support/retroweaver
diff --git a/debian/patches/revert_zeus-jscl_from_debian.patch b/debian/patches/revert_zeus-jscl_from_debian.patch
deleted file mode 100644
index 22c722a..0000000
--- a/debian/patches/revert_zeus-jscl_from_debian.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Updated: Fri, 17 Apr 2015 15:38:22 +0200
-Description: Since the libzeus-jscl-java package does not (yet)
- work I revert this patch to enable further development on this package
- for the moment.  It should be disabled before upload.
-
---- a/build.xml
-+++ b/build.xml
-@@ -81,7 +81,7 @@
- 				${deblib}/biojava.jar;
- 				${deblib}/commons-cli.jar;
- 				${support}/junit.jar;
--				${deblib}/zeus-jscl.jar;
-+				${ext}/zeus-jscl.jar;
- 				${ext}/goose.jar;
- 				${ext}/ant-1.7.1.jar;
- 				${deblib}/dbus.jar;
diff --git a/debian/patches/series b/debian/patches/series
index 71dfd14..3eef136 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 build_xml.patch
 debian_classes.patch
-revert_zeus-jscl_from_debian.patch
+use_JConsole_of_zeus-jscl_properly.patch
diff --git a/debian/patches/use_JConsole_of_zeus-jscl_properly.patch b/debian/patches/use_JConsole_of_zeus-jscl_properly.patch
new file mode 100644
index 0000000..b0151eb
--- /dev/null
+++ b/debian/patches/use_JConsole_of_zeus-jscl_properly.patch
@@ -0,0 +1,68 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sun, 26 Apr 2015 15:22:19 +0200
+Subject: Adapt to latest libzeus-jscl-java version
+ For a detailed explanation see the debian-java mailing list archive
+ https://lists.debian.org/debian-java/2015/04/msg00106.html
+
+--- a/src/org/gel/mauve/MyConsole.java
++++ b/src/org/gel/mauve/MyConsole.java
+@@ -10,18 +10,20 @@ import java.io.PrintStream;
+ public class MyConsole {
+ 	private static boolean useSwing = false;
+ 
+-	private static JConsole console;
++	private static JConsole console = new JConsole();
+ 
+ 	public static void setUseSwing (boolean b) {
+ 		if (b && !useSwing) {
+-			console = JConsole.getConsole ();
+ 			console.setTitle ("Mauve Console");
+ 			console.setSize (400, 400);
+ 			Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
+ 			console.setLocation(dim.width-400, 0);
+-			console.startConsole ();
++			JConsole.getConsole().startConsole ();
++			if (!console.isVisible()) {
++				console.setVisible(true);
++			}
+ 		} else if (!b && useSwing) {
+-			console.stopConsole ();
++			JConsole.getConsole().stopConsole ();
+ 			console = null;
+ 		}
+ 
+@@ -30,13 +32,13 @@ public class MyConsole {
+ 
+ 	public static void showConsole () {
+ 		if (useSwing) {
+-			console.showConsole ();
++			JConsole.getConsole().showConsole ();
+ 		}
+ 	}
+ 
+ 	public static PrintStream err () {
+ 		if (useSwing) {
+-			console.showConsole ();
++			JConsole.getConsole().showConsole ();
+ 		}
+ 		return System.err;
+ 	}
+@@ -44,4 +46,4 @@ public class MyConsole {
+ 	public static PrintStream out () {
+ 		return System.out;
+ 	}
+-}
+\ No newline at end of file
++}
+--- a/src/org/gel/mauve/gui/MauveFrame.java
++++ b/src/org/gel/mauve/gui/MauveFrame.java
+@@ -497,8 +497,7 @@ public class MauveFrame extends JFrame implements ActionListener, ModelProgressL
+             }
+             if (source == jMenuHelpConsole || ae.getActionCommand().equals("Console"))
+             {
+-            	JConsole console = JConsole.getConsole();
+-            	console.showConsole();
++            	JConsole.getConsole().showConsole();
+             }
+             if (source == jMenuHelpClearCache || ae.getActionCommand().equals("ClearCache"))
+             {

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