This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libvldocking-java.
commit ce6024a7fd46a40285888c7105f7d5fe7bbb3759
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Wed Mar 28 14:20:59 2018 +0200
Fixed the build failure with Java 9 (Closes: #893296)
---
debian/changelog | 1 +
debian/patches/java9-compatibility.diff | 43 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 45 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 80444c9..a048d51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libvldocking-java (2.1.4-5) UNRELEASED; urgency=low
* Team upload.
+ * Fixed the build failure with Java 9 (Closes: #893296)
* Removed the javadoc from the binary package
* Moved the package to Git (Closes: #670289)
* Build with the DH sequencer instead of CDBS
diff --git a/debian/patches/java9-compatibility.diff
b/debian/patches/java9-compatibility.diff
new file mode 100644
index 0000000..cddd6e0
--- /dev/null
+++ b/debian/patches/java9-compatibility.diff
@@ -0,0 +1,43 @@
+Description: Fixes the compatibility with Java 9
+Author: Emmanuel Bourg <ebo...@apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -52,6 +52,7 @@
+
+ <javac destdir="${build.dir}"
+ classpath="${classpath};"
++ encoding="ISO-8859-1"
+ debug="on" deprecation="off" optimize="on" source="1.4"
target="1.4">
+ <src path="${src.dir}"/>
+ <include name="com/vlsolutions/**"/>
+--- a/src/com/vlsolutions/swing/docking/DockingUtilities.java
++++ b/src/com/vlsolutions/swing/docking/DockingUtilities.java
+@@ -82,7 +82,6 @@
+ package com.vlsolutions.swing.docking;
+
+ import java.awt.*;
+-import java.awt.peer.LightweightPeer;
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
+ import java.util.ArrayList;
+@@ -350,8 +349,7 @@
+ public static boolean isHeavyWeightComponent(Component comp){
+ if (comp instanceof Container){
+ // short cut
+- Object peer = comp.getPeer();
+- if (!(peer == null || peer instanceof LightweightPeer)){
++ if (comp.isDisplayable() && !comp.isLightweight()){
+ // it's not a lightweight
+ return true;
+ } else {
+@@ -366,8 +364,7 @@
+ return false;
+ }
+ } else {
+- Object peer = comp.getPeer();
+- return !(peer == null || peer instanceof LightweightPeer);
++ return comp.isDisplayable() && !comp.isLightweight();
+ }
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index c614a3c..8effed7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
build.diff
+java9-compatibility.diff
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/libvldocking-java.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
