Fixes the compatibility with Java 9archive/debian/3.0.5-1

Forwarded: no

Gbp-Pq: Name java9-compatibility.diff

2 files changed, 4 insertions, 8 deletions

diff --git a/build.xml b/build.xml
index 0d31094..e045e53 100755
--- 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" includeantruntime="false">

         <src path="${src.dir}"/>

            <include name="com/vldocking/**"/>

@@ -127,4 +128,4 @@
   </target>

 </project>

 

-<!-- End of build.xml -->
\ No newline at end of file
+<!-- End of build.xml -->

diff --git a/src/main/java/com/vlsolutions/swing/docking/DockingUtilities.java b/src/main/java/com/vlsolutions/swing/docking/DockingUtilities.java
index bff8d47..7e1573f 100644
--- a/src/main/java/com/vlsolutions/swing/docking/DockingUtilities.java
+++ b/src/main/java/com/vlsolutions/swing/docking/DockingUtilities.java
@@ -19,7 +19,6 @@ You can read the complete license here :
 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;
@@ -291,9 +290,7 @@ public class DockingUtilities {
 	public static boolean isHeavyWeightComponent(Component comp) {
 		if(comp instanceof Container) {
 			// short cut
-			@SuppressWarnings("deprecation")
-			Object peer = comp.getPeer();
-			if(! (peer == null || peer instanceof LightweightPeer)) {
+			if (comp.isDisplayable() && !comp.isLightweight()){
 				// it's not a lightweight
 				return true;
 			} else {
@@ -308,9 +305,7 @@ public class DockingUtilities {
 				return false;
 			}
 		} else {
-			@SuppressWarnings("deprecation")
-			Object peer = comp.getPeer();
-			return ! (peer == null || peer instanceof LightweightPeer);
+			return comp.isDisplayable() && !comp.isLightweight();
 		}
 	}