From d9bd02ffc269240b77c01153f6f48c643e1991ce Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Fri, 18 Apr 2014 10:47:23 +0400 Subject: [PATCH 01/50] 8035169: Move ThreadGroupUtils from the sun.misc package Reviewed-by: anthony, serb, azvegint --- jdk/src/macosx/classes/sun/font/CFontManager.java | 2 +- jdk/src/macosx/classes/sun/lwawt/LWToolkit.java | 2 +- jdk/src/macosx/native/sun/awt/awt.m | 2 +- jdk/src/share/classes/sun/awt/AWTAutoShutdown.java | 2 +- .../classes/sun/{misc => awt/util}/ThreadGroupUtils.java | 4 ++-- jdk/src/share/classes/sun/font/CreatedFontTracker.java | 2 +- jdk/src/share/classes/sun/font/SunFontManager.java | 2 +- jdk/src/share/classes/sun/java2d/Disposer.java | 2 +- jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/XToolkit.java | 2 +- jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java | 2 +- .../classes/sun/awt/shell/Win32ShellFolderManager2.java | 2 +- jdk/src/windows/classes/sun/awt/windows/WToolkit.java | 2 +- .../classes/sun/java2d/d3d/D3DScreenUpdateManager.java | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) rename jdk/src/share/classes/sun/{misc => awt/util}/ThreadGroupUtils.java (95%) diff --git a/jdk/src/macosx/classes/sun/font/CFontManager.java b/jdk/src/macosx/classes/sun/font/CFontManager.java index ad2bfab62ba..8e1cead53c2 100644 --- a/jdk/src/macosx/classes/sun/font/CFontManager.java +++ b/jdk/src/macosx/classes/sun/font/CFontManager.java @@ -40,7 +40,7 @@ import javax.swing.plaf.FontUIResource; import sun.awt.FontConfiguration; import sun.awt.HeadlessToolkit; -import sun.misc.ThreadGroupUtils; +import sun.awt.util.ThreadGroupUtils; import sun.lwawt.macosx.*; public class CFontManager extends SunFontManager { diff --git a/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java b/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java index 8dd9467eed6..b18fdb004f1 100644 --- a/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java +++ b/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java @@ -35,7 +35,7 @@ import java.util.*; import sun.awt.*; import sun.print.*; -import sun.misc.ThreadGroupUtils; +import sun.awt.util.ThreadGroupUtils; import static sun.lwawt.LWWindowPeer.PeerType; diff --git a/jdk/src/macosx/native/sun/awt/awt.m b/jdk/src/macosx/native/sun/awt/awt.m index 0f553d0e69f..f5fe3ea9eba 100644 --- a/jdk/src/macosx/native/sun/awt/awt.m +++ b/jdk/src/macosx/native/sun/awt/awt.m @@ -435,7 +435,7 @@ JNF_COCOA_ENTER(env); forceEmbeddedMode = YES; } JNIEnv* env = [ThreadUtilities getJNIEnvUncached]; - jclass jc_ThreadGroupUtils = (*env)->FindClass(env, "sun/misc/ThreadGroupUtils"); + jclass jc_ThreadGroupUtils = (*env)->FindClass(env, "sun/awt/util/ThreadGroupUtils"); jmethodID sjm_getRootThreadGroup = (*env)->GetStaticMethodID(env, jc_ThreadGroupUtils, "getRootThreadGroup", "()Ljava/lang/ThreadGroup;"); jobject rootThreadGroup = (*env)->CallStaticObjectMethod(env, jc_ThreadGroupUtils, sjm_getRootThreadGroup); [ThreadUtilities setAppkitThreadGroup:(*env)->NewGlobalRef(env, rootThreadGroup)]; diff --git a/jdk/src/share/classes/sun/awt/AWTAutoShutdown.java b/jdk/src/share/classes/sun/awt/AWTAutoShutdown.java index f03cd50988d..d5b7633f224 100644 --- a/jdk/src/share/classes/sun/awt/AWTAutoShutdown.java +++ b/jdk/src/share/classes/sun/awt/AWTAutoShutdown.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Set; import sun.util.logging.PlatformLogger; -import sun.misc.ThreadGroupUtils; +import sun.awt.util.ThreadGroupUtils; /** * This class is to let AWT shutdown automatically when a user is done diff --git a/jdk/src/share/classes/sun/misc/ThreadGroupUtils.java b/jdk/src/share/classes/sun/awt/util/ThreadGroupUtils.java similarity index 95% rename from jdk/src/share/classes/sun/misc/ThreadGroupUtils.java rename to jdk/src/share/classes/sun/awt/util/ThreadGroupUtils.java index 066a8002f72..5d58a1c29d4 100644 --- a/jdk/src/share/classes/sun/misc/ThreadGroupUtils.java +++ b/jdk/src/share/classes/sun/awt/util/ThreadGroupUtils.java @@ -23,13 +23,13 @@ * questions. */ -package sun.misc; +package sun.awt.util; /** * A utility class needed to access the root {@code ThreadGroup} * * The class should not depend on any others, because it' called from JNI_OnLoad of the AWT - * native library. Triggering class loading could could lead to a deadlock. + * native library. Triggering class loading could lead to a deadlock. */ public final class ThreadGroupUtils { diff --git a/jdk/src/share/classes/sun/font/CreatedFontTracker.java b/jdk/src/share/classes/sun/font/CreatedFontTracker.java index 02b264db785..43f8b098658 100644 --- a/jdk/src/share/classes/sun/font/CreatedFontTracker.java +++ b/jdk/src/share/classes/sun/font/CreatedFontTracker.java @@ -35,7 +35,7 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import sun.awt.AppContext; -import sun.misc.ThreadGroupUtils; +import sun.awt.util.ThreadGroupUtils; public class CreatedFontTracker { diff --git a/jdk/src/share/classes/sun/font/SunFontManager.java b/jdk/src/share/classes/sun/font/SunFontManager.java index 8487b9632a1..04df414365c 100644 --- a/jdk/src/share/classes/sun/font/SunFontManager.java +++ b/jdk/src/share/classes/sun/font/SunFontManager.java @@ -52,7 +52,7 @@ import javax.swing.plaf.FontUIResource; import sun.awt.AppContext; import sun.awt.FontConfiguration; import sun.awt.SunToolkit; -import sun.misc.ThreadGroupUtils; +import sun.awt.util.ThreadGroupUtils; import sun.java2d.FontSupport; import sun.util.logging.PlatformLogger; diff --git a/jdk/src/share/classes/sun/java2d/Disposer.java b/jdk/src/share/classes/sun/java2d/Disposer.java index 1acf1447cdc..ba69ce763dd 100644 --- a/jdk/src/share/classes/sun/java2d/Disposer.java +++ b/jdk/src/share/classes/sun/java2d/Disposer.java @@ -25,7 +25,7 @@ package sun.java2d; -import sun.misc.ThreadGroupUtils; +import sun.awt.util.ThreadGroupUtils; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java b/jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java index a73a883d16f..ecf1ed3467b 100644 --- a/jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java +++ b/jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java @@ -25,7 +25,7 @@ package sun.java2d.opengl; -import sun.misc.ThreadGroupUtils; +import sun.awt.util.ThreadGroupUtils; import sun.java2d.pipe.RenderBuffer; import sun.java2d.pipe.RenderQueue; import static sun.java2d.pipe.BufferedOpCodes.*; diff --git a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java index c10a1d9522c..3648e874b6a 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java @@ -51,7 +51,7 @@ import sun.awt.datatransfer.DataTransferer; import sun.font.FontConfigManager; import sun.java2d.SunGraphicsEnvironment; import sun.misc.*; -import sun.misc.ThreadGroupUtils; +import sun.awt.util.ThreadGroupUtils; import sun.print.PrintJob2D; import sun.security.action.GetPropertyAction; import sun.security.action.GetBooleanAction; diff --git a/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java b/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java index d69a4a0bce0..10365f9a647 100644 --- a/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java +++ b/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java @@ -42,7 +42,7 @@ import sun.java2d.opengl.GLXGraphicsConfig; import sun.java2d.xr.XRGraphicsConfig; import sun.java2d.loops.SurfaceType; -import sun.misc.ThreadGroupUtils; +import sun.awt.util.ThreadGroupUtils; /** * This is an implementation of a GraphicsDevice object for a single diff --git a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java index c6b7351699e..269eff2e421 100644 --- a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java +++ b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java @@ -39,7 +39,7 @@ import java.util.concurrent.*; import static sun.awt.shell.Win32ShellFolder2.*; import sun.awt.OSInfo; -import sun.misc.ThreadGroupUtils; +import sun.awt.util.ThreadGroupUtils; // NOTE: This class supersedes Win32ShellFolderManager, which was removed // from distribution after version 1.4.2. diff --git a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java index 71af30e5190..2a27c2df9cc 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java +++ b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java @@ -40,7 +40,7 @@ import sun.awt.AWTAutoShutdown; import sun.awt.AWTPermissions; import sun.awt.LightweightFrame; import sun.awt.SunToolkit; -import sun.misc.ThreadGroupUtils; +import sun.awt.util.ThreadGroupUtils; import sun.awt.Win32GraphicsDevice; import sun.awt.Win32GraphicsEnvironment; import sun.awt.datatransfer.DataTransferer; diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java b/jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java index bc9e98eb85c..bd210e92765 100644 --- a/jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java +++ b/jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java @@ -38,7 +38,7 @@ import java.util.ArrayList; import java.util.HashMap; import sun.awt.AWTAccessor; -import sun.misc.ThreadGroupUtils; +import sun.awt.util.ThreadGroupUtils; import sun.awt.Win32GraphicsConfig; import sun.awt.windows.WComponentPeer; import sun.java2d.InvalidPipeException; From 0a31e5f2467b81735348e7b555ee106d11330f37 Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Fri, 18 Apr 2014 20:10:39 +0400 Subject: [PATCH 02/50] 8026252: [macosx] Change AWT_DEBUG_BUG_REPORT_MESSAGE for macosx platform Reviewed-by: azvegint, pchelko --- jdk/src/macosx/native/sun/osxapp/AWT_debug.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jdk/src/macosx/native/sun/osxapp/AWT_debug.h b/jdk/src/macosx/native/sun/osxapp/AWT_debug.h index 1d02a824f3a..46f57cc6d73 100644 --- a/jdk/src/macosx/native/sun/osxapp/AWT_debug.h +++ b/jdk/src/macosx/native/sun/osxapp/AWT_debug.h @@ -32,9 +32,10 @@ #define kInternalError "java/lang/InternalError" #define AWT_DEBUG_LOG(str) \ - NSLog(@"Cocoa AWT: %@ %@", str, [NSThread callStackSymbols]) + NSLog(@"\tCocoa AWT: %@ %@", str, [NSThread callStackSymbols]) #define AWT_DEBUG_BUG_REPORT_MESSAGE \ - NSLog(@"\tPlease file a bug report at http://java.net/jira/browse/MACOSX_PORT with this message and a reproducible test case.") + NSLog(@"\tPlease file a bug report at http://bugreport.java.com/bugreport \ +with this message and a reproducible test case.") #endif From 81ae76b8dd94c3d1cdbcdcd3cc8c6ad568646ab6 Mon Sep 17 00:00:00 2001 From: Henry Jen Date: Fri, 18 Apr 2014 09:56:34 -0700 Subject: [PATCH 03/50] 8038644: Fix raw and unchecked warnings in sun.java2d.* Reviewed-by: darcy, prr --- jdk/src/share/classes/sun/java2d/Spans.java | 23 ++++++++----------- .../classes/sun/java2d/SunGraphics2D.java | 7 ++++-- .../sun/java2d/SunGraphicsEnvironment.java | 2 +- .../classes/sun/java2d/cmm/lcms/LCMS.java | 4 ++-- .../share/classes/sun/java2d/loops/Blit.java | 12 +++++----- .../sun/java2d/loops/CustomComponent.java | 2 +- .../sun/java2d/loops/GeneralRenderer.java | 2 +- .../sun/java2d/loops/GraphicsPrimitive.java | 15 ++++++------ .../java2d/loops/GraphicsPrimitiveMgr.java | 21 +++++++++-------- .../java2d/loops/GraphicsPrimitiveProxy.java | 6 ++--- .../classes/sun/java2d/loops/MaskBlit.java | 12 +++++----- .../sun/java2d/opengl/OGLBlitLoops.java | 8 +++---- .../sun/java2d/pipe/AlphaPaintPipe.java | 20 ++++++++-------- .../classes/sun/java2d/pipe/RenderQueue.java | 4 ++-- .../sun/java2d/pipe/SpanClipRenderer.java | 6 ++--- .../sun/java2d/x11/X11SurfaceData.java | 2 +- 16 files changed, 74 insertions(+), 72 deletions(-) diff --git a/jdk/src/share/classes/sun/java2d/Spans.java b/jdk/src/share/classes/sun/java2d/Spans.java index ae708f1f161..abd1eda118f 100644 --- a/jdk/src/share/classes/sun/java2d/Spans.java +++ b/jdk/src/share/classes/sun/java2d/Spans.java @@ -49,7 +49,7 @@ public class Spans { * Holds a list of individual * Span instances. */ - private List mSpans = new Vector(kMaxAddsSinceSort); + private List mSpans = new Vector<>(kMaxAddsSinceSort); /** * The number of Span @@ -144,7 +144,7 @@ public class Spans { Collections.sort(mSpans); mAddsSinceSort = 0; - Iterator iter = mSpans.iterator(); + Iterator iter = mSpans.iterator(); /* Have 'span' start at the first span in * the collection. The collection may be empty @@ -152,7 +152,7 @@ public class Spans { */ Span span = null; if (iter.hasNext()) { - span = (Span) iter.next(); + span = iter.next(); } /* Loop over the spans collapsing those that intersect @@ -160,7 +160,7 @@ public class Spans { */ while (iter.hasNext()) { - Span nextSpan = (Span) iter.next(); + Span nextSpan = iter.next(); /* The spans are in ascending start position * order and so the next span's starting point @@ -202,9 +202,9 @@ public class Spans { private void printSpans() { System.out.println("----------"); if (mSpans != null) { - Iterator iter = mSpans.iterator(); + Iterator iter = mSpans.iterator(); while (iter.hasNext()) { - Span span = (Span) iter.next(); + Span span = iter.next(); System.out.println(span); } } @@ -216,7 +216,7 @@ public class Spans { /** * Holds a single half-open interval. */ - static class Span implements Comparable { + static class Span implements Comparable { /** * The span includes the starting point. @@ -315,8 +315,7 @@ public class Spans { * position. The end position is ignored * in this ranking. */ - public int compareTo(Object o) { - Span otherSpan = (Span) o; + public int compareTo(Span otherSpan) { float otherStart = otherSpan.getStart(); int result; @@ -345,7 +344,7 @@ public class Spans { * SpanIntersection.instance to * get the single instance of this class. */ - static class SpanIntersection implements Comparator { + static class SpanIntersection implements Comparator { /** * This class is a Singleton and the following @@ -361,10 +360,8 @@ public class Spans { } - public int compare(Object o1, Object o2) { + public int compare(Span span1, Span span2) { int result; - Span span1 = (Span) o1; - Span span2 = (Span) o2; /* Span 1 is entirely to the left of span2. * span1: <-----< diff --git a/jdk/src/share/classes/sun/java2d/SunGraphics2D.java b/jdk/src/share/classes/sun/java2d/SunGraphics2D.java index 287549c2062..58f90c36b11 100644 --- a/jdk/src/share/classes/sun/java2d/SunGraphics2D.java +++ b/jdk/src/share/classes/sun/java2d/SunGraphics2D.java @@ -1430,8 +1430,11 @@ public final class SunGraphics2D } } - RenderingHints makeHints(Map hints) { - RenderingHints model = new RenderingHints(hints); + RenderingHints makeHints(Map hints) { + RenderingHints model = new RenderingHints(null); + if (hints != null) { + model.putAll(hints); + } model.put(SunHints.KEY_RENDERING, SunHints.Value.get(SunHints.INTKEY_RENDERING, renderHint)); diff --git a/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java b/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java index c4e0be79f1c..cc2d113e064 100644 --- a/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java +++ b/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java @@ -82,7 +82,7 @@ public abstract class SunGraphicsEnvironment extends GraphicsEnvironment public SunGraphicsEnvironment() { java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { + new java.security.PrivilegedAction() { public Object run() { String version = System.getProperty("os.version", "0.0"); try { diff --git a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java index d01dff66c45..c9333616065 100644 --- a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java +++ b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java @@ -189,7 +189,7 @@ public class LCMS implements PCMM { LCMSImageLayout dest); public static native void freeTransform(long ID); - public static native void initLCMS(Class Trans, Class IL, Class Pf); + public static native void initLCMS(Class Trans, Class IL, Class Pf); private LCMS() {}; @@ -201,7 +201,7 @@ public class LCMS implements PCMM { } java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { + new java.security.PrivilegedAction() { public Object run() { /* We need to load awt here because of usage trace and * disposer frameworks diff --git a/jdk/src/share/classes/sun/java2d/loops/Blit.java b/jdk/src/share/classes/sun/java2d/loops/Blit.java index 7a337e15214..802385279a2 100644 --- a/jdk/src/share/classes/sun/java2d/loops/Blit.java +++ b/jdk/src/share/classes/sun/java2d/loops/Blit.java @@ -217,8 +217,8 @@ public class Blit extends GraphicsPrimitive Blit performop; Blit convertresult; - WeakReference srcTmp; - WeakReference dstTmp; + WeakReference srcTmp; + WeakReference dstTmp; public GeneralXorBlit(SurfaceType srctype, CompositeType comptype, @@ -257,14 +257,14 @@ public class Blit extends GraphicsPrimitive } else { SurfaceData cachedSrc = null; if (srcTmp != null) { - cachedSrc = (SurfaceData) srcTmp.get(); + cachedSrc = srcTmp.get(); } src = convertFrom(convertsrc, srcData, srcx, srcy, width, height, cachedSrc); sx = 0; sy = 0; if (src != cachedSrc) { - srcTmp = new WeakReference(src); + srcTmp = new WeakReference<>(src); } } @@ -277,7 +277,7 @@ public class Blit extends GraphicsPrimitive // assert: convertresult != null SurfaceData cachedDst = null; if (dstTmp != null) { - cachedDst = (SurfaceData) dstTmp.get(); + cachedDst = dstTmp.get(); } dst = convertFrom(convertdst, dstData, dstx, dsty, width, height, cachedDst); @@ -285,7 +285,7 @@ public class Blit extends GraphicsPrimitive dy = 0; opclip = null; if (dst != cachedDst) { - dstTmp = new WeakReference(dst); + dstTmp = new WeakReference<>(dst); } } diff --git a/jdk/src/share/classes/sun/java2d/loops/CustomComponent.java b/jdk/src/share/classes/sun/java2d/loops/CustomComponent.java index 55a921aeb1d..ff346172387 100644 --- a/jdk/src/share/classes/sun/java2d/loops/CustomComponent.java +++ b/jdk/src/share/classes/sun/java2d/loops/CustomComponent.java @@ -50,7 +50,7 @@ public final class CustomComponent { public static void register() { // REMIND: This does not work for all destinations yet since // the screen SurfaceData objects do not implement getRaster - Class owner = CustomComponent.class; + Class owner = CustomComponent.class; GraphicsPrimitive[] primitives = { new GraphicsPrimitiveProxy(owner, "OpaqueCopyAnyToArgb", Blit.methodSignature, diff --git a/jdk/src/share/classes/sun/java2d/loops/GeneralRenderer.java b/jdk/src/share/classes/sun/java2d/loops/GeneralRenderer.java index ac01d5324c3..af0fa2ece8b 100644 --- a/jdk/src/share/classes/sun/java2d/loops/GeneralRenderer.java +++ b/jdk/src/share/classes/sun/java2d/loops/GeneralRenderer.java @@ -50,7 +50,7 @@ import sun.font.GlyphList; public final class GeneralRenderer { public static void register() { - Class owner = GeneralRenderer.class; + Class owner = GeneralRenderer.class; GraphicsPrimitive[] primitives = { new GraphicsPrimitiveProxy(owner, "SetFillRectANY", FillRect.methodSignature, diff --git a/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java b/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java index 47db650374a..ca23fe72aec 100644 --- a/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java +++ b/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java @@ -316,7 +316,7 @@ public abstract class GraphicsPrimitive { public abstract GraphicsPrimitive traceWrap(); - static HashMap traceMap; + static HashMap traceMap; public static int traceflags; public static String tracefile; @@ -427,13 +427,14 @@ public abstract class GraphicsPrimitive { public void run() { PrintStream ps = getTraceOutputFile(); - Iterator iterator = traceMap.entrySet().iterator(); + Iterator> iterator = + traceMap.entrySet().iterator(); long total = 0; int numprims = 0; while (iterator.hasNext()) { - Map.Entry me = (Map.Entry) iterator.next(); + Map.Entry me = iterator.next(); Object prim = me.getKey(); - int[] count = (int[]) me.getValue(); + int[] count = me.getValue(); if (count[0] == 1) { ps.print("1 call to "); } else { @@ -455,15 +456,15 @@ public abstract class GraphicsPrimitive { public synchronized static void tracePrimitive(Object prim) { if ((traceflags & TRACECOUNTS) != 0) { if (traceMap == null) { - traceMap = new HashMap(); + traceMap = new HashMap<>(); TraceReporter.setShutdownHook(); } - Object o = traceMap.get(prim); + int[] o = traceMap.get(prim); if (o == null) { o = new int[1]; traceMap.put(prim, o); } - ((int[]) o)[0]++; + o[0]++; } if ((traceflags & TRACELOG) != 0) { PrintStream ps = getTraceOutputFile(); diff --git a/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java b/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java index 6f76f544bec..177aa2148aa 100644 --- a/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java +++ b/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java @@ -45,11 +45,11 @@ public final class GraphicsPrimitiveMgr { private static GraphicsPrimitive generalPrimitives[]; private static boolean needssort = true; - private static native void initIDs(Class GP, Class ST, Class CT, - Class SG2D, Class Color, Class AT, - Class XORComp, Class AlphaComp, - Class Path2D, Class Path2DFloat, - Class SHints); + private static native void initIDs(Class GP, Class ST, Class CT, + Class SG2D, Class Color, Class AT, + Class XORComp, Class AlphaComp, + Class Path2D, Class Path2DFloat, + Class SHints); private static native void registerNativeLoops(); static { @@ -73,16 +73,17 @@ public final class GraphicsPrimitiveMgr { public int uniqueID; } - private static Comparator primSorter = new Comparator() { - public int compare(Object o1, Object o2) { - int id1 = ((GraphicsPrimitive) o1).getUniqueID(); - int id2 = ((GraphicsPrimitive) o2).getUniqueID(); + private static Comparator primSorter = + new Comparator() { + public int compare(GraphicsPrimitive o1, GraphicsPrimitive o2) { + int id1 = o1.getUniqueID(); + int id2 = o2.getUniqueID(); return (id1 == id2 ? 0 : (id1 < id2 ? -1 : 1)); } }; - private static Comparator primFinder = new Comparator() { + private static Comparator primFinder = new Comparator() { public int compare(Object o1, Object o2) { int id1 = ((GraphicsPrimitive) o1).getUniqueID(); int id2 = ((PrimitiveSpec) o2).uniqueID; diff --git a/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java b/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java index 15c93111d69..73f18a60946 100644 --- a/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java +++ b/jdk/src/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java @@ -41,7 +41,7 @@ package sun.java2d.loops; */ public class GraphicsPrimitiveProxy extends GraphicsPrimitive { - private Class owner; + private Class owner; private String relativeClassName; /** @@ -53,7 +53,7 @@ public class GraphicsPrimitiveProxy extends GraphicsPrimitive { * @param relativeClassName The name of the class this is a proxy for. * This should not include the package. */ - public GraphicsPrimitiveProxy(Class owner, String relativeClassName, + public GraphicsPrimitiveProxy(Class owner, String relativeClassName, String methodSignature, int primID, SurfaceType srctype, @@ -80,7 +80,7 @@ public class GraphicsPrimitiveProxy extends GraphicsPrimitive { String name = getPackageName(owner.getName()) + "." + relativeClassName; try { - Class clazz = Class.forName(name); + Class clazz = Class.forName(name); GraphicsPrimitive p = (GraphicsPrimitive) clazz.newInstance(); if (!satisfiesSameAs(p)) { throw new RuntimeException("Primitive " + p diff --git a/jdk/src/share/classes/sun/java2d/loops/MaskBlit.java b/jdk/src/share/classes/sun/java2d/loops/MaskBlit.java index 39a047d19ff..1572d05e0b6 100644 --- a/jdk/src/share/classes/sun/java2d/loops/MaskBlit.java +++ b/jdk/src/share/classes/sun/java2d/loops/MaskBlit.java @@ -143,8 +143,8 @@ public class MaskBlit extends GraphicsPrimitive MaskBlit performop; Blit convertresult; - WeakReference srcTmp; - WeakReference dstTmp; + WeakReference srcTmp; + WeakReference dstTmp; public General(SurfaceType srctype, CompositeType comptype, @@ -184,14 +184,14 @@ public class MaskBlit extends GraphicsPrimitive } else { SurfaceData cachedSrc = null; if (srcTmp != null) { - cachedSrc = (SurfaceData) srcTmp.get(); + cachedSrc = srcTmp.get(); } src = convertFrom(convertsrc, srcData, srcx, srcy, width, height, cachedSrc); sx = 0; sy = 0; if (src != cachedSrc) { - srcTmp = new WeakReference(src); + srcTmp = new WeakReference<>(src); } } @@ -204,7 +204,7 @@ public class MaskBlit extends GraphicsPrimitive // assert: convertresult != null SurfaceData cachedDst = null; if (dstTmp != null) { - cachedDst = (SurfaceData) dstTmp.get(); + cachedDst = dstTmp.get(); } dst = convertFrom(convertdst, dstData, dstx, dsty, width, height, cachedDst); @@ -212,7 +212,7 @@ public class MaskBlit extends GraphicsPrimitive dy = 0; opclip = null; if (dst != cachedDst) { - dstTmp = new WeakReference(dst); + dstTmp = new WeakReference<>(dst); } } diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java b/jdk/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java index a613daf4808..64459c1145e 100644 --- a/jdk/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java +++ b/jdk/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java @@ -728,7 +728,7 @@ class OGLTextureToSurfaceTransform extends TransformBlit { class OGLGeneralBlit extends Blit { private Blit performop; - private WeakReference srcTmp; + private WeakReference srcTmp; OGLGeneralBlit(SurfaceType dstType, CompositeType compType, @@ -750,7 +750,7 @@ class OGLGeneralBlit extends Blit { SurfaceData cachedSrc = null; if (srcTmp != null) { // use cached intermediate surface, if available - cachedSrc = (SurfaceData)srcTmp.get(); + cachedSrc = srcTmp.get(); } // convert source to IntArgbPre @@ -763,7 +763,7 @@ class OGLGeneralBlit extends Blit { if (src != cachedSrc) { // cache the intermediate surface - srcTmp = new WeakReference(src); + srcTmp = new WeakReference<>(src); } } } @@ -802,7 +802,7 @@ class OGLAnyCompositeBlit extends Blit { if (dstBuffer != cachedDst) { // cache the intermediate surface - dstTmp = new WeakReference(dstBuffer); + dstTmp = new WeakReference<>(dstBuffer); } // now blit the buffer back to the destination diff --git a/jdk/src/share/classes/sun/java2d/pipe/AlphaPaintPipe.java b/jdk/src/share/classes/sun/java2d/pipe/AlphaPaintPipe.java index 547211cf1e5..70cb1c18efe 100644 --- a/jdk/src/share/classes/sun/java2d/pipe/AlphaPaintPipe.java +++ b/jdk/src/share/classes/sun/java2d/pipe/AlphaPaintPipe.java @@ -48,16 +48,16 @@ import sun.java2d.loops.GraphicsPrimitiveMgr; * SunGraphics2D. */ public class AlphaPaintPipe implements CompositePipe { - static WeakReference cachedLastRaster; - static WeakReference cachedLastColorModel; - static WeakReference cachedLastData; + static WeakReference cachedLastRaster; + static WeakReference cachedLastColorModel; + static WeakReference cachedLastData; static class TileContext { SunGraphics2D sunG2D; PaintContext paintCtxt; ColorModel paintModel; - WeakReference lastRaster; - WeakReference lastData; + WeakReference lastRaster; + WeakReference lastData; MaskBlit lastMask; Blit lastBlit; SurfaceData dstData; @@ -105,8 +105,8 @@ public class AlphaPaintPipe implements CompositePipe { SurfaceData srcData = null; Raster lastRas = null; if (context.lastData != null && context.lastRaster != null) { - srcData = (SurfaceData) context.lastData.get(); - lastRas = (Raster) context.lastRaster.get(); + srcData = context.lastData.get(); + lastRas = context.lastRaster.get(); if (srcData == null || lastRas == null) { srcData = null; lastRas = null; @@ -127,7 +127,7 @@ public class AlphaPaintPipe implements CompositePipe { } if (lastRas != srcRaster) { lastRas = srcRaster; - context.lastRaster = new WeakReference(lastRas); + context.lastRaster = new WeakReference<>(lastRas); // REMIND: This will fail for a non-Writable raster! BufferedImage bImg = new BufferedImage(paintModel, @@ -135,7 +135,7 @@ public class AlphaPaintPipe implements CompositePipe { paintModel.isAlphaPremultiplied(), null); srcData = BufImgSurfaceData.createData(bImg); - context.lastData = new WeakReference(srcData); + context.lastData = new WeakReference<>(srcData); context.lastMask = null; context.lastBlit = null; } @@ -197,7 +197,7 @@ public class AlphaPaintPipe implements CompositePipe { { // Avoid creating new WeakReference if possible cachedLastColorModel = - new WeakReference(context.paintModel); + new WeakReference<>(context.paintModel); } cachedLastData = context.lastData; } diff --git a/jdk/src/share/classes/sun/java2d/pipe/RenderQueue.java b/jdk/src/share/classes/sun/java2d/pipe/RenderQueue.java index 6f65c05349c..f9dc262f17c 100644 --- a/jdk/src/share/classes/sun/java2d/pipe/RenderQueue.java +++ b/jdk/src/share/classes/sun/java2d/pipe/RenderQueue.java @@ -81,10 +81,10 @@ public abstract class RenderQueue { * A Set containing hard references to Objects that must stay alive until * the queue has been completely flushed. */ - protected Set refSet; + protected Set refSet; protected RenderQueue() { - refSet = new HashSet(); + refSet = new HashSet<>(); buf = RenderBuffer.allocate(BUFFER_SIZE); } diff --git a/jdk/src/share/classes/sun/java2d/pipe/SpanClipRenderer.java b/jdk/src/share/classes/sun/java2d/pipe/SpanClipRenderer.java index bba66f65907..0e18b92a7d7 100644 --- a/jdk/src/share/classes/sun/java2d/pipe/SpanClipRenderer.java +++ b/jdk/src/share/classes/sun/java2d/pipe/SpanClipRenderer.java @@ -39,14 +39,14 @@ public class SpanClipRenderer implements CompositePipe { CompositePipe outpipe; - static Class RegionClass = Region.class; - static Class RegionIteratorClass = RegionIterator.class; + static Class RegionClass = Region.class; + static Class RegionIteratorClass = RegionIterator.class; static { initIDs(RegionClass, RegionIteratorClass); } - static native void initIDs(Class rc, Class ric); + static native void initIDs(Class rc, Class ric); public SpanClipRenderer(CompositePipe pipe) { outpipe = pipe; diff --git a/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java b/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java index af65891495f..4e6c24f2e23 100644 --- a/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java +++ b/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java @@ -72,7 +72,7 @@ public abstract class X11SurfaceData extends XSurfaceData { protected int depth; - private static native void initIDs(Class xorComp, boolean tryDGA); + private static native void initIDs(Class xorComp, boolean tryDGA); protected native void initSurface(int depth, int width, int height, long drawable); From a2651f668e20d651428158c7cc56bfb6590246e5 Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Mon, 21 Apr 2014 11:00:46 +0400 Subject: [PATCH 04/50] 8037477: Reproducible hang of JAWS and webstart application with JAB 2.0.4 Reviewed-by: anthony, serb --- .../accessibility/AccessibleContext.java | 23 ++++++++++++++++ .../share/classes/sun/awt/AWTAccessor.java | 27 +++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleContext.java b/jdk/src/share/classes/javax/accessibility/AccessibleContext.java index 15f0f7f3983..b7f584b95db 100644 --- a/jdk/src/share/classes/javax/accessibility/AccessibleContext.java +++ b/jdk/src/share/classes/javax/accessibility/AccessibleContext.java @@ -25,6 +25,9 @@ package javax.accessibility; +import sun.awt.AWTAccessor; +import sun.awt.AppContext; + import java.util.Locale; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -79,6 +82,26 @@ import java.awt.IllegalComponentStateException; */ public abstract class AccessibleContext { + /** + * The AppContext that should be used to dispatch events for this + * AccessibleContext + */ + private volatile AppContext targetAppContext; + + static { + AWTAccessor.setAccessibleContextAccessor(new AWTAccessor.AccessibleContextAccessor() { + @Override + public void setAppContext(AccessibleContext accessibleContext, AppContext appContext) { + accessibleContext.targetAppContext = appContext; + } + + @Override + public AppContext getAppContext(AccessibleContext accessibleContext) { + return accessibleContext.targetAppContext; + } + }); + } + /** * Constant used to determine when the accessibleName property has * changed. The old value in the PropertyChangeEvent will be the old diff --git a/jdk/src/share/classes/sun/awt/AWTAccessor.java b/jdk/src/share/classes/sun/awt/AWTAccessor.java index 9e41cd4dfaa..b99ccdfe2ee 100644 --- a/jdk/src/share/classes/sun/awt/AWTAccessor.java +++ b/jdk/src/share/classes/sun/awt/AWTAccessor.java @@ -27,6 +27,7 @@ package sun.awt; import sun.misc.Unsafe; +import javax.accessibility.AccessibleContext; import java.awt.*; import java.awt.KeyboardFocusManager; import java.awt.DefaultKeyboardFocusManager; @@ -761,6 +762,14 @@ public final class AWTAccessor { void updateSystemColors(); } + /* + * An accessor object for the AccessibleContext class + */ + public interface AccessibleContextAccessor { + void setAppContext(AccessibleContext accessibleContext, AppContext appContext); + AppContext getAppContext(AccessibleContext accessibleContext); + } + /* * Accessor instances are initialized in the static initializers of * corresponding AWT classes by using setters defined below. @@ -791,6 +800,7 @@ public final class AWTAccessor { private static ToolkitAccessor toolkitAccessor; private static InvocationEventAccessor invocationEventAccessor; private static SystemColorAccessor systemColorAccessor; + private static AccessibleContextAccessor accessibleContextAccessor; /* * Set an accessor object for the java.awt.Component class. @@ -1234,4 +1244,21 @@ public final class AWTAccessor { public static void setSystemColorAccessor(SystemColorAccessor systemColorAccessor) { AWTAccessor.systemColorAccessor = systemColorAccessor; } + + /* + * Get the accessor object for the javax.accessibility.AccessibleContext class. + */ + public static AccessibleContextAccessor getAccessibleContextAccessor() { + if (accessibleContextAccessor == null) { + unsafe.ensureClassInitialized(AccessibleContext.class); + } + return accessibleContextAccessor; + } + + /* + * Set the accessor object for the javax.accessibility.AccessibleContext class. + */ + public static void setAccessibleContextAccessor(AccessibleContextAccessor accessor) { + AWTAccessor.accessibleContextAccessor = accessor; + } } From 704f4dc11341abce912047621f389f50b2f5930f Mon Sep 17 00:00:00 2001 From: Dmitriy Ermashov Date: Mon, 21 Apr 2014 14:35:14 +0400 Subject: [PATCH 05/50] 8039279: Move awt tests to openjdk repository Reviewed-by: pchelko, alexsch --- .../SetMaximizedBounds.java | 88 +++++++ .../ChangeGridSize/ChangeGridSize.java | 189 ++++++++++++++ .../ComponentPreferredSize.java | 181 ++++++++++++++ .../ModifierRobotKeyTest.java | 230 ++++++++++++++++++ .../LockingKeyStateTest.java | 126 ++++++++++ 5 files changed, 814 insertions(+) create mode 100644 jdk/test/java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java create mode 100644 jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java create mode 100644 jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java create mode 100644 jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java create mode 100644 jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java diff --git a/jdk/test/java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java b/jdk/test/java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java new file mode 100644 index 00000000000..da5b3800eae --- /dev/null +++ b/jdk/test/java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.*; + +/* + * @test + * @summary When Frame.setExtendedState(Frame.MAXIMIZED_BOTH) + * is called for a Frame after been called setMaximizedBounds() with + * certain value, Frame bounds must equal to this value. + * + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @run main SetMaximizedBounds + */ + +public class SetMaximizedBounds { + + Frame frame; + Rectangle bound; + boolean supported; + ExtendedRobot robot; + static Rectangle max = new Rectangle(100,100,400,400); + + public void doTest() throws Exception { + robot = new ExtendedRobot(); + + EventQueue.invokeAndWait( () -> { + frame = new Frame( "TestFrame "); + frame.setLayout(new FlowLayout()); + + if (Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.MAXIMIZED_BOTH)) { + supported = true; + frame.setMaximizedBounds(max); + } else { + supported = false; + } + + frame.setSize(200, 200); + frame.setVisible(true); + }); + + robot.waitForIdle(2000); + if (supported) { + EventQueue.invokeAndWait( () -> { + frame.setExtendedState(Frame.MAXIMIZED_BOTH); + }); + robot.waitForIdle(2000); + bound = frame.getBounds(); + if(!bound.equals(max)) + throw new RuntimeException("The bounds of the Frame do not equal to what" + + " is specified when the frame is in Frame.MAXIMIZED_BOTH state"); + } else { + System.out.println("Frame.MAXIMIZED_BOTH not supported"); + } + + frame.dispose(); + } + + public static void main(String[] args) throws Exception { + String os = System.getProperty("os.name").toLowerCase(); + System.out.println(os); + if (os.contains("windows") || os.contains("os x")) + new SetMaximizedBounds().doTest(); + else + System.out.println("Platform "+os+" is not supported. Supported platforms are Windows and OS X."); + } +} diff --git a/jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java b/jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java new file mode 100644 index 00000000000..86f7a7a8b3a --- /dev/null +++ b/jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java @@ -0,0 +1,189 @@ +/* + * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.*; +import java.awt.event.*; + +/* + * @test + * @summary Have different components having different preferred sizes + * added to a grid layout. Change the rows and columns of the + * grid layout and check the components are re-laid out. + * The strategy followed is to calculate the component location + * depending on the preferred sizes and gaps and click the cornors + * of the components to check if events are triggered + * @library ../../../../lib/testlibrary/ + * @build ExtendedRobot + * @run main ChangeGridSize + * @run main ChangeGridSize -hg 20 -vg 20 + */ + +public class ChangeGridSize { + + private int width = 200; + private int height = 200; + private final int hGap, vGap; + private final int rows = 3; + private final int columns = 2; + private final int componentCount = 6; + + private Button[] buttons; + private Frame frame; + + private ExtendedRobot robot; + private GridLayout layout; + + private volatile boolean actionPerformed = false; + + public ChangeGridSize(int hGap, int vGap) throws Exception { + this.hGap = hGap; + this.vGap = vGap; + robot = new ExtendedRobot(); + EventQueue.invokeAndWait( () -> { + frame = new Frame("Test frame"); + frame.setSize(width, height); + layout = new GridLayout(rows + 3, columns - 1, hGap, vGap); + frame.setLayout(layout); + + buttons = new Button[componentCount]; + for (int i = 0; i < componentCount; i++) { + buttons[i] = new Button("Button" + i); + frame.add(buttons[i]); + buttons[i].addActionListener( (event) -> { actionPerformed = true; }); + } + frame.setVisible(true); + }); + } + + public static void main(String[] args) throws Exception { + int hGap = 0; + int vGap = 0; + for (int i = 0; i < args.length; i++) { + switch (args[i]) { + case "-hg": + hGap = Integer.parseInt(args[++i]); + break; + case "-vg": + vGap = Integer.parseInt(args[++i]); + break; + } + } + new ChangeGridSize(hGap, vGap).doTest(); + } + + private void resizeFrame() throws Exception { + EventQueue.invokeAndWait(() -> { + Insets insets = frame.getInsets(); + double dH = (height-insets.top-insets.bottom - vGap*(rows-1)) % rows; + double dW = (width-insets.left-insets.right - hGap*(columns-1)) % columns; + height -= dH; + width -= dW; + frame.setSize(width, height); + frame.revalidate(); + }); + robot.waitForIdle(); + } + + private void changeGridSize() throws Exception { + EventQueue.invokeAndWait(() -> { + layout.setRows(rows); + layout.setColumns(columns); + + frame.revalidate(); + }); + robot.waitForIdle(); + } + + public void testBoundaries(int topLeftX, int topLeftY, int bottomRightX, int bottomRightY) throws Exception { + + actionPerformed = false; + robot.mouseMove(topLeftX, topLeftY); + robot.delay(500); + robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); + robot.delay(500); + robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); + robot.waitForIdle(3000); + + if(!actionPerformed) + throw new RuntimeException("Clicking on the left top of button did not trigger action event"); + + actionPerformed = false; + robot.mouseMove(bottomRightX, bottomRightY); + robot.delay(500); + robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); + robot.delay(500); + robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); + robot.waitForIdle(3000); + + if(!actionPerformed) + throw new RuntimeException("Clicking on the bottom right of button did not trigger action event"); + } + + private void doTest() throws Exception { + robot.waitForIdle(); + changeGridSize(); + resizeFrame(); + + int availableWidth = width - frame.getInsets().left - + frame.getInsets().right; + int componentWidth = (availableWidth + hGap) / columns - hGap; + int availableHeight = height - frame.getInsets().top - + frame.getInsets().bottom; + int componentHeight = (availableHeight + vGap) / rows - vGap; + + for (int i = 0; i < buttons.length; i++) { + if (buttons[i].getSize().width != componentWidth || + buttons[i].getSize().height != componentHeight) { + throw new RuntimeException( + "FAIL: Button " + i + " not of proper size" + + "Expected: " + componentWidth + "*" + componentHeight + + "Actual: " + buttons[i].getSize().width + "*" + buttons[i].getSize().height); + } + } + + // Components are visible. They should trigger events. + // Now you can check for the actual size shown. + int currentRow = 1; + int currentColumn = 0; + for (int i = 0; i < buttons.length; i++) { + currentColumn++; + if (currentColumn > columns) { + currentColumn = 1; + currentRow++; + } + + int topPosX = frame.getLocationOnScreen().x + + frame.getInsets().left + + (currentColumn - 1) * (componentWidth + hGap); + int topPosY = frame.getLocationOnScreen().y + + frame.getInsets().top + + (currentRow - 1) * (componentHeight + vGap); + + int bottomPosX = topPosX + componentWidth - 1; + int bottomPosY = topPosY + componentHeight - 1; + testBoundaries(topPosX, topPosY, bottomPosX, bottomPosY); + } + + frame.dispose(); + } +} diff --git a/jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java b/jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java new file mode 100644 index 00000000000..d8ceac748c8 --- /dev/null +++ b/jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java @@ -0,0 +1,181 @@ +/* + * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.*; +import java.awt.event.InputEvent; + +/* + * @test + * @summary Have different components having different preferred sizes + * added to a grid layout having various values of row/columns. + * Check if the compnents are correctly laid out. + * The strategy followed is to calculate the component location + * depending on the preferred sizes and gaps and click the cornors + * of the components to check if events are triggered + * @library ../../../../lib/testlibrary/ + * @build ExtendedRobot + * @run main ComponentPreferredSize + * @run main ComponentPreferredSize -hg 20 -vg 20 + */ + +public class ComponentPreferredSize { + + private int width = 200; + private int height = 200; + private final int hGap, vGap; + private final int rows = 3; + private final int columns = 2; + private final int componentCount = 6; + + private Button[] buttons; + private Frame frame; + + private ExtendedRobot robot; + private GridLayout layout; + + private volatile boolean actionPerformed = false; + + public ComponentPreferredSize(int hGap, int vGap) throws Exception { + this.hGap = hGap; + this.vGap = vGap; + robot = new ExtendedRobot(); + EventQueue.invokeAndWait( () -> { + frame = new Frame("Test frame"); + frame.setSize(width, height); + layout = new GridLayout(rows, columns, hGap, vGap); + frame.setLayout(layout); + + buttons = new Button[componentCount]; + for (int i = 0; i < componentCount; i++) { + buttons[i] = new Button("Button" + i); + buttons[i].setPreferredSize(new Dimension((int) Math.random() * 100, + (int) Math.random() * 100)); + frame.add(buttons[i]); + buttons[i].addActionListener((event) -> {actionPerformed = true;}); + } + + frame.setVisible(true); + }); + } + + public static void main(String[] args) throws Exception { + int hGap = 0; + int vGap = 0; + for (int i = 0; i < args.length; i++) { + switch (args[i]) { + case "-hg": + hGap = Integer.parseInt(args[++i]); + break; + case "-vg": + vGap = Integer.parseInt(args[++i]); + break; + } + } + new ComponentPreferredSize(hGap, vGap).doTest(); + } + + private void resizeFrame() throws Exception { + EventQueue.invokeAndWait(() -> { + Insets insets = frame.getInsets(); + double dH = (height-insets.top-insets.bottom - vGap*(rows-1)) % rows; + double dW = (width-insets.left-insets.right - hGap*(columns-1)) % columns; + height -= dH; + width -= dW; + frame.setSize(width, height); + frame.revalidate(); + }); + robot.waitForIdle(); + } + + public void testBoundaries(int topLeftX, int topLeftY, int bottomRightX, int bottomRightY) throws Exception { + + actionPerformed = false; + robot.mouseMove(topLeftX, topLeftY); + robot.delay(500); + robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); + robot.delay(500); + robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); + robot.waitForIdle(3000); + + if(!actionPerformed) + throw new RuntimeException("Clicking on the left top of button did not trigger action event"); + + actionPerformed = false; + robot.mouseMove(bottomRightX, bottomRightY); + robot.delay(500); + robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); + robot.delay(500); + robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); + robot.waitForIdle(3000); + + if(!actionPerformed) + throw new RuntimeException("Clicking on the bottom right of button did not trigger action event"); + } + + private void doTest() throws Exception { + robot.waitForIdle(); + resizeFrame(); + + int availableWidth = width - frame.getInsets().left - + frame.getInsets().right; + int componentWidth = (availableWidth + hGap) / columns - hGap; + int availableHeight = height - frame.getInsets().top - + frame.getInsets().bottom; + int componentHeight = (availableHeight + vGap) / rows - vGap; + + for (int i = 0; i < buttons.length; i++) { + if (buttons[i].getSize().width != componentWidth || + buttons[i].getSize().height != componentHeight) { + throw new RuntimeException( + "FAIL: Button " + i + " not of proper size" + + "Expected: " + componentWidth + "*" + componentHeight + + "Actual: " + buttons[i].getSize().width + "*" + buttons[i].getSize().height); + } + } + + // Components are visible. They should trigger events. + // Now you can check for the actual size shown. + int currentRow = 1; + int currentColumn = 0; + for (int i = 0; i < buttons.length; i++) { + currentColumn++; + if (currentColumn > columns) { + currentColumn = 1; + currentRow++; + } + + int topPosX = frame.getLocationOnScreen().x + + frame.getInsets().left + + (currentColumn - 1) * (componentWidth + hGap); + int topPosY = frame.getLocationOnScreen().y + + frame.getInsets().top + + (currentRow - 1) * (componentHeight + vGap); + + int bottomPosX = topPosX + componentWidth - 1; + int bottomPosY = topPosY + componentHeight - 1; + testBoundaries(topPosX, topPosY, bottomPosX, bottomPosY); + } + + frame.dispose(); + } +} diff --git a/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java b/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java new file mode 100644 index 00000000000..5cdc8085255 --- /dev/null +++ b/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java @@ -0,0 +1,230 @@ +/* + * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.*; +import java.awt.event.*; + +import static jdk.testlibrary.Asserts.assertTrue; + +/* + * @test + * @summary Make sure that modifier key mask is set when robot press + * some key with one or more modifiers. + * + * @library ../../../../lib/testlibrary/ + * @build ExtendedRobot + * @run main ModifierRobotKeyTest + */ + +public class ModifierRobotKeyTest extends KeyAdapter { + + private boolean focusGained = false; + private boolean startTest = false; + private ExtendedRobot robot; + private Frame frame; + private Canvas canvas; + + private volatile boolean tempPress = false; + + private int[] textKeys, modifierKeys, inputMasks; + private boolean[] modifierStatus, textStatus; + + private final static int waitDelay = 5000; + private Object tempLock = new Object(); + private Object keyLock = new Object(); + + public static void main(String[] args) throws Exception { + ModifierRobotKeyTest test = new ModifierRobotKeyTest(); + test.doTest(); + } + + public ModifierRobotKeyTest() throws Exception { + modifierKeys = new int[3]; + modifierKeys[0] = KeyEvent.VK_SHIFT; + modifierKeys[1] = KeyEvent.VK_CONTROL; + modifierKeys[2] = KeyEvent.VK_ALT; + + inputMasks = new int[3]; + inputMasks[0] = InputEvent.SHIFT_MASK; + inputMasks[1] = InputEvent.CTRL_MASK; + inputMasks[2] = InputEvent.ALT_MASK; + + modifierStatus = new boolean[modifierKeys.length]; + + textKeys = new int[2]; + textKeys[0] = KeyEvent.VK_A; + + String os = System.getProperty("os.name").toLowerCase(); + + if (os.contains("solaris") || os.contains("sunos")) + textKeys[1] = KeyEvent.VK_S; + else if (os.contains("os x")) + textKeys[1] = KeyEvent.VK_K; + else + textKeys[1] = KeyEvent.VK_I; + + textStatus = new boolean[textKeys.length]; + + EventQueue.invokeAndWait( () -> { initializeGUI(); }); + } + + public void keyPressed(KeyEvent event) { + + tempPress = true; + synchronized (tempLock) { tempLock.notifyAll(); } + + if (! startTest) { + return; + } + for (int x = 0; x < inputMasks.length; x++) { + if ((event.getModifiers() & inputMasks[x]) != 0) { + System.out.println("Modifier set: " + event.getKeyModifiersText(inputMasks[x])); + modifierStatus[x] = true; + } + } + for (int x = 0; x < textKeys.length; x++) { + if (event.getKeyCode() == textKeys[x]) { + System.out.println("Text set: " + event.getKeyText(textKeys[x])); + textStatus[x] = true; + } + } + + synchronized (keyLock) { keyLock.notifyAll(); } + } + + private void initializeGUI() { + frame = new Frame("Test frame"); + canvas = new Canvas(); + canvas.addFocusListener(new FocusAdapter() { + public void focusGained(FocusEvent event) { focusGained = true; } + }); + canvas.addKeyListener(this); + frame.setLayout(new BorderLayout()); + frame.add(canvas); + frame.setSize(200, 200); + frame.setVisible(true); + } + + public void doTest() throws Exception { + robot = new ExtendedRobot(); + + robot.mouseMove((int) frame.getLocationOnScreen().getX() + frame.getSize().width / 2, + (int) frame.getLocationOnScreen().getY() + frame.getSize().height / 2); + robot.click(MouseEvent.BUTTON1_MASK); + robot.waitForIdle(); + + assertTrue(focusGained, "FAIL: Canvas gained focus!"); + + for (int i = 0; i < modifierKeys.length; i++) { + for (int j = 0; j < textKeys.length; j++) { + tempPress = false; + robot.keyPress(modifierKeys[i]); + robot.waitForIdle(); + if (! tempPress) { + synchronized (tempLock) { tempLock.wait(waitDelay); } + } + assertTrue(tempPress, "FAIL: keyPressed triggered for i=" + i); + + resetStatus(); + startTest = true; + robot.keyPress(textKeys[j]); + robot.waitForIdle(); + if (! modifierStatus[i] || ! textStatus[j]) { + synchronized (keyLock) { keyLock.wait(waitDelay); } + } + + + assertTrue(modifierStatus[i] && textStatus[j], + "FAIL: KeyEvent not proper!"+ + "Key checked: i=" + i + "; j=" + j+ + "ModifierStatus = " + modifierStatus[i]+ + "TextStatus = " + textStatus[j]); + startTest = false; + robot.keyRelease(textKeys[j]); + robot.waitForIdle(); + robot.keyRelease(modifierKeys[i]); + robot.waitForIdle(); + } + } + + for (int i = 0; i < modifierKeys.length; i++) { + for (int j = i + 1; j < modifierKeys.length; j++) { + for (int k = 0; k < textKeys.length; k++) { + tempPress = false; + robot.keyPress(modifierKeys[i]); + robot.waitForIdle(); + if (! tempPress) { + synchronized (tempLock) { tempLock.wait(waitDelay); } + } + + assertTrue(tempPress, "FAIL: MultiKeyTest: keyPressed triggered for i=" + i); + + tempPress = false; + robot.keyPress(modifierKeys[j]); + robot.waitForIdle(); + if (! tempPress) { + synchronized (tempLock) { tempLock.wait(waitDelay); } + } + assertTrue(tempPress, "FAIL: MultiKeyTest keyPressed triggered for j=" + j); + + resetStatus(); + startTest = true; + robot.keyPress(textKeys[k]); + robot.waitForIdle(); + if (! modifierStatus[i] || ! modifierStatus[j] || ! textStatus[k]) { + synchronized (keyLock) { + keyLock.wait(waitDelay); + } + } + assertTrue(modifierStatus[i] && modifierStatus[j] && textStatus[k], + "FAIL: KeyEvent not proper!"+ + "Key checked: i=" + i + "; j=" + j + "; k=" + k+ + "Modifier1Status = " + modifierStatus[i]+ + "Modifier2Status = " + modifierStatus[j]+ + "TextStatus = " + textStatus[k]); + + startTest = false; + robot.keyRelease(textKeys[k]); + robot.waitForIdle(); + robot.keyRelease(modifierKeys[j]); + robot.waitForIdle(); + robot.keyRelease(modifierKeys[i]); + robot.waitForIdle(); + } + } + } + + frame.dispose(); + } + + private void resetStatus() { + for (int i = 0; i < modifierStatus.length; i++) { + modifierStatus[i] = false; + } + for (int i = 0; i < textStatus.length; i++) { + textStatus[i] = false; + } + } + +} diff --git a/jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java b/jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java new file mode 100644 index 00000000000..37aef352a15 --- /dev/null +++ b/jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.*; +import java.awt.event.KeyEvent; + +/* + @test + @summary verify LOCK buttons toogle + @author Yuri.Nesterenko, Dmitriy.Ermashov + @library ../../../../lib/testlibrary + @build ExtendedRobot + @run main LockingKeyStateTest +*/ + +public class LockingKeyStateTest { + + Frame frame; + ExtendedRobot robot; + + // Note that Kana lock you may actually toggle only if you have one. + static int[] lockingKeys = { KeyEvent.VK_CAPS_LOCK, KeyEvent.VK_NUM_LOCK, + KeyEvent.VK_SCROLL_LOCK, KeyEvent.VK_KANA_LOCK }; + boolean[] getSupported = new boolean[lockingKeys.length]; + boolean[] setSupported = new boolean[lockingKeys.length]; + boolean[] state0 = new boolean[lockingKeys.length]; + + Toolkit toolkit = Toolkit.getDefaultToolkit(); + + LockingKeyStateTest() throws Exception { + robot = new ExtendedRobot(); + EventQueue.invokeAndWait( this::createGui ); + } + + void toggleAllTrue(){toggleAll(true);} + void toggleAllFalse(){toggleAll(false);} + void toggleAll(boolean b) { + for(int i = 0; i < lockingKeys.length; i++) { + if(setSupported[i]) { + toolkit.setLockingKeyState(lockingKeys[i], b); + } + } + } + + void checkAllTrue(){checkAll(true);} + void checkAllFalse(){checkAll(false);} + void checkAll(boolean b) { + for(int i = 0; i < lockingKeys.length; i++) { + if(getSupported[i] && setSupported[i]) { + if (!(toolkit.getLockingKeyState(lockingKeys[i]) == b)) + throw new RuntimeException("State of "+KeyEvent.getKeyText(lockingKeys[i])+" is not "+b); + System.out.println("OK, state of "+KeyEvent.getKeyText(lockingKeys[i])+" is "+b); + } + } + } + + void restoreAll() { + for(int i = 0; i < lockingKeys.length; i++) { + if(setSupported[i] && getSupported[i]) { + toolkit.setLockingKeyState(lockingKeys[i], state0[i]); + } + } + } + + public void createGui() { + for(int i = 0; i < lockingKeys.length; i++) { + getSupported[i] = false; + setSupported[i] = false; + try { + state0[i] = toolkit.getLockingKeyState(lockingKeys[i]); + getSupported[i] = true; + toolkit.setLockingKeyState(lockingKeys[i], state0[i]); + setSupported[i] = true; + } catch (UnsupportedOperationException uoe) { + } + System.out.println(" State get/set of "+KeyEvent.getKeyText(lockingKeys[i])+" is supported? "+ + getSupported[i]+", "+setSupported[i]); + } + frame = new Frame("LockingKeyStateTest Title"); + frame.setSize(200,200); + frame.setVisible(true); + } + + void doTest() throws Exception{ + robot.waitForIdle(); + robot.mouseMove(frame.getLocationOnScreen().x + frame.getWidth() / 2, + frame.getLocationOnScreen().y + frame.getHeight() / 2); + robot.click(); + + EventQueue.invokeAndWait( this::toggleAllTrue ); + robot.waitForIdle(2000); + EventQueue.invokeAndWait( this::checkAllTrue ); + EventQueue.invokeAndWait( this::toggleAllFalse ); + robot.waitForIdle(2000); + EventQueue.invokeAndWait( this::checkAllFalse ); + EventQueue.invokeAndWait( this::restoreAll ); + robot.waitForIdle(); + + frame.dispose(); + } + + public static void main(String argv[]) throws Exception { + LockingKeyStateTest af = new LockingKeyStateTest(); + af.doTest(); + } +} From c6886100bee271e778ac99813d655e76b96e2e2d Mon Sep 17 00:00:00 2001 From: Alexey Ivanov Date: Mon, 21 Apr 2014 16:32:41 +0400 Subject: [PATCH 06/50] 8024061: Exception thrown when drag and drop between two components is executed quickly Reviewed-by: pchelko, serb --- .../sun/awt/dnd/SunDropTargetContextPeer.java | 9 +- jdk/test/sun/awt/dnd/8024061/bug8024061.java | 357 ++++++++++++++++++ 2 files changed, 365 insertions(+), 1 deletion(-) create mode 100644 jdk/test/sun/awt/dnd/8024061/bug8024061.java diff --git a/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java b/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java index 2efea8da2de..842b387f6f4 100644 --- a/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java +++ b/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -239,6 +239,13 @@ public abstract class SunDropTargetContextPeer implements DropTargetContextPeer, if (localTransferable != null) { return localTransferable.getTransferData(df); + } else if (df.isMimeTypeEqual(DataFlavor.javaJVMLocalObjectMimeType)) { + // Workaround to JDK-8024061: Exception thrown when drag and drop + // between two components is executed quickly. + // It is expected localTransferable is not null if javaJVMLocalObjectMimeType + // is used. Executing further results in ClassCastException, so null is + // returned here as no transfer data is available in this case. + return null; } if (dropStatus != STATUS_ACCEPT || dropComplete) { diff --git a/jdk/test/sun/awt/dnd/8024061/bug8024061.java b/jdk/test/sun/awt/dnd/8024061/bug8024061.java new file mode 100644 index 00000000000..07165c09a61 --- /dev/null +++ b/jdk/test/sun/awt/dnd/8024061/bug8024061.java @@ -0,0 +1,357 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* @test + * @bug 8024061 + * @summary Checks that no exception is thrown if dragGestureRecognized + * takes a while to complete. + */ +import sun.awt.OSInfo; +import sun.awt.OSInfo.OSType; +import sun.awt.SunToolkit; + +import java.awt.*; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.awt.dnd.DnDConstants; +import java.awt.dnd.DragGestureEvent; +import java.awt.dnd.DragGestureListener; +import java.awt.dnd.DragSource; +import java.awt.dnd.DragSourceDragEvent; +import java.awt.dnd.DragSourceDropEvent; +import java.awt.dnd.DragSourceEvent; +import java.awt.dnd.DragSourceListener; +import java.awt.dnd.DropTarget; +import java.awt.dnd.DropTargetDragEvent; +import java.awt.dnd.DropTargetDropEvent; +import java.awt.dnd.DropTargetEvent; +import java.awt.dnd.DropTargetListener; +import java.awt.event.InputEvent; + +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import javax.swing.*; + +/** + * If dragGestureRecognized() takes a while to complete and if user performs a drag quickly, + * an exception is thrown from DropTargetListener.dragEnter when it calls + * DropTargetDragEvent.getTransferable(). + *

+ * This class introduces a delay in dragGestureRecognized() to cause the exception. + */ +public class bug8024061 { + private static final DataFlavor DropObjectFlavor; + private static final int DELAY = 1000; + + private final DnDPanel panel1 = new DnDPanel(Color.yellow); + private final DnDPanel panel2 = new DnDPanel(Color.pink); + private final JFrame frame; + + private static final CountDownLatch lock = new CountDownLatch(1); + private static volatile Exception dragEnterException = null; + + static { + DataFlavor flavor = null; + try { + flavor = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + DropObjectFlavor = flavor; + } + + bug8024061() { + frame = new JFrame("DnDWithRobot"); + frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + + Dimension d = new Dimension(100, 100); + + panel1.setPreferredSize(d); + panel2.setPreferredSize(d); + + Container content = frame.getContentPane(); + content.setLayout(new GridLayout(1, 2, 5, 5)); + content.add(panel1); + content.add(panel2); + + frame.pack(); + + DropObject drop = new DropObject(); + drop.place(panel1, new Point(10, 10)); + frame.setVisible(true); + } + + public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException { + OSType type = OSInfo.getOSType(); + if (type != OSType.LINUX && type != OSType.SOLARIS) { + System.out.println("This test is for Linux and Solaris only... " + + "skipping!"); + return; + } + + final bug8024061[] dnd = {null}; + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + dnd[0] = new bug8024061(); + } + }); + final Robot robot = new Robot(); + robot.setAutoDelay(10); + SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); + toolkit.realSync(); + + JFrame frame = dnd[0].frame; + Point point = frame.getLocationOnScreen(); + Point here = new Point(point.x + 35, point.y + 45); + Point there = new Point(point.x + 120, point.y + 45); + here.x += 25; + robot.mouseMove(here.x, here.y); + robot.mousePress(InputEvent.BUTTON1_MASK); + while (here.x < there.x) { + here.x += 20; + robot.mouseMove(here.x, here.y); + System.out.println("x = " + here.x); + } + robot.mouseRelease(InputEvent.BUTTON1_MASK); + toolkit.realSync(); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + System.out.println("finished"); + + try { + if (lock.await(5, TimeUnit.SECONDS)) { + if (dragEnterException == null) { + System.out.println("Test passed."); + } else { + System.out.println("Test failed."); + dragEnterException.printStackTrace(); + throw new RuntimeException(dragEnterException); + } + } else { + System.out.println("Test failed. Timeout reached"); + throw new RuntimeException("Timed out waiting for dragEnter()"); + } + } finally { + frame.dispose(); + } + } + + class DropObject implements Transferable { + DnDPanel panel; + Color color = Color.CYAN; + int width = 50; + int height = 50; + int x; + int y; + + void draw(Graphics2D g) { + Color savedColor = g.getColor(); + g.setColor(color); + g.fillRect(x, y, width, height); + g.setColor(Color.lightGray); + g.drawRect(x, y, width, height); + g.setColor(savedColor); + } + + boolean contains(int x, int y) { + return (x > this.x && x < this.x + width) + && (y > this.y && y < this.y + height); + } + + @Override + public DataFlavor[] getTransferDataFlavors() { + return new DataFlavor[]{DropObjectFlavor}; + } + + void place(DnDPanel panel, Point location) { + if (panel != this.panel) { + x = location.x; + y = location.y; + if (this.panel != null) { + this.panel.setDropObject(null); + this.panel.repaint(); + } + this.panel = panel; + this.panel.setDropObject(this); + this.panel.repaint(); + } + } + + @Override + public boolean isDataFlavorSupported(DataFlavor flavor) { + return DropObjectFlavor.equals(flavor); + } + + @Override + public Object getTransferData(DataFlavor flavor) + throws UnsupportedFlavorException, IOException { + if (isDataFlavorSupported(flavor)) { + return this; + } else { + throw new UnsupportedFlavorException(flavor); + } + } + } + + class DnDPanel extends JPanel { + DropObject dropObject; + final DragSource dragSource; + final DropTarget dropTarget; + final Color color; + final DragGestureListener dgListener; + final DragSourceListener dsListener; + final DropTargetListener dtListener; + + DnDPanel(Color color) { + this.color = color; + this.dragSource = DragSource.getDefaultDragSource(); + dgListener = new DragGestureListener() { + @Override + public void dragGestureRecognized(DragGestureEvent dge) { + Point location = dge.getDragOrigin(); + if (dropObject != null && dropObject.contains(location.x, location.y)) { + dragSource.startDrag(dge, DragSource.DefaultCopyNoDrop, dropObject, dsListener); + try { + Thread.sleep(DELAY); + } catch (InterruptedException e) { + } + } + } + }; + + dsListener = new DragSourceListener() { + @Override + public void dragEnter(DragSourceDragEvent dsde) { + } + + @Override + public void dragOver(DragSourceDragEvent dsde) { + } + + @Override + public void dropActionChanged(DragSourceDragEvent dsde) { + } + + @Override + public void dragExit(DragSourceEvent dse) { + } + + @Override + public void dragDropEnd(DragSourceDropEvent dsde) { + } + }; + + dtListener = new DropTargetListener() { + @Override + public void dragEnter(DropTargetDragEvent dtde) { + if (dropObject != null) { + dtde.rejectDrag(); + return; + } + dtde.acceptDrag(DnDConstants.ACTION_MOVE); + try { + Transferable t = dtde.getTransferable(); + Object data = t.getTransferData(DropObjectFlavor); + if (data != null) { + throw new Exception("getTransferData returned non-null"); + } + } catch (Exception e) { + dragEnterException = e; + e.printStackTrace(); + } finally { + lock.countDown(); + } + } + + @Override + public void dragOver(DropTargetDragEvent dtde) { + if (dropObject != null) { + dtde.rejectDrag(); + return; + } + dtde.acceptDrag(DnDConstants.ACTION_MOVE); + } + + @Override + public void dropActionChanged(DropTargetDragEvent dtde) { + } + + @Override + public void dragExit(DropTargetEvent dte) { + } + + @Override + public void drop(DropTargetDropEvent dtde) { + if (dropObject != null) { + dtde.rejectDrop(); + return; + } + try { + dtde.acceptDrop(DnDConstants.ACTION_MOVE); + Transferable t = dtde.getTransferable(); + DropObject dropObject = (DropObject) t.getTransferData(DropObjectFlavor); + Point location = dtde.getLocation(); + dropObject.place(DnDPanel.this, location); + dtde.dropComplete(true); + } catch (Exception e) { + e.printStackTrace(); + } + + } + }; + + dragSource.createDefaultDragGestureRecognizer(this, + DnDConstants.ACTION_MOVE, dgListener); + + dropTarget = new DropTarget(this, DnDConstants.ACTION_MOVE, dtListener, true); + + } + + public void paintComponent(Graphics g) { + super.paintComponent(g); + Color savedColor = g.getColor(); + g.setColor(color); + g.fillRect(0, 0, getWidth(), getHeight()); + g.setColor(savedColor); + if (dropObject != null) { + dropObject.draw((Graphics2D) g); + } + } + + void setDropObject(DropObject dropObject) { + this.dropObject = dropObject; + } + + DropObject findDropObject(int x, int y) { + if (dropObject != null && dropObject.contains(x, y)) { + return dropObject; + } + return null; + } + } +} From 1d1194721bbf7749899315b2316a31ad143f083a Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Mon, 21 Apr 2014 20:59:59 +0400 Subject: [PATCH 07/50] 8040656: Classes with overriden methods with covariant returns return random read methods Reviewed-by: alexsch, serb --- .../classes/java/beans/MethodDescriptor.java | 13 +- .../java/beans/Introspector/Test8040656.java | 311 ++++++++++++++++++ 2 files changed, 322 insertions(+), 2 deletions(-) create mode 100644 jdk/test/java/beans/Introspector/Test8040656.java diff --git a/jdk/src/share/classes/java/beans/MethodDescriptor.java b/jdk/src/share/classes/java/beans/MethodDescriptor.java index da2f754c97e..1e169046746 100644 --- a/jdk/src/share/classes/java/beans/MethodDescriptor.java +++ b/jdk/src/share/classes/java/beans/MethodDescriptor.java @@ -162,6 +162,16 @@ public class MethodDescriptor extends FeatureDescriptor { : null; } + private static Method resolve(Method oldMethod, Method newMethod) { + if (oldMethod == null) { + return newMethod; + } + if (newMethod == null) { + return oldMethod; + } + return !oldMethod.isSynthetic() && newMethod.isSynthetic() ? oldMethod : newMethod; + } + /* * Package-private constructor * Merge two method descriptors. Where they conflict, give the @@ -173,8 +183,7 @@ public class MethodDescriptor extends FeatureDescriptor { MethodDescriptor(MethodDescriptor x, MethodDescriptor y) { super(x, y); - Method method = y.methodRef.get(); - this.methodRef.set(null != method ? method : x.methodRef.get()); + this.methodRef.set(resolve(x.methodRef.get(), y.methodRef.get())); params = x.params; if (y.params != null) { params = y.params; diff --git a/jdk/test/java/beans/Introspector/Test8040656.java b/jdk/test/java/beans/Introspector/Test8040656.java new file mode 100644 index 00000000000..73e80ac377f --- /dev/null +++ b/jdk/test/java/beans/Introspector/Test8040656.java @@ -0,0 +1,311 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.beans.Introspector; +import java.beans.MethodDescriptor; + +/* + * @test + * @bug 8040656 + * @summary Tests that a normal method is preferred to a synthetic one + * @author Sergey Malenkov + */ + +public class Test8040656 { + public static void main(String[] args) throws Exception { + test(String.class, C.class); + test(String.class, C1.class); + test(String.class, C2.class); + test(String.class, C3.class); + test(String.class, C4.class); + test(String.class, C5.class); + test(String.class, C6.class); + test(String.class, C7.class); + test(String.class, C8.class); + test(String.class, C9.class); + } + + private static void test(Class type, Class bean) throws Exception { + for (MethodDescriptor md : Introspector.getBeanInfo(bean).getMethodDescriptors()) { + if (md.getName().equals("getFoo")) { + if (type != md.getMethod().getReturnType()) { + throw new Error("unexpected type"); + } + } + } + } + + public interface A { + public Object getFoo(); + } + + public class C implements A { + @Override + public String getFoo() { + return null; + } + } + + public class C1 implements A { + @Override + public String getFoo() { + return null; + } + + public String getFoo1() { + return null; + } + } + + public class C2 implements A { + @Override + public String getFoo() { + return null; + } + + public String getFoo1() { + return null; + } + + public String getFoo2() { + return null; + } + } + + public class C3 implements A { + @Override + public String getFoo() { + return null; + } + + public String getFoo1() { + return null; + } + + public String getFoo2() { + return null; + } + + public String getFoo3() { + return null; + } + } + + public class C4 implements A { + @Override + public String getFoo() { + return null; + } + + public String getFoo1() { + return null; + } + + public String getFoo2() { + return null; + } + + public String getFoo3() { + return null; + } + + public String getFoo4() { + return null; + } + } + + public class C5 implements A { + @Override + public String getFoo() { + return null; + } + + public String getFoo1() { + return null; + } + + public String getFoo2() { + return null; + } + + public String getFoo3() { + return null; + } + + public String getFoo4() { + return null; + } + + public String getFoo5() { + return null; + } + } + + public class C6 implements A { + @Override + public String getFoo() { + return null; + } + + public String getFoo1() { + return null; + } + + public String getFoo2() { + return null; + } + + public String getFoo3() { + return null; + } + + public String getFoo4() { + return null; + } + + public String getFoo5() { + return null; + } + + public String getFoo6() { + return null; + } + } + + public class C7 implements A { + @Override + public String getFoo() { + return null; + } + + public String getFoo1() { + return null; + } + + public String getFoo2() { + return null; + } + + public String getFoo3() { + return null; + } + + public String getFoo4() { + return null; + } + + public String getFoo5() { + return null; + } + + public String getFoo6() { + return null; + } + + public String getFoo7() { + return null; + } + } + + public class C8 implements A { + @Override + public String getFoo() { + return null; + } + + public String getFoo1() { + return null; + } + + public String getFoo2() { + return null; + } + + public String getFoo3() { + return null; + } + + public String getFoo4() { + return null; + } + + public String getFoo5() { + return null; + } + + public String getFoo6() { + return null; + } + + public String getFoo7() { + return null; + } + + public String getFoo8() { + return null; + } + } + + public class C9 implements A { + @Override + public String getFoo() { + return null; + } + + public String getFoo1() { + return null; + } + + public String getFoo2() { + return null; + } + + public String getFoo3() { + return null; + } + + public String getFoo4() { + return null; + } + + public String getFoo5() { + return null; + } + + public String getFoo6() { + return null; + } + + public String getFoo7() { + return null; + } + + public String getFoo8() { + return null; + } + + public String getFoo9() { + return null; + } + } +} From 7025bc84e60aab89f5ce8b435273c4f763c90d95 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Mon, 21 Apr 2014 23:39:30 -0700 Subject: [PATCH 08/50] 8039862: Fix fallthrough lint warnings in 2d Reviewed-by: flar --- jdk/src/share/classes/sun/font/SunFontManager.java | 1 + jdk/src/share/classes/sun/font/TrueTypeGlyphMapper.java | 2 ++ jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java | 1 + 3 files changed, 4 insertions(+) diff --git a/jdk/src/share/classes/sun/font/SunFontManager.java b/jdk/src/share/classes/sun/font/SunFontManager.java index 04df414365c..998713b4494 100644 --- a/jdk/src/share/classes/sun/font/SunFontManager.java +++ b/jdk/src/share/classes/sun/font/SunFontManager.java @@ -1161,6 +1161,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE { case FONTFORMAT_NATIVE: NativeFont nf = new NativeFont(fileName, false); physicalFont = addToFontList(nf, fontRank); + break; default: } diff --git a/jdk/src/share/classes/sun/font/TrueTypeGlyphMapper.java b/jdk/src/share/classes/sun/font/TrueTypeGlyphMapper.java index febaf6a5eb7..4ebee6cd280 100644 --- a/jdk/src/share/classes/sun/font/TrueTypeGlyphMapper.java +++ b/jdk/src/share/classes/sun/font/TrueTypeGlyphMapper.java @@ -109,6 +109,7 @@ public class TrueTypeGlyphMapper extends CharToGlyphMapper { cmap = CMap.theNullCmap; } + @SuppressWarnings("fallthrough") private final char remapJAChar(char unicode) { switch (unicode) { case REVERSE_SOLIDUS: @@ -123,6 +124,7 @@ public class TrueTypeGlyphMapper extends CharToGlyphMapper { default: return unicode; } } + @SuppressWarnings("fallthrough") private final int remapJAIntChar(int unicode) { switch (unicode) { case REVERSE_SOLIDUS: diff --git a/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java b/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java index 4e6c24f2e23..1d83b65a876 100644 --- a/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java +++ b/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java @@ -515,6 +515,7 @@ public abstract class X11SurfaceData extends XSurfaceData { return getSurfaceType(gc, transparency, false); } + @SuppressWarnings("fallthrough") public static SurfaceType getSurfaceType(X11GraphicsConfig gc, int transparency, boolean pixmapSurface) From f341bacaf3da00f13c04a1bd03480ae1266eb05c Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Tue, 22 Apr 2014 17:55:25 -0700 Subject: [PATCH 09/50] 8039860: Fix fallthrough lint warnings in swing Reviewed-by: malenkov --- .../com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java | 1 + .../java/swing/plaf/windows/WindowsLookAndFeel.java | 1 + .../java/swing/plaf/windows/WindowsTableHeaderUI.java | 2 +- .../javax/swing/plaf/metal/MetalLookAndFeel.java | 3 ++- .../share/classes/javax/swing/text/JTextComponent.java | 1 + .../classes/javax/swing/text/html/StyleSheet.java | 1 + .../swing/text/html/parser/ContentModelState.java | 4 +++- .../classes/javax/swing/text/html/parser/Parser.java | 10 ++++++++++ .../classes/javax/swing/text/rtf/RTFGenerator.java | 3 ++- .../share/classes/javax/swing/text/rtf/RTFParser.java | 3 ++- 10 files changed, 24 insertions(+), 5 deletions(-) diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java index d86b4ec92ac..b35e60d7ec6 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java @@ -1683,6 +1683,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel { * adjustments that windows/metal do. This is because gtk doesn't * provide margins/insets for checkbox/radiobuttons. */ + @SuppressWarnings("fallthrough") private static class GnomeLayoutStyle extends DefaultLayoutStyle { private static GnomeLayoutStyle INSTANCE = new GnomeLayoutStyle(); diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java index 00530fa19ea..a6c1c895757 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java @@ -2409,6 +2409,7 @@ public class WindowsLookAndFeel extends BasicLookAndFeel // Windows LayoutStyle. From: // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnwue/html/ch14e.asp + @SuppressWarnings("fallthrough") private class WindowsLayoutStyle extends DefaultLayoutStyle { @Override public int getPreferredGap(JComponent component1, diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java index c5101177f40..117e9d7b7b1 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java @@ -182,7 +182,6 @@ public class WindowsTableHeaderUI extends BasicTableHeaderUI { if (sortOrder != null) { switch(sortOrder) { case ASCENDING: - /* falls through */ case DESCENDING: switch (state) { case NORMAL: @@ -197,6 +196,7 @@ public class WindowsTableHeaderUI extends BasicTableHeaderUI { default: /* do nothing */ } + break; default : /* do nothing */ } diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java b/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java index 6a64676673b..b1aea28c79f 100644 --- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java @@ -2271,6 +2271,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel // From the JLF Design Guidelines: // http://www.oracle.com/technetwork/java/jlf-135985.html + @SuppressWarnings("fallthrough") private static class MetalLayoutStyle extends DefaultLayoutStyle { private static MetalLayoutStyle INSTANCE = new MetalLayoutStyle(); @@ -2407,4 +2408,4 @@ public class MetalLookAndFeel extends BasicLookAndFeel return 0; } } -} \ No newline at end of file +} diff --git a/jdk/src/share/classes/javax/swing/text/JTextComponent.java b/jdk/src/share/classes/javax/swing/text/JTextComponent.java index 94f950eb88b..ca3c9ebef1a 100644 --- a/jdk/src/share/classes/javax/swing/text/JTextComponent.java +++ b/jdk/src/share/classes/javax/swing/text/JTextComponent.java @@ -4473,6 +4473,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A // composed(uncommitted) text is done here after all input // method listeners get called for stealing the events. // + @SuppressWarnings("fallthrough") protected void processInputMethodEvent(InputMethodEvent e) { // let listeners handle the events super.processInputMethodEvent(e); diff --git a/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java b/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java index de0f2b91fe5..4c5d8d95ce5 100644 --- a/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java +++ b/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java @@ -2324,6 +2324,7 @@ public class StyleSheet extends StyleContext { * @param itemNum number to format * @param type type of ordered list */ + @SuppressWarnings("fallthrough") String formatItemNum(int itemNum, char type) { String numStyle = "1"; diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/ContentModelState.java b/jdk/src/share/classes/javax/swing/text/html/parser/ContentModelState.java index fb623981fcc..3bc9825d9c0 100644 --- a/jdk/src/share/classes/javax/swing/text/html/parser/ContentModelState.java +++ b/jdk/src/share/classes/javax/swing/text/html/parser/ContentModelState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -92,12 +92,14 @@ class ContentModelState { * tokens required in the input stream. * @return true if the model can terminate without further input */ + @SuppressWarnings("fallthrough") public boolean terminate() { switch (model.type) { case '+': if ((value == 0) && !(model).empty()) { return false; } + // Fall through case '*': case '?': return (next == null) || next.terminate(); diff --git a/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java b/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java index 79124461f9c..0963b4b6dc9 100644 --- a/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java +++ b/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java @@ -852,6 +852,7 @@ class Parser implements DTDConstants { if (lower) { ch = 'a' + (ch - 'A'); } + break; case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g': case 'h': case 'i': case 'j': case 'k': case 'l': @@ -876,6 +877,7 @@ class Parser implements DTDConstants { if (lower) { ch = 'a' + (ch - 'A'); } + break; case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g': case 'h': case 'i': case 'j': case 'k': case 'l': @@ -1214,6 +1216,7 @@ class Parser implements DTDConstants { /** * Parse attribute value. [33] 331:1 */ + @SuppressWarnings("fallthrough") String parseAttributeValue(boolean lower) throws IOException { int delim = -1; @@ -1258,6 +1261,7 @@ class Parser implements DTDConstants { case '\t': if (delim < 0) c = ' '; + // Fall through case ' ': ch = readCh(); if (delim < 0) { @@ -1559,6 +1563,7 @@ class Parser implements DTDConstants { /** * Parse a start or end tag. */ + @SuppressWarnings("fallthrough") void parseTag() throws IOException { Element elem; boolean net = false; @@ -1602,6 +1607,7 @@ class Parser implements DTDConstants { continue; case '>': ch = readCh(); + return; case -1: return; default: @@ -1626,6 +1632,7 @@ class Parser implements DTDConstants { switch(ch) { case '>': ch = readCh(); + // Fall through case -1: error("invalid.markup"); return; @@ -1657,6 +1664,7 @@ class Parser implements DTDConstants { switch (ch = readCh()) { case '>': ch = readCh(); + // Fall through case '<': // empty end tag. either or ': ch = readCh(); + break; case '<': break; @@ -1875,6 +1884,7 @@ class Parser implements DTDConstants { switch (ch) { case '/': net = true; + // Fall through case '>': ch = readCh(); if (ch == '>' && net) { diff --git a/jdk/src/share/classes/javax/swing/text/rtf/RTFGenerator.java b/jdk/src/share/classes/javax/swing/text/rtf/RTFGenerator.java index 38b2b7ad864..7aba1408039 100644 --- a/jdk/src/share/classes/javax/swing/text/rtf/RTFGenerator.java +++ b/jdk/src/share/classes/javax/swing/text/rtf/RTFGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -868,6 +868,7 @@ public void writeEndgroup() afterKeyword = false; } +@SuppressWarnings("fallthrough") public void writeCharacter(char ch) throws IOException { diff --git a/jdk/src/share/classes/javax/swing/text/rtf/RTFParser.java b/jdk/src/share/classes/javax/swing/text/rtf/RTFParser.java index a251552d76c..2b4969dda1e 100644 --- a/jdk/src/share/classes/javax/swing/text/rtf/RTFParser.java +++ b/jdk/src/share/classes/javax/swing/text/rtf/RTFParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -148,6 +148,7 @@ abstract class RTFParser extends AbstractFilter handleText(s); } + @SuppressWarnings("fallthrough") public void write(char ch) throws IOException { From 1b4d763c777d1ba965d002892051b9a249055b2d Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Wed, 23 Apr 2014 17:56:05 +0400 Subject: [PATCH 10/50] 8027148: SystemFlavorMap.getNativesForFlavor returns list of native formats in incorrect order Reviewed-by: anthony, serb --- .../awt/datatransfer/SystemFlavorMap.java | 359 ++++++++---------- .../sun/awt/datatransfer/DataTransferer.java | 25 +- .../classes/sun/awt/X11/XDataTransferer.java | 9 +- .../MappingGenerationTest.java | 183 +++++++++ 4 files changed, 344 insertions(+), 232 deletions(-) create mode 100644 jdk/test/java/awt/datatransfer/MappingGenerationTest/MappingGenerationTest.java diff --git a/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java b/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java index bc6e1642001..fd54c9414a0 100644 --- a/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java +++ b/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java @@ -38,13 +38,14 @@ import java.net.URL; import java.net.MalformedURLException; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; -import java.util.WeakHashMap; import sun.awt.AppContext; import sun.awt.datatransfer.DataTransferer; @@ -101,20 +102,12 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { */ private static final String HTML_TEXT_BASE_TYPE = "text/html"; - /** - * This constant is passed to flavorToNativeLookup() to indicate that a - * a native should be synthesized, stored, and returned by encoding the - * DataFlavor's MIME type in case if the DataFlavor is not found in - * 'flavorToNative' map. - */ - private static final boolean SYNTHESIZE_IF_NOT_FOUND = true; - /** * Maps native Strings to Lists of DataFlavors (or base type Strings for * text DataFlavors). * Do not use the field directly, use getNativeToFlavor() instead. */ - private final Map> nativeToFlavor = new HashMap<>(); + private final Map> nativeToFlavor = new HashMap<>(); /** * Accessor to nativeToFlavor map. Since we use lazy initialization we must @@ -123,7 +116,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { * * @return nativeToFlavor */ - private Map> getNativeToFlavor() { + private Map> getNativeToFlavor() { if (!isMapInitialized) { initSystemFlavorMap(); } @@ -135,7 +128,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { * native Strings. * Do not use the field directly, use getFlavorToNative() instead. */ - private final Map> flavorToNative = new HashMap<>(); + private final Map> flavorToNative = new HashMap<>(); /** * Accessor to flavorToNative map. Since we use lazy initialization we must @@ -144,29 +137,52 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { * * @return flavorToNative */ - private synchronized Map> getFlavorToNative() { + private synchronized Map> getFlavorToNative() { if (!isMapInitialized) { initSystemFlavorMap(); } return flavorToNative; } + /** + * Maps a text DataFlavor primary mime-type to the native. Used only to store + * standard mappings registered in the flavormap.properties + * Do not use this field directly, use getTextTypeToNative() instead. + */ + private Map> textTypeToNative = new HashMap<>(); + /** * Shows if the object has been initialized. */ private boolean isMapInitialized = false; /** - * Caches the result of getNativesForFlavor(). Maps DataFlavors to - * SoftReferences which reference Lists of String natives. + * An accessor to textTypeToNative map. Since we use lazy initialization we + * must use this accessor instead of direct access to the field which may not + * be initialized yet. This method will initialize the field if needed. + * + * @return textTypeToNative */ - private Map>> getNativesForFlavorCache = new HashMap<>(); + private synchronized Map> getTextTypeToNative() { + if (!isMapInitialized) { + initSystemFlavorMap(); + // From this point the map should not be modified + textTypeToNative = Collections.unmodifiableMap(textTypeToNative); + } + return textTypeToNative; + } + + /** + * Caches the result of getNativesForFlavor(). Maps DataFlavors to + * SoftReferences which reference LinkedHashSet of String natives. + */ + private final SoftCache nativesForFlavorCache = new SoftCache<>(); /** * Caches the result getFlavorsForNative(). Maps String natives to - * SoftReferences which reference Lists of DataFlavors. + * SoftReferences which reference LinkedHashSet of DataFlavors. */ - private Map>> getFlavorsForNativeCache = new HashMap<>(); + private final SoftCache flavorsForNativeCache = new SoftCache<>(); /** * Dynamic mapping generation used for text mappings should not be applied @@ -174,7 +190,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { * explicitly specified with setFlavorsForNative() or * setNativesForFlavor(). This keeps all such keys. */ - private Set disabledMappingGenerationKeys = new HashSet(); + private Set disabledMappingGenerationKeys = new HashSet<>(); /** * Returns the default FlavorMap for this thread's ClassLoader. @@ -404,7 +420,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { flavor = new DataFlavor(value); } catch (Exception e) { try { - flavor = new DataFlavor(value, (String)null); + flavor = new DataFlavor(value, null); } catch (Exception ee) { ee.printStackTrace(); continue; @@ -412,11 +428,11 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { } final LinkedHashSet dfs = new LinkedHashSet<>(); - dfs.add(flavor); if ("text".equals(flavor.getPrimaryType())) { dfs.addAll(convertMimeTypeToDataFlavors(value)); + store(flavor.mimeType.getBaseType(), key, getTextTypeToNative()); } for (DataFlavor df : dfs) { @@ -505,10 +521,10 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { * the appropriate Map location, but rather will be appended to a List * stored in that location. */ - private void store(H hashed, L listed, Map> map) { - List list = map.get(hashed); + private void store(H hashed, L listed, Map> map) { + LinkedHashSet list = map.get(hashed); if (list == null) { - list = new ArrayList<>(1); + list = new LinkedHashSet<>(1); map.put(hashed, list); } if (!list.contains(listed)) { @@ -522,17 +538,16 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { * case, a new DataFlavor is synthesized, stored, and returned, if and * only if the specified native is encoded as a Java MIME type. */ - private List nativeToFlavorLookup(String nat) { - List flavors = getNativeToFlavor().get(nat); + private LinkedHashSet nativeToFlavorLookup(String nat) { + LinkedHashSet flavors = getNativeToFlavor().get(nat); if (nat != null && !disabledMappingGenerationKeys.contains(nat)) { DataTransferer transferer = DataTransferer.getInstance(); if (transferer != null) { - List platformFlavors = + LinkedHashSet platformFlavors = transferer.getPlatformMappingsForNative(nat); if (!platformFlavors.isEmpty()) { if (flavors != null) { - platformFlavors.removeAll(new HashSet<>(flavors)); // Prepending the platform-specific mappings ensures // that the flavors added with // addFlavorForUnencodedNative() are at the end of @@ -558,24 +573,22 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { } if (flavor != null) { - flavors = new ArrayList<>(1); + flavors = new LinkedHashSet<>(1); getNativeToFlavor().put(nat, flavors); flavors.add(flavor); - getFlavorsForNativeCache.remove(nat); - getFlavorsForNativeCache.remove(null); + flavorsForNativeCache.remove(nat); - List natives = getFlavorToNative().get(flavor); + LinkedHashSet natives = getFlavorToNative().get(flavor); if (natives == null) { - natives = new ArrayList<>(1); + natives = new LinkedHashSet<>(1); getFlavorToNative().put(flavor, natives); } natives.add(nat); - getNativesForFlavorCache.remove(flavor); - getNativesForFlavorCache.remove(null); + nativesForFlavorCache.remove(flavor); } } - return (flavors != null) ? flavors : new ArrayList<>(0); + return (flavors != null) ? flavors : new LinkedHashSet<>(0); } /** @@ -586,18 +599,18 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { * encoding the DataFlavor's MIME type. Otherwise an empty List is returned * and 'flavorToNative' remains unaffected. */ - private List flavorToNativeLookup(final DataFlavor flav, - final boolean synthesize) { - List natives = getFlavorToNative().get(flav); + private LinkedHashSet flavorToNativeLookup(final DataFlavor flav, + final boolean synthesize) { + + LinkedHashSet natives = getFlavorToNative().get(flav); if (flav != null && !disabledMappingGenerationKeys.contains(flav)) { DataTransferer transferer = DataTransferer.getInstance(); if (transferer != null) { - List platformNatives = + LinkedHashSet platformNatives = transferer.getPlatformMappingsForFlavor(flav); if (!platformNatives.isEmpty()) { if (natives != null) { - platformNatives.removeAll(new HashSet<>(natives)); // Prepend the platform-specific mappings to ensure // that the natives added with // addUnencodedNativeForFlavor() are at the end of @@ -612,26 +625,25 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { if (natives == null) { if (synthesize) { String encoded = encodeDataFlavor(flav); - natives = new ArrayList<>(1); + natives = new LinkedHashSet<>(1); getFlavorToNative().put(flav, natives); natives.add(encoded); - getNativesForFlavorCache.remove(flav); - getNativesForFlavorCache.remove(null); - List flavors = getNativeToFlavor().get(encoded); + LinkedHashSet flavors = getNativeToFlavor().get(encoded); if (flavors == null) { - flavors = new ArrayList<>(1); + flavors = new LinkedHashSet<>(1); getNativeToFlavor().put(encoded, flavors); } flavors.add(flav); - getFlavorsForNativeCache.remove(encoded); - getFlavorsForNativeCache.remove(null); + + nativesForFlavorCache.remove(flav); + flavorsForNativeCache.remove(encoded); } else { - natives = new ArrayList<>(0); + natives = new LinkedHashSet<>(0); } } - return natives; + return new LinkedHashSet<>(natives); } /** @@ -659,103 +671,63 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { * @see #encodeDataFlavor * @since 1.4 */ + @Override public synchronized List getNativesForFlavor(DataFlavor flav) { - List retval = null; - - // Check cache, even for null flav - SoftReference> ref = getNativesForFlavorCache.get(flav); - if (ref != null) { - retval = ref.get(); - if (retval != null) { - // Create a copy, because client code can modify the returned - // list. - return new ArrayList<>(retval); - } + LinkedHashSet retval = nativesForFlavorCache.check(flav); + if (retval != null) { + return new ArrayList<>(retval); } if (flav == null) { - retval = new ArrayList<>(getNativeToFlavor().keySet()); + retval = new LinkedHashSet<>(getNativeToFlavor().keySet()); } else if (disabledMappingGenerationKeys.contains(flav)) { // In this case we shouldn't synthesize a native for this flavor, // since its mappings were explicitly specified. - retval = flavorToNativeLookup(flav, !SYNTHESIZE_IF_NOT_FOUND); + retval = flavorToNativeLookup(flav, false); } else if (DataTransferer.isFlavorCharsetTextType(flav)) { + retval = new LinkedHashSet<>(0); // For text/* flavors, flavor-to-native mappings specified in // flavormap.properties are stored per flavor's base type. if ("text".equals(flav.getPrimaryType())) { - retval = getAllNativesForType(flav.mimeType.getBaseType()); - if (retval != null) { - // To prevent the List stored in the map from modification. - retval = new ArrayList(retval); + LinkedHashSet textTypeNatives = + getTextTypeToNative().get(flav.mimeType.getBaseType()); + if (textTypeNatives != null) { + retval.addAll(textTypeNatives); } } // Also include text/plain natives, but don't duplicate Strings - List textPlainList = getAllNativesForType(TEXT_PLAIN_BASE_TYPE); - - if (textPlainList != null && !textPlainList.isEmpty()) { - // To prevent the List stored in the map from modification. - // This also guarantees that removeAll() is supported. - textPlainList = new ArrayList<>(textPlainList); - if (retval != null && !retval.isEmpty()) { - // Use HashSet to get constant-time performance for search. - textPlainList.removeAll(new HashSet<>(retval)); - retval.addAll(textPlainList); - } else { - retval = textPlainList; - } + LinkedHashSet textTypeNatives = + getTextTypeToNative().get(TEXT_PLAIN_BASE_TYPE); + if (textTypeNatives != null) { + retval.addAll(textTypeNatives); } - if (retval == null || retval.isEmpty()) { - retval = flavorToNativeLookup(flav, SYNTHESIZE_IF_NOT_FOUND); + if (retval.isEmpty()) { + retval = flavorToNativeLookup(flav, true); } else { // In this branch it is guaranteed that natives explicitly // listed for flav's MIME type were added with // addUnencodedNativeForFlavor(), so they have lower priority. - List explicitList = - flavorToNativeLookup(flav, !SYNTHESIZE_IF_NOT_FOUND); - - // flavorToNativeLookup() never returns null. - // It can return an empty List, however. - if (!explicitList.isEmpty()) { - // To prevent the List stored in the map from modification. - // This also guarantees that removeAll() is supported. - explicitList = new ArrayList<>(explicitList); - // Use HashSet to get constant-time performance for search. - explicitList.removeAll(new HashSet<>(retval)); - retval.addAll(explicitList); - } + retval.addAll(flavorToNativeLookup(flav, false)); } } else if (DataTransferer.isFlavorNoncharsetTextType(flav)) { - retval = getAllNativesForType(flav.mimeType.getBaseType()); + retval = getTextTypeToNative().get(flav.mimeType.getBaseType()); if (retval == null || retval.isEmpty()) { - retval = flavorToNativeLookup(flav, SYNTHESIZE_IF_NOT_FOUND); + retval = flavorToNativeLookup(flav, true); } else { // In this branch it is guaranteed that natives explicitly // listed for flav's MIME type were added with // addUnencodedNativeForFlavor(), so they have lower priority. - List explicitList = - flavorToNativeLookup(flav, !SYNTHESIZE_IF_NOT_FOUND); - - // flavorToNativeLookup() never returns null. - // It can return an empty List, however. - if (!explicitList.isEmpty()) { - // To prevent the List stored in the map from modification. - // This also guarantees that add/removeAll() are supported. - retval = new ArrayList<>(retval); - explicitList = new ArrayList<>(explicitList); - // Use HashSet to get constant-time performance for search. - explicitList.removeAll(new HashSet<>(retval)); - retval.addAll(explicitList); - } + retval.addAll(flavorToNativeLookup(flav, false)); } } else { - retval = flavorToNativeLookup(flav, SYNTHESIZE_IF_NOT_FOUND); + retval = flavorToNativeLookup(flav, true); } - getNativesForFlavorCache.put(flav, new SoftReference<>(retval)); + nativesForFlavorCache.put(flav, retval); // Create a copy, because client code can modify the returned list. return new ArrayList<>(retval); } @@ -791,62 +763,38 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { * @see #encodeJavaMIMEType * @since 1.4 */ + @Override public synchronized List getFlavorsForNative(String nat) { - - // Check cache, even for null nat - SoftReference> ref = getFlavorsForNativeCache.get(nat); - if (ref != null) { - List retval = ref.get(); - if (retval != null) { - return new ArrayList<>(retval); - } + LinkedHashSet returnValue = flavorsForNativeCache.check(nat); + if (returnValue != null) { + return new ArrayList<>(returnValue); + } else { + returnValue = new LinkedHashSet<>(); } - final LinkedHashSet returnValue = - new LinkedHashSet<>(); - if (nat == null) { - final List natives = getNativesForFlavor(null); - - for (String n : natives) - { - final List flavors = getFlavorsForNative(n); - - for (DataFlavor df : flavors) - { - returnValue.add(df); - } + for (String n : getNativesForFlavor(null)) { + returnValue.addAll(getFlavorsForNative(n)); } } else { - - final List flavors = nativeToFlavorLookup(nat); - + final LinkedHashSet flavors = nativeToFlavorLookup(nat); if (disabledMappingGenerationKeys.contains(nat)) { - return flavors; + return new ArrayList<>(flavors); } - final List flavorsAndBaseTypes = - nativeToFlavorLookup(nat); + final LinkedHashSet flavorsWithSynthesized = + nativeToFlavorLookup(nat); - for (DataFlavor df : flavorsAndBaseTypes) { + for (DataFlavor df : flavorsWithSynthesized) { returnValue.add(df); if ("text".equals(df.getPrimaryType())) { - try { - returnValue.addAll( - convertMimeTypeToDataFlavors( - new MimeType(df.getMimeType() - ).getBaseType())); - } catch (MimeTypeParseException e) { - e.printStackTrace(); - } + String baseType = df.mimeType.getBaseType(); + returnValue.addAll(convertMimeTypeToDataFlavors(baseType)); } } - } - - final List arrayList = new ArrayList<>(returnValue); - getFlavorsForNativeCache.put(nat, new SoftReference<>(arrayList)); - return new ArrayList<>(arrayList); + flavorsForNativeCache.put(nat, returnValue); + return new ArrayList<>(returnValue); } private static Set convertMimeTypeToDataFlavors( @@ -862,7 +810,6 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { } catch (MimeTypeParseException mtpe) { // Cannot happen, since we checked all mappings // on load from flavormap.properties. - assert(false); } if (DataTransferer.doesSubtypeSupportCharset(subType, null)) { @@ -941,10 +888,10 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { } private static final String [] htmlDocumntTypes = - new String [] {"all", "selection", "fragment"}; + new String [] {"all", "selection", "fragment"}; - private static LinkedHashSet handleHtmlMimeTypes( - String baseType, String mimeType) { + private static LinkedHashSet handleHtmlMimeTypes(String baseType, + String mimeType) { LinkedHashSet returnValues = new LinkedHashSet<>(); @@ -981,14 +928,14 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { * @see #getNativesForFlavor * @see #encodeDataFlavor */ - public synchronized Map - getNativesForFlavors(DataFlavor[] flavors) + @Override + public synchronized Map getNativesForFlavors(DataFlavor[] flavors) { // Use getNativesForFlavor to generate extra natives for text flavors // and stringFlavor if (flavors == null) { - List flavor_list = getFlavorsForNative(null); + List flavor_list = getFlavorsForNative(null); flavors = new DataFlavor[flavor_list.size()]; flavor_list.toArray(flavors); } @@ -1027,15 +974,14 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { * @see #getFlavorsForNative * @see #encodeJavaMIMEType */ - public synchronized Map - getFlavorsForNatives(String[] natives) + @Override + public synchronized Map getFlavorsForNatives(String[] natives) { // Use getFlavorsForNative to generate extra flavors for text natives - if (natives == null) { - List native_list = getNativesForFlavor(null); - natives = new String[native_list.size()]; - native_list.toArray(natives); + List nativesList = getNativesForFlavor(null); + natives = new String[nativesList.size()]; + nativesList.toArray(natives); } Map retval = new HashMap<>(natives.length, 1.0f); @@ -1044,7 +990,6 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { DataFlavor flav = (flavors.isEmpty())? null : flavors.get(0); retval.put(aNative, flav); } - return retval; } @@ -1070,20 +1015,16 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { */ public synchronized void addUnencodedNativeForFlavor(DataFlavor flav, String nat) { - if (flav == null || nat == null) { - throw new NullPointerException("null arguments not permitted"); - } + Objects.requireNonNull(nat, "Null native not permitted"); + Objects.requireNonNull(flav, "Null flavor not permitted"); - List natives = getFlavorToNative().get(flav); + LinkedHashSet natives = getFlavorToNative().get(flav); if (natives == null) { - natives = new ArrayList<>(1); + natives = new LinkedHashSet<>(1); getFlavorToNative().put(flav, natives); - } else if (natives.contains(nat)) { - return; } natives.add(nat); - getNativesForFlavorCache.remove(flav); - getNativesForFlavorCache.remove(null); + nativesForFlavorCache.remove(flav); } /** @@ -1116,18 +1057,15 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { */ public synchronized void setNativesForFlavor(DataFlavor flav, String[] natives) { - if (flav == null || natives == null) { - throw new NullPointerException("null arguments not permitted"); - } + Objects.requireNonNull(natives, "Null natives not permitted"); + Objects.requireNonNull(flav, "Null flavors not permitted"); getFlavorToNative().remove(flav); for (String aNative : natives) { addUnencodedNativeForFlavor(flav, aNative); } disabledMappingGenerationKeys.add(flav); - // Clear the cache to handle the case of empty natives. - getNativesForFlavorCache.remove(flav); - getNativesForFlavorCache.remove(null); + nativesForFlavorCache.remove(flav); } /** @@ -1150,20 +1088,16 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { */ public synchronized void addFlavorForUnencodedNative(String nat, DataFlavor flav) { - if (nat == null || flav == null) { - throw new NullPointerException("null arguments not permitted"); - } + Objects.requireNonNull(nat, "Null native not permitted"); + Objects.requireNonNull(flav, "Null flavor not permitted"); - List flavors = getNativeToFlavor().get(nat); + LinkedHashSet flavors = getNativeToFlavor().get(nat); if (flavors == null) { - flavors = new ArrayList<>(1); + flavors = new LinkedHashSet<>(1); getNativeToFlavor().put(nat, flavors); - } else if (flavors.contains(flav)) { - return; } flavors.add(flav); - getFlavorsForNativeCache.remove(nat); - getFlavorsForNativeCache.remove(null); + flavorsForNativeCache.remove(nat); } /** @@ -1195,18 +1129,15 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { */ public synchronized void setFlavorsForNative(String nat, DataFlavor[] flavors) { - if (nat == null || flavors == null) { - throw new NullPointerException("null arguments not permitted"); - } + Objects.requireNonNull(nat, "Null native not permitted"); + Objects.requireNonNull(flavors, "Null flavors not permitted"); getNativeToFlavor().remove(nat); for (DataFlavor flavor : flavors) { addFlavorForUnencodedNative(nat, flavor); } disabledMappingGenerationKeys.add(nat); - // Clear the cache to handle the case of empty flavors. - getFlavorsForNativeCache.remove(nat); - getFlavorsForNativeCache.remove(null); + flavorsForNativeCache.remove(nat); } /** @@ -1307,17 +1238,29 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable { : null; } - private List getAllNativesForType(String type) { - Set retval = null; - for (DataFlavor dataFlavor : convertMimeTypeToDataFlavors(type)) { - List natives = getFlavorToNative().get(dataFlavor); - if (natives != null && !natives.isEmpty()) { - if (retval == null) { - retval = new LinkedHashSet<>(); - } - retval.addAll(natives); + private static final class SoftCache { + Map>> cache; + + public void put(K key, LinkedHashSet value) { + if (cache == null) { + cache = new HashMap<>(1); } + cache.put(key, new SoftReference<>(value)); + } + + public void remove(K key) { + if (cache == null) return; + cache.remove(null); + cache.remove(key); + } + + public LinkedHashSet check(K key) { + if (cache == null) return null; + SoftReference> ref = cache.get(key); + if (ref != null) { + return ref.get(); + } + return null; } - return retval == null ? null : new ArrayList<>(retval); } } diff --git a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java index b4b658a6166..3f22bd86fe9 100644 --- a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java +++ b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java @@ -70,22 +70,7 @@ import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.security.ProtectionDomain; -import java.util.AbstractMap; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; -import java.util.SortedSet; -import java.util.Set; -import java.util.Stack; -import java.util.TreeMap; -import java.util.TreeSet; +import java.util.*; import sun.util.logging.PlatformLogger; @@ -2267,8 +2252,8 @@ search: * If there are no platform-specific mappings for this native, the method * returns an empty List. */ - public List getPlatformMappingsForNative(String nat) { - return new ArrayList<>(); + public LinkedHashSet getPlatformMappingsForNative(String nat) { + return new LinkedHashSet<>(); } /** @@ -2276,8 +2261,8 @@ search: * If there are no platform-specific mappings for this flavor, the method * returns an empty List. */ - public List getPlatformMappingsForFlavor(DataFlavor df) { - return new ArrayList<>(); + public LinkedHashSet getPlatformMappingsForFlavor(DataFlavor df) { + return new LinkedHashSet<>(); } /** diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java b/jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java index f54bc87c337..554e19507dc 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java @@ -45,6 +45,7 @@ import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; import javax.imageio.ImageIO; @@ -330,8 +331,8 @@ public class XDataTransferer extends DataTransferer { * type can be translated by the Data Transfer subsystem. */ @Override - public List getPlatformMappingsForNative(String nat) { - List flavors = new ArrayList<>(); + public LinkedHashSet getPlatformMappingsForNative(String nat) { + LinkedHashSet flavors = new LinkedHashSet<>(); if (nat == null) { return flavors; @@ -392,8 +393,8 @@ public class XDataTransferer extends DataTransferer { * Transfer subsystem. */ @Override - public List getPlatformMappingsForFlavor(DataFlavor df) { - List natives = new ArrayList<>(1); + public LinkedHashSet getPlatformMappingsForFlavor(DataFlavor df) { + LinkedHashSet natives = new LinkedHashSet<>(1); if (df == null) { return natives; diff --git a/jdk/test/java/awt/datatransfer/MappingGenerationTest/MappingGenerationTest.java b/jdk/test/java/awt/datatransfer/MappingGenerationTest/MappingGenerationTest.java new file mode 100644 index 00000000000..b0d8587afa3 --- /dev/null +++ b/jdk/test/java/awt/datatransfer/MappingGenerationTest/MappingGenerationTest.java @@ -0,0 +1,183 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.SystemFlavorMap; +import java.util.List; + +/* + @test + @bug 4512530 8027148 + @summary tests that mappings for text flavors are generated properly + @author das@sparc.spb.su area=datatransfer +*/ + +public class MappingGenerationTest { + + private static final SystemFlavorMap fm = + (SystemFlavorMap)SystemFlavorMap.getDefaultFlavorMap(); + + public static void main(String[] args) { + test1(); + test2(); + test3(); + test4(); + test5(); + test6(); + } + + /** + * Verifies that Lists returned from getNativesForFlavor() and + * getFlavorsForNative() are not modified with a subsequent call + * to addUnencodedNativeForFlavor() and addFlavorForUnencodedNative() + * respectively. + */ + public static void test1() { + DataFlavor df = new DataFlavor("text/plain-test1", null); + String nat = "native1"; + + List natives = fm.getNativesForFlavor(df); + fm.addUnencodedNativeForFlavor(df, nat); + List nativesNew = fm.getNativesForFlavor(df); + if (natives.equals(nativesNew)) { + System.err.println("orig=" + natives); + System.err.println("new=" + nativesNew); + throw new RuntimeException("Test failed"); + } + + List flavors = fm.getFlavorsForNative(nat); + fm.addFlavorForUnencodedNative(nat, df); + List flavorsNew = fm.getFlavorsForNative(nat); + if (flavors.equals(flavorsNew)) { + System.err.println("orig=" + flavors); + System.err.println("new=" + flavorsNew); + throw new RuntimeException("Test failed"); + } + } + + /** + * Verifies that SystemFlavorMap is not affected by modification of + * the Lists returned from getNativesForFlavor() and + * getFlavorsForNative(). + */ + public static void test2() { + DataFlavor df = new DataFlavor("text/plain-test2", null); + String nat = "native2"; + DataFlavor extraDf = new DataFlavor("text/test", null); + + List natives = fm.getNativesForFlavor(df); + natives.add("Should not be here"); + java.util.List nativesNew = fm.getNativesForFlavor(df); + if (natives.equals(nativesNew)) { + System.err.println("orig=" + natives); + System.err.println("new=" + nativesNew); + throw new RuntimeException("Test failed"); + } + + List flavors = fm.getFlavorsForNative(nat); + flavors.add(extraDf); + java.util.List flavorsNew = fm.getFlavorsForNative(nat); + if (flavors.equals(flavorsNew)) { + System.err.println("orig=" + flavors); + System.err.println("new=" + flavorsNew); + throw new RuntimeException("Test failed"); + } + } + + /** + * Verifies that addUnencodedNativeForFlavor() for a particular text flavor + * doesn't affect mappings for other flavors. + */ + public static void test3() { + DataFlavor df1 = new DataFlavor("text/plain-test3", null); + DataFlavor df2 = new DataFlavor("text/plain-test3; charset=Unicode; class=java.io.Reader", null); + String nat = "native3"; + List natives = fm.getNativesForFlavor(df2); + fm.addUnencodedNativeForFlavor(df1, nat); + List nativesNew = fm.getNativesForFlavor(df2); + if (!natives.equals(nativesNew)) { + System.err.println("orig=" + natives); + System.err.println("new=" + nativesNew); + throw new RuntimeException("Test failed"); + } + } + + /** + * Verifies that addUnencodedNativeForFlavor() really adds the specified + * flavor-to-native mapping to the existing mappings. + */ + public static void test4() { + DataFlavor df = new DataFlavor("text/plain-test4; charset=Unicode; class=java.io.Reader", null); + String nat = "native4"; + List natives = fm.getNativesForFlavor(df); + if (!natives.contains(nat)) { + fm.addUnencodedNativeForFlavor(df, nat); + List nativesNew = fm.getNativesForFlavor(df); + natives.add(nat); + if (!natives.equals(nativesNew)) { + System.err.println("orig=" + natives); + System.err.println("new=" + nativesNew); + throw new RuntimeException("Test failed"); + } + } + } + + /** + * Verifies that a flavor doesn't have any flavor-to-native mappings after + * a call to setNativesForFlavor() with this flavor and an empty native + * array as arguments. + */ + public static void test5() { + final DataFlavor flavor = + new DataFlavor("text/plain-TEST5; charset=Unicode", null); + + fm.getNativesForFlavor(flavor); + + fm.setNativesForFlavor(flavor, new String[0]); + + List natives = fm.getNativesForFlavor(flavor); + + if (!natives.isEmpty()) { + System.err.println("natives=" + natives); + throw new RuntimeException("Test failed"); + } + } + + /** + * Verifies that a native doesn't have any native-to-flavor mappings after + * a call to setFlavorsForNative() with this native and an empty flavor + * array as arguments. + */ + public static void test6() { + final String nat = "STRING"; + fm.getFlavorsForNative(nat); + fm.setFlavorsForNative(nat, new DataFlavor[0]); + + List flavors = fm.getFlavorsForNative(nat); + + if (!flavors.isEmpty()) { + System.err.println("flavors=" + flavors); + throw new RuntimeException("Test failed"); + } + } +} From 39ba3c9ea6f296f0dd966bf69808e3a7c9c68bbc Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Wed, 23 Apr 2014 18:07:12 +0400 Subject: [PATCH 11/50] 8039567: Duplicated code in DataTransferer Reviewed-by: serb, azvegint --- .../sun/lwawt/macosx/CDataTransferer.java | 3 +- .../sun/awt/datatransfer/DataTransferer.java | 65 ++++--------------- .../classes/sun/awt/X11/XDataTransferer.java | 28 +------- .../sun/awt/windows/WDataTransferer.java | 7 +- 4 files changed, 22 insertions(+), 81 deletions(-) diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java index 26d2347ff15..c07356057ee 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java @@ -31,6 +31,7 @@ import sun.awt.image.ImageRepresentation; import java.io.*; import java.net.URL; +import java.nio.charset.Charset; import java.text.Normalizer; import java.text.Normalizer.Form; import java.util.*; @@ -126,7 +127,7 @@ public class CDataTransferer extends DataTransferer { if (format == CF_URL && URL.class.equals(flavor.getRepresentationClass())) { - String charset = getDefaultTextCharset(); + String charset = Charset.defaultCharset().name(); if (transferable != null && transferable.isDataFlavorSupported(javaTextEncodingFlavor)) { try { charset = new String((byte[])transferable.getTransferData(javaTextEncodingFlavor), "UTF-8"); diff --git a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java index 3f22bd86fe9..d9c8334df8a 100644 --- a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java +++ b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java @@ -57,6 +57,7 @@ import java.nio.CharBuffer; import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; import java.nio.charset.IllegalCharsetNameException; +import java.nio.charset.StandardCharsets; import java.nio.charset.UnsupportedCharsetException; import java.lang.reflect.Constructor; @@ -149,7 +150,7 @@ public abstract class DataTransferer { tempSet.add("UTF-16BE"); tempSet.add("UTF-16LE"); tempSet.add("UTF-16"); - tempSet.add(getDefaultTextCharset()); + tempSet.add(Charset.defaultCharset().name()); return Collections.unmodifiableSortedSet(tempSet); } } @@ -162,12 +163,6 @@ public abstract class DataTransferer { */ private static final Map textMIMESubtypeCharsetSupport; - /** - * Cache of the platform default encoding as specified in the - * "file.encoding" system property. - */ - private static String defaultEncoding; - /** * A collection of all natives listed in flavormap.properties with * a primary MIME type of "text". @@ -266,17 +261,7 @@ public abstract class DataTransferer { String encoding = flavor.getParameter("charset"); - return (encoding != null) ? encoding : getDefaultTextCharset(); - } - - /** - * Returns the platform's default character encoding. - */ - public static String getDefaultTextCharset() { - if (defaultEncoding != null) { - return defaultEncoding; - } - return defaultEncoding = Charset.defaultCharset().name(); + return (encoding != null) ? encoding : Charset.defaultCharset().name(); } /** @@ -470,7 +455,7 @@ public abstract class DataTransferer { textNatives.add(format); nativeCharsets.put(format, (charset != null && charset.length() != 0) - ? charset : getDefaultTextCharset()); + ? charset : Charset.defaultCharset().name()); if (eoln != null && eoln.length() != 0 && !eoln.equals("\n")) { nativeEOLNs.put(format, eoln); } @@ -771,19 +756,17 @@ public abstract class DataTransferer { * clipboard string encoding/decoding, basing on clipboard * format and localeTransferable(on decoding, if available) */ - private String getBestCharsetForTextFormat(Long lFormat, + protected String getBestCharsetForTextFormat(Long lFormat, Transferable localeTransferable) throws IOException { String charset = null; if (localeTransferable != null && isLocaleDependentTextFormat(lFormat) && - localeTransferable.isDataFlavorSupported(javaTextEncodingFlavor)) - { + localeTransferable.isDataFlavorSupported(javaTextEncodingFlavor)) { try { - charset = new String( - (byte[])localeTransferable.getTransferData(javaTextEncodingFlavor), - "UTF-8" - ); + byte[] charsetNameBytes = (byte[])localeTransferable + .getTransferData(javaTextEncodingFlavor); + charset = new String(charsetNameBytes, StandardCharsets.UTF_8); } catch (UnsupportedFlavorException cannotHappen) { } } else { @@ -791,7 +774,7 @@ public abstract class DataTransferer { } if (charset == null) { // Only happens when we have a custom text type. - charset = getDefaultTextCharset(); + charset = Charset.defaultCharset().name(); } return charset; } @@ -1716,28 +1699,8 @@ search: { Long lFormat = format; - String sourceEncoding = null; - if (isLocaleDependentTextFormat(format) && - localeTransferable != null && - localeTransferable. - isDataFlavorSupported(javaTextEncodingFlavor)) - { - try { - sourceEncoding = new String((byte[])localeTransferable. - getTransferData(javaTextEncodingFlavor), - "UTF-8"); - } catch (UnsupportedFlavorException cannotHappen) { - } - } else { - sourceEncoding = getCharsetForTextFormat(lFormat); - } - - if (sourceEncoding == null) { - // Only happens when we have a custom text type. - sourceEncoding = getDefaultTextCharset(); - } - wrapped = new BufferedReader - (new InputStreamReader(bytestream, sourceEncoding)); + String sourceEncoding = getBestCharsetForTextFormat(format, localeTransferable); + wrapped = new BufferedReader(new InputStreamReader(bytestream, sourceEncoding)); if (targetEncoding == null) { // Throw NullPointerException for compatibility with the former @@ -2318,7 +2281,6 @@ search: */ public static class CharsetComparator extends IndexedComparator { private static final Map charsets; - private static final String defaultEncoding; private static final Integer DEFAULT_CHARSET_INDEX = 2; private static final Integer OTHER_CHARSET_INDEX = 1; @@ -2339,8 +2301,7 @@ search: // US-ASCII is the worst charset supported charsetsMap.put(canonicalName("US-ASCII"), WORST_CHARSET_INDEX); - defaultEncoding = DataTransferer.canonicalName(DataTransferer.getDefaultTextCharset()); - charsetsMap.putIfAbsent(defaultEncoding, DEFAULT_CHARSET_INDEX); + charsetsMap.putIfAbsent(Charset.defaultCharset().name(), DEFAULT_CHARSET_INDEX); charsetsMap.put(UNSUPPORTED_CHARSET, UNSUPPORTED_CHARSET_INDEX); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java b/jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java index 554e19507dc..fd9cbb8f13c 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java @@ -259,28 +259,9 @@ public class XDataTransferer extends DataTransferer { Transferable localeTransferable) throws IOException { - String charset = null; - if (localeTransferable != null && - isLocaleDependentTextFormat(format) && - localeTransferable.isDataFlavorSupported(javaTextEncodingFlavor)) { - try { - charset = new String( - (byte[])localeTransferable.getTransferData(javaTextEncodingFlavor), - "UTF-8" - ); - } catch (UnsupportedFlavorException cannotHappen) { - } - } else { - charset = getCharsetForTextFormat(format); - } - if (charset == null) { - // Only happens when we have a custom text type. - charset = getDefaultTextCharset(); - } - - BufferedReader reader = null; - try { - reader = new BufferedReader(new InputStreamReader(stream, charset)); + String charset = getBestCharsetForTextFormat(format, localeTransferable); + try (InputStreamReader isr = new InputStreamReader(stream, charset); + BufferedReader reader = new BufferedReader(isr)) { String line; ArrayList uriList = new ArrayList<>(); URI uri; @@ -293,9 +274,6 @@ public class XDataTransferer extends DataTransferer { uriList.add(uri); } return uriList.toArray(new URI[uriList.size()]); - } finally { - if (reader != null) - reader.close(); } } diff --git a/jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java b/jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java index 4b16e214052..2ccb76462aa 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java @@ -59,6 +59,7 @@ import java.io.File; import java.net.URL; +import java.nio.charset.Charset; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -268,9 +269,9 @@ final class WDataTransferer extends DataTransferer { if (format == CFSTR_INETURL && URL.class.equals(flavor.getRepresentationClass())) { - String charset = getDefaultTextCharset(); - if (localeTransferable != null && localeTransferable. - isDataFlavorSupported(javaTextEncodingFlavor)) + String charset = Charset.defaultCharset().name(); + if (localeTransferable != null + && localeTransferable.isDataFlavorSupported(javaTextEncodingFlavor)) { try { charset = new String((byte[])localeTransferable. From 781d6564c91d1a182473da2c9f99c744beadbab6 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Wed, 23 Apr 2014 21:11:25 +0400 Subject: [PATCH 12/50] 8039464: The scrollbar in JScrollPane has no right border if used WindowsLookAndFeel Reviewed-by: alexsch, serb --- .../plaf/windows/WindowsScrollBarUI.java | 25 ++++- .../swing/JScrollBar/8039464/Test8039464.html | 32 +++++++ .../swing/JScrollBar/8039464/Test8039464.java | 92 +++++++++++++++++++ 3 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 jdk/test/javax/swing/JScrollBar/8039464/Test8039464.html create mode 100644 jdk/test/javax/swing/JScrollBar/8039464/Test8039464.java diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java index 279bdb72b79..418f326165f 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java @@ -51,6 +51,8 @@ import static com.sun.java.swing.plaf.windows.XPStyle.Skin; public class WindowsScrollBarUI extends BasicScrollBarUI { private Grid thumbGrid; private Grid highlightGrid; + private Dimension horizontalThumbSize; + private Dimension verticalThumbSize; /** * Creates a UI for a JScrollBar. @@ -65,11 +67,32 @@ public class WindowsScrollBarUI extends BasicScrollBarUI { protected void installDefaults() { super.installDefaults(); - if (XPStyle.getXP() != null) { + XPStyle xp = XPStyle.getXP(); + if (xp != null) { scrollbar.setBorder(null); + horizontalThumbSize = getSize(scrollbar, xp, Part.SBP_THUMBBTNHORZ); + verticalThumbSize = getSize(scrollbar, xp, Part.SBP_THUMBBTNVERT); + } else { + horizontalThumbSize = null; + verticalThumbSize = null; } } + private static Dimension getSize(Component component, XPStyle xp, Part part) { + Skin skin = xp.getSkin(component, part); + return new Dimension(skin.getWidth(), skin.getHeight()); + } + + @Override + protected Dimension getMinimumThumbSize() { + if ((horizontalThumbSize == null) || (verticalThumbSize == null)) { + return super.getMinimumThumbSize(); + } + return JScrollBar.HORIZONTAL == scrollbar.getOrientation() + ? horizontalThumbSize + : verticalThumbSize; + } + public void uninstallUI(JComponent c) { super.uninstallUI(c); thumbGrid = highlightGrid = null; diff --git a/jdk/test/javax/swing/JScrollBar/8039464/Test8039464.html b/jdk/test/javax/swing/JScrollBar/8039464/Test8039464.html new file mode 100644 index 00000000000..a473b819d1c --- /dev/null +++ b/jdk/test/javax/swing/JScrollBar/8039464/Test8039464.html @@ -0,0 +1,32 @@ + + + + +Choose the variable applet size and try to resize the applet. +The test passes the thumb is painted correctly. + + + + + diff --git a/jdk/test/javax/swing/JScrollBar/8039464/Test8039464.java b/jdk/test/javax/swing/JScrollBar/8039464/Test8039464.java new file mode 100644 index 00000000000..44bb33abd94 --- /dev/null +++ b/jdk/test/javax/swing/JScrollBar/8039464/Test8039464.java @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Container; +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; + +import javax.swing.JApplet; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JScrollBar; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; + +/* + * @test + * @bug 8039464 + * @summary Tests enabling/disabling of titled border's caption + * @author Sergey Malenkov + * @run applet/manual=yesno Test8039464.html + */ + +public class Test8039464 extends JApplet { + static { + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (Exception exception) { + throw new Error("unexpected", exception); + } + } + + @Override + public void init() { + init(this); + } + + private static void init(Container container) { + container.setLayout(new GridBagLayout()); + GridBagConstraints gbc = new GridBagConstraints(); + gbc.fill = GridBagConstraints.BOTH; + gbc.gridx = 0; + gbc.gridy = 1; + JLabel label = new JLabel(); + Dimension size = new Dimension(111, 0); + label.setPreferredSize(size); + label.setMinimumSize(size); + container.add(label, gbc); + gbc.gridx = 1; + gbc.weightx = 1; + container.add(new JScrollBar(JScrollBar.HORIZONTAL, 1, 111, 1, 1111), gbc); + gbc.gridx = 2; + gbc.gridy = 0; + gbc.weightx = 0; + gbc.weighty = 1; + container.add(new JScrollBar(JScrollBar.VERTICAL, 1, 111, 1, 1111), gbc); + } + + public static void main(String[] args) throws Exception { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + JFrame frame = new JFrame("8039464"); + init(frame); + frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + frame.pack(); + frame.setLocationRelativeTo(null); + frame.setVisible(true); + } + }); + } +} From 6b14d69b604651b081196ddc015311be01bf6bb1 Mon Sep 17 00:00:00 2001 From: Alexander Scherbatiy Date: Thu, 24 Apr 2014 16:15:08 +0400 Subject: [PATCH 13/50] 8040279: [macosx] Do not use the base image in the MultiResolutionBufferedImage Reviewed-by: serb, pchelko --- .../com/apple/laf/AquaImageFactory.java | 24 +--- .../classes/com/apple/laf/AquaPainter.java | 6 +- .../classes/com/apple/laf/AquaUtils.java | 6 +- .../classes/sun/lwawt/macosx/CImage.java | 36 ++--- .../image/AbstractMultiResolutionImage.java | 123 ++++++++++++++++++ ...e.java => MultiResolutionCachedImage.java} | 56 ++++---- .../swing/JMenuItem/8031573/bug8031573.java | 2 +- .../swing/JOptionPane/8024926/bug8024926.java | 2 +- 8 files changed, 177 insertions(+), 78 deletions(-) create mode 100644 jdk/src/share/classes/sun/awt/image/AbstractMultiResolutionImage.java rename jdk/src/share/classes/sun/awt/image/{MultiResolutionBufferedImage.java => MultiResolutionCachedImage.java} (80%) diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java b/jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java index be6a787a45b..9e0f34f7a4c 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java @@ -46,10 +46,8 @@ import com.apple.laf.AquaIcon.JRSUIControlSpec; import com.apple.laf.AquaIcon.SystemIcon; import com.apple.laf.AquaUtils.RecyclableObject; import com.apple.laf.AquaUtils.RecyclableSingleton; -import java.util.Arrays; -import java.util.List; -import sun.awt.image.MultiResolutionBufferedImage; import sun.awt.image.MultiResolutionImage; +import sun.awt.image.MultiResolutionCachedImage; public class AquaImageFactory { public static IconUIResource getConfirmImageIcon() { @@ -125,9 +123,9 @@ public class AquaImageFactory { private static final int kAlertIconSize = 64; static IconUIResource getAppIconCompositedOn(final Image background) { - if (background instanceof MultiResolutionBufferedImage) { + if (background instanceof MultiResolutionCachedImage) { int width = background.getWidth(null); - Image mrIconImage = ((MultiResolutionBufferedImage) background).map( + Image mrIconImage = ((MultiResolutionCachedImage) background).map( rv -> getAppIconImageCompositedOn(rv, rv.getWidth(null) / width)); return new IconUIResource(new ImageIcon(mrIconImage)); } @@ -306,21 +304,7 @@ public class AquaImageFactory { private static Image getNSIcon(String imageName) { Image icon = Toolkit.getDefaultToolkit() .getImage("NSImage://" + imageName); - - if (icon instanceof MultiResolutionImage) { - return icon; - } - - int w = icon.getWidth(null); - int h = icon.getHeight(null); - - Dimension[] sizes = new Dimension[]{ - new Dimension(w, h), new Dimension(2 * w, 2 * h) - }; - - return new MultiResolutionBufferedImage(icon, sizes, (width, height) -> - AquaUtils.getCImageCreator().createImageFromName( - imageName, width, height)); + return icon; } public static class NineSliceMetrics { diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaPainter.java b/jdk/src/macosx/classes/com/apple/laf/AquaPainter.java index ee4fcba1a4d..a2ebaf1c920 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaPainter.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaPainter.java @@ -174,11 +174,7 @@ abstract class AquaPainter { bounds, controlState); Image img = cache.getImage(key); if (img == null) { - - Image baseImage = createImage(imgX, imgY, imgW, imgH, bounds, - control, controlState); - - img = new MultiResolutionBufferedImage(baseImage, + img = new MultiResolutionCachedImage(imgW, imgH, (rvWidth, rvHeight) -> createImage(imgX, imgY, rvWidth, rvHeight, bounds, control, controlState)); diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaUtils.java b/jdk/src/macosx/classes/com/apple/laf/AquaUtils.java index a20897f7b31..078435b161b 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaUtils.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaUtils.java @@ -48,7 +48,7 @@ import sun.security.action.GetPropertyAction; import sun.swing.SwingUtilities2; import com.apple.laf.AquaImageFactory.SlicedImageControl; -import sun.awt.image.MultiResolutionBufferedImage; +import sun.awt.image.MultiResolutionCachedImage; final class AquaUtils { @@ -124,8 +124,8 @@ final class AquaUtils { static Image generateLightenedImage(final Image image, final int percent) { final GrayFilter filter = new GrayFilter(true, percent); - return (image instanceof MultiResolutionBufferedImage) - ? ((MultiResolutionBufferedImage) image).map( + return (image instanceof MultiResolutionCachedImage) + ? ((MultiResolutionCachedImage) image).map( rv -> generateLightenedImage(rv, filter)) : generateLightenedImage(image, filter); } diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CImage.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CImage.java index 17815d4882e..69bdab05734 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CImage.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CImage.java @@ -32,7 +32,7 @@ import java.awt.image.*; import java.util.Arrays; import java.util.List; import sun.awt.image.MultiResolutionImage; -import sun.awt.image.MultiResolutionBufferedImage; +import sun.awt.image.MultiResolutionCachedImage; import sun.awt.image.SunWritableRaster; @@ -62,41 +62,41 @@ public class CImage extends CFRetainedResource { // This is used to create a CImage with an NSImage pointer. It MUST be a CFRetained // NSImage, and the CImage takes ownership of the non-GC retain. If callers need the // NSImage themselves, they MUST call retain on the NSImage themselves. - public BufferedImage createImageUsingNativeSize(final long image) { + public Image createImageUsingNativeSize(final long image) { if (image == 0) return null; final Dimension2D size = nativeGetNSImageSize(image); - return createBufferedImage(image, size.getWidth(), size.getHeight()); + return createImage(image, size.getWidth(), size.getHeight()); } // the width and height passed in as a parameter could differ than the width and the height of the NSImage (image), in that case, the image will be scaled - BufferedImage createBufferedImage(long image, double width, double height) { + Image createImage(long image, double width, double height) { if (image == 0) throw new Error("Unable to instantiate CImage with null native image reference."); return createImageWithSize(image, width, height); } - public BufferedImage createImageWithSize(final long image, final double width, final double height) { + public Image createImageWithSize(final long image, final double width, final double height) { final CImage img = new CImage(image); img.resize(width, height); return img.toImage(); } // This is used to create a CImage that represents the icon of the given file. - public BufferedImage createImageOfFile(final String file, final int width, final int height) { - return createBufferedImage(nativeCreateNSImageOfFileFromLaunchServices(file), width, height); + public Image createImageOfFile(final String file, final int width, final int height) { + return createImage(nativeCreateNSImageOfFileFromLaunchServices(file), width, height); } - public BufferedImage createImageFromFile(final String file, final double width, final double height) { + public Image createImageFromFile(final String file, final double width, final double height) { final long image = nativeCreateNSImageFromFileContents(file); nativeSetNSImageSize(image, width, height); - return createBufferedImage(image, width, height); + return createImage(image, width, height); } - public BufferedImage createSystemImageFromSelector(final String iconSelector, final int width, final int height) { - return createBufferedImage(nativeCreateNSImageFromIconSelector(getSelectorAsInt(iconSelector)), width, height); + public Image createSystemImageFromSelector(final String iconSelector, final int width, final int height) { + return createImage(nativeCreateNSImageFromIconSelector(getSelectorAsInt(iconSelector)), width, height); } public Image createImageFromName(final String name, final int width, final int height) { - return createBufferedImage(nativeCreateNSImageFromImageName(name), width, height); + return createImage(nativeCreateNSImageFromImageName(name), width, height); } public Image createImageFromName(final String name) { @@ -232,7 +232,7 @@ public class CImage extends CFRetainedResource { } /** @return A MultiResolution image created from nsImagePtr, or null. */ - private BufferedImage toImage() { + private Image toImage() { if (ptr == 0) return null; final Dimension2D size = nativeGetNSImageSize(ptr); @@ -243,11 +243,11 @@ public class CImage extends CFRetainedResource { = nativeGetNSImageRepresentationSizes(ptr, size.getWidth(), size.getHeight()); - BufferedImage baseImage = toImage(w, h, w, h); - - return sizes == null || sizes.length < 2 ? baseImage - : new MultiResolutionBufferedImage(baseImage, sizes, - (width, height) -> toImage(w, h, width, height)); + return sizes == null || sizes.length < 2 ? + new MultiResolutionCachedImage(w, h, (width, height) + -> toImage(w, h, width, height)) + : new MultiResolutionCachedImage(w, h, sizes, (width, height) + -> toImage(w, h, width, height)); } private BufferedImage toImage(int srcWidth, int srcHeight, int dstWidth, int dstHeight) { diff --git a/jdk/src/share/classes/sun/awt/image/AbstractMultiResolutionImage.java b/jdk/src/share/classes/sun/awt/image/AbstractMultiResolutionImage.java new file mode 100644 index 00000000000..5116f517ff0 --- /dev/null +++ b/jdk/src/share/classes/sun/awt/image/AbstractMultiResolutionImage.java @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.awt.image; + +import java.awt.Graphics; +import java.awt.Image; +import java.awt.image.*; + +/** + * This class provides default implementations for the + * MultiResolutionImage interface. The developer needs only + * to subclass this abstract class and define the getResolutionVariant, + * getResolutionVariants, and getBaseImage methods. + * + * + * For example, + * {@code + * public class CustomMultiResolutionImage extends AbstractMultiResolutionImage { + * + * int baseImageIndex; + * Image[] resolutionVariants; + * + * public CustomMultiResolutionImage(int baseImageIndex, + * Image... resolutionVariants) { + * this.baseImageIndex = baseImageIndex; + * this.resolutionVariants = resolutionVariants; + * } + * + * @Override + * public Image getResolutionVariant(float logicalDPIX, float logicalDPIY, + * float baseImageWidth, float baseImageHeight, + * float destImageWidth, float destImageHeight) { + * // return a resolution variant based on the given logical DPI, + * // base image size, or destination image size + * } + * + * @Override + * public List getResolutionVariants() { + * return Arrays.asList(resolutionVariants); + * } + * + * protected Image getBaseImage() { + * return resolutionVariants[baseImageIndex]; + * } + * } + * } + * + * @see java.awt.Image + * @see java.awt.image.MultiResolutionImage + * + * @since 1.9 + */ +public abstract class AbstractMultiResolutionImage extends java.awt.Image + implements MultiResolutionImage { + + /** + * @inheritDoc + */ + @Override + public int getWidth(ImageObserver observer) { + return getBaseImage().getWidth(null); + } + + /** + * @inheritDoc + */ + @Override + public int getHeight(ImageObserver observer) { + return getBaseImage().getHeight(null); + } + + /** + * @inheritDoc + */ + @Override + public ImageProducer getSource() { + return getBaseImage().getSource(); + } + + /** + * @inheritDoc + */ + @Override + public Graphics getGraphics() { + return getBaseImage().getGraphics(); + + } + + /** + * @inheritDoc + */ + @Override + public Object getProperty(String name, ImageObserver observer) { + return getBaseImage().getProperty(name, observer); + } + + /** + * @return base image + */ + protected abstract Image getBaseImage(); +} diff --git a/jdk/src/share/classes/sun/awt/image/MultiResolutionBufferedImage.java b/jdk/src/share/classes/sun/awt/image/MultiResolutionCachedImage.java similarity index 80% rename from jdk/src/share/classes/sun/awt/image/MultiResolutionBufferedImage.java rename to jdk/src/share/classes/sun/awt/image/MultiResolutionCachedImage.java index 74db8273416..376827c0885 100644 --- a/jdk/src/share/classes/sun/awt/image/MultiResolutionBufferedImage.java +++ b/jdk/src/share/classes/sun/awt/image/MultiResolutionCachedImage.java @@ -26,9 +26,7 @@ package sun.awt.image; import java.awt.Dimension; import java.awt.Image; -import java.awt.Graphics; import java.awt.geom.Dimension2D; -import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; import java.util.Arrays; import java.util.List; @@ -36,50 +34,39 @@ import java.util.function.Function; import java.util.function.BiFunction; import java.util.stream.Collectors; -public class MultiResolutionBufferedImage extends BufferedImage - implements MultiResolutionImage { +public class MultiResolutionCachedImage extends AbstractMultiResolutionImage { - private final BiFunction mapper; + private final int baseImageWidth; + private final int baseImageHeight; private final Dimension2D[] sizes; + private final BiFunction mapper; private int availableInfo; - public MultiResolutionBufferedImage(Image baseImage, + public MultiResolutionCachedImage(int baseImageWidth, int baseImageHeight, BiFunction mapper) { - this(baseImage, new Dimension[]{new Dimension( - baseImage.getWidth(null), baseImage.getHeight(null)) + this(baseImageWidth, baseImageHeight, new Dimension[]{new Dimension( + baseImageWidth, baseImageHeight) }, mapper); } - public MultiResolutionBufferedImage(Image baseImage, + public MultiResolutionCachedImage(int baseImageWidth, int baseImageHeight, Dimension2D[] sizes, BiFunction mapper) { - super(baseImage.getWidth(null), baseImage.getHeight(null), - BufferedImage.TYPE_INT_ARGB_PRE); + this.baseImageWidth = baseImageWidth; + this.baseImageHeight = baseImageHeight; this.sizes = sizes; this.mapper = mapper; - this.availableInfo = getInfo(baseImage); - Graphics g = getGraphics(); - g.drawImage(baseImage, 0, 0, null); - g.dispose(); } @Override public Image getResolutionVariant(int width, int height) { - int baseWidth = getWidth(); - int baseHeight = getHeight(); - - if (baseWidth == width && baseHeight == height) { - return this; - } - ImageCache cache = ImageCache.getInstance(); ImageCacheKey key = new ImageCacheKey(this, width, height); Image resolutionVariant = cache.getImage(key); if (resolutionVariant == null) { resolutionVariant = mapper.apply(width, height); cache.setImage(key, resolutionVariant); - preload(resolutionVariant, availableInfo); } - + preload(resolutionVariant, availableInfo); return resolutionVariant; } @@ -90,30 +77,39 @@ public class MultiResolutionBufferedImage extends BufferedImage (int) size.getHeight())).collect(Collectors.toList()); } - public MultiResolutionBufferedImage map(Function mapper) { - return new MultiResolutionBufferedImage(mapper.apply(this), sizes, - (width, height) -> + public MultiResolutionCachedImage map(Function mapper) { + return new MultiResolutionCachedImage(baseImageWidth, baseImageHeight, + sizes, (width, height) -> mapper.apply(getResolutionVariant(width, height))); } @Override public int getWidth(ImageObserver observer) { - availableInfo |= ImageObserver.WIDTH; + updateInfo(observer, ImageObserver.WIDTH); return super.getWidth(observer); } @Override public int getHeight(ImageObserver observer) { - availableInfo |= ImageObserver.HEIGHT; + updateInfo(observer, ImageObserver.HEIGHT); return super.getHeight(observer); } @Override public Object getProperty(String name, ImageObserver observer) { - availableInfo |= ImageObserver.PROPERTIES; + updateInfo(observer, ImageObserver.PROPERTIES); return super.getProperty(name, observer); } + @Override + protected Image getBaseImage() { + return getResolutionVariant(baseImageWidth, baseImageHeight); + } + + private void updateInfo(ImageObserver observer, int info) { + availableInfo |= (observer == null) ? ImageObserver.ALLBITS : info; + } + private static int getInfo(Image image) { if (image instanceof ToolkitImage) { return ((ToolkitImage) image).getImageRep().check( diff --git a/jdk/test/javax/swing/JMenuItem/8031573/bug8031573.java b/jdk/test/javax/swing/JMenuItem/8031573/bug8031573.java index 5cb1dc5047f..2d36db7a171 100644 --- a/jdk/test/javax/swing/JMenuItem/8031573/bug8031573.java +++ b/jdk/test/javax/swing/JMenuItem/8031573/bug8031573.java @@ -28,7 +28,7 @@ import javax.swing.JMenuBar; import javax.swing.SwingUtilities; /* @test - * @bug 8031573 + * @bug 8031573 8040279 * @summary [macosx] Checkmarks of JCheckBoxMenuItems aren't rendered * in high resolution on Retina * @author Alexander Scherbatiy diff --git a/jdk/test/javax/swing/JOptionPane/8024926/bug8024926.java b/jdk/test/javax/swing/JOptionPane/8024926/bug8024926.java index 42f976b03c0..185537f3b5b 100644 --- a/jdk/test/javax/swing/JOptionPane/8024926/bug8024926.java +++ b/jdk/test/javax/swing/JOptionPane/8024926/bug8024926.java @@ -31,7 +31,7 @@ import sun.awt.OSInfo; /** * @test - * @bug 8024926 + * @bug 8024926 8040279 * @summary [macosx] AquaIcon HiDPI support * @author Alexander Scherbatiy * @run applet/manual=yesno bug8024926.html From 7059ba15c3e1fbfffcb883b96cbbca5574507fcd Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Thu, 24 Apr 2014 20:22:58 +0400 Subject: [PATCH 14/50] 7124250: [macosx] JOptionPane dialogs show wrong icons Reviewed-by: serb, leonidr --- .../com/apple/laf/AquaImageFactory.java | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java b/jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java index 9e0f34f7a4c..4838ba48879 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaImageFactory.java @@ -55,7 +55,7 @@ public class AquaImageFactory { return new IconUIResource(new AquaIcon.CachingScalingIcon(kAlertIconSize, kAlertIconSize) { Image createImage() { - return getThisApplicationsIcon(kAlertIconSize, kAlertIconSize); + return getGenericJavaIcon(); } }); } @@ -81,24 +81,6 @@ public class AquaImageFactory { return getAppIconCompositedOn(lockIcon); } - static Image getThisApplicationsIcon(final int width, final int height) { - final String path = getPathToThisApplication(); - - if (path == null) { - return getGenericJavaIcon(); - } - - if (path.endsWith("/Home/bin")) { - return getGenericJavaIcon(); - } - - if (path.startsWith("/usr/bin")) { - return getGenericJavaIcon(); - } - - return AquaUtils.getCImageCreator().createImageOfFile(path, height, width); - } - static Image getGenericJavaIcon() { return java.security.AccessController.doPrivileged(new PrivilegedAction() { public Image run() { @@ -142,7 +124,7 @@ public class AquaImageFactory { final Icon smallAppIconScaled = new AquaIcon.CachingScalingIcon( kAlertSubIconSize, kAlertSubIconSize) { Image createImage() { - return getThisApplicationsIcon(kAlertSubIconSize, kAlertSubIconSize); + return getGenericJavaIcon(); } }; @@ -514,4 +496,4 @@ public class AquaImageFactory { public static Color getSelectionInactiveForegroundColorUIResource() { return new SystemColorProxy(LWCToolkit.getAppleColor(LWCToolkit.INACTIVE_SELECTION_FOREGROUND_COLOR)); } -} \ No newline at end of file +} From c25473bb3827e3b8e53694d148a615c7cd14e6ae Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Fri, 25 Apr 2014 16:27:30 +0400 Subject: [PATCH 15/50] 8041572: [macosx] huge native memory leak in AWTWindow.m Reviewed-by: serb, anthony --- jdk/src/macosx/native/sun/awt/AWTWindow.m | 9 ++++++--- jdk/src/macosx/native/sun/awt/CGraphicsDevice.m | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jdk/src/macosx/native/sun/awt/AWTWindow.m b/jdk/src/macosx/native/sun/awt/AWTWindow.m index c2577584886..6a9c1166e84 100644 --- a/jdk/src/macosx/native/sun/awt/AWTWindow.m +++ b/jdk/src/macosx/native/sun/awt/AWTWindow.m @@ -261,7 +261,8 @@ AWT_ASSERT_APPKIT_THREAD; // returns id for the topmost window under mouse + (NSInteger) getTopmostWindowUnderMouseID { - + NSInteger result = -1; + NSRect screenRect = [[NSScreen mainScreen] frame]; NSPoint nsMouseLocation = [NSEvent mouseLocation]; CGPoint cgMouseLocation = CGPointMake(nsMouseLocation.x, screenRect.size.height - nsMouseLocation.y); @@ -274,11 +275,13 @@ AWT_ASSERT_APPKIT_THREAD; CGRect rect; CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)[window objectForKey:(id)kCGWindowBounds], &rect); if (CGRectContainsPoint(rect, cgMouseLocation)) { - return [[window objectForKey:(id)kCGWindowNumber] integerValue]; + result = [[window objectForKey:(id)kCGWindowNumber] integerValue]; + break; } } } - return -1; + [windows release]; + return result; } // checks that this window is under the mouse cursor and this point is not overlapped by others windows diff --git a/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m b/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m index 9b94b82abbc..4d3b587c174 100644 --- a/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m +++ b/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m @@ -66,7 +66,8 @@ static CFMutableArrayRef getAllValidDisplayModes(jint displayID){ CFArrayAppendValue(validModes, cRef); } } - + CFRelease(allModes); + CGDisplayModeRef currentMode = CGDisplayCopyDisplayMode(displayID); BOOL containsCurrentMode = NO; @@ -81,6 +82,7 @@ static CFMutableArrayRef getAllValidDisplayModes(jint displayID){ if (!containsCurrentMode) { CFArrayAppendValue(validModes, currentMode); } + CGDisplayModeRelease(currentMode); return validModes; } From 844cf2d704ada1bbf613504d6c2d21c058b9af44 Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Fri, 25 Apr 2014 16:39:13 +0400 Subject: [PATCH 16/50] 8041490: PIT: [macosx] Crash in system tray functionality check test Reviewed-by: anthony, serb --- .../sun/lwawt/macosx/CWarningWindow.java | 4 ++ .../WarningWindowDisposeCrashTest.java | 54 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 jdk/test/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeCrashTest.java diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java index fc72ef79474..0acc67feed6 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java @@ -309,6 +309,10 @@ public final class CWarningWindow extends CPlatformWindow @Override public void dispose() { cancelTasks(); + SurfaceData surfaceData = contentView.getSurfaceData(); + if (surfaceData != null) { + surfaceData.invalidate(); + } super.dispose(); } diff --git a/jdk/test/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeCrashTest.java b/jdk/test/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeCrashTest.java new file mode 100644 index 00000000000..298059054d9 --- /dev/null +++ b/jdk/test/java/awt/security/WarningWindowDisposeTest/WarningWindowDisposeCrashTest.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + @test + @bug 8041490 + @summary tests that the WarningWindow's surface is invalidated on dispose + @author Petr Pchelko + @run main/othervm WarningWindowDisposeCrashTest +*/ + + +import sun.applet.AppletSecurity; +import sun.awt.SunToolkit; + +import java.awt.*; + +public class WarningWindowDisposeCrashTest { + public static void main(String[] args) throws Exception { + System.setSecurityManager(new AppletSecurity() { + @Override + public void checkPackageAccess (String s){ + } + }); + + Frame f = new Frame(); + f.setVisible(true); + ((SunToolkit) Toolkit.getDefaultToolkit()).realSync(); + Thread.sleep(1000); + f.dispose(); + // If the bug is present VM could crash after this call + for (int i = 0; i < 1000; i++) Toolkit.getDefaultToolkit().sync(); + } +} From 01e8b57668fb27fbc9ef52627db027d5edcf5ab4 Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Mon, 28 Apr 2014 16:45:43 +0400 Subject: [PATCH 17/50] 8041987: [macosx] setDisplayMode crashes Reviewed-by: anthony, serb --- .../macosx/native/sun/awt/CGraphicsDevice.m | 9 +- .../DisplayChangeVITest.java | 245 ++++++++++++++++++ 2 files changed, 250 insertions(+), 4 deletions(-) create mode 100644 jdk/test/java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java diff --git a/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m b/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m index 4d3b587c174..e20792a231d 100644 --- a/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m +++ b/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m @@ -237,17 +237,19 @@ Java_sun_awt_CGraphicsDevice_nativeSetDisplayMode { JNF_COCOA_ENTER(env); CFArrayRef allModes = getAllValidDisplayModes(displayID); - CGDisplayModeRef closestMatch = getBestModeForParameters(allModes, (int)w, (int)h, (int)bpp, (int)refrate); + __block CGError retCode = kCGErrorSuccess; if (closestMatch != NULL) { - [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){ + CGDisplayModeRetain(closestMatch); + [ThreadUtilities performOnMainThreadWaiting:YES block:^(){ CGDisplayConfigRef config; retCode = CGBeginDisplayConfiguration(&config); if (retCode == kCGErrorSuccess) { CGConfigureDisplayWithDisplayMode(config, displayID, closestMatch, NULL); retCode = CGCompleteDisplayConfiguration(config, kCGConfigureForAppOnly); } + CGDisplayModeRelease(closestMatch); }]; } else { [JNFException raise:env as:kIllegalArgumentException reason:"Invalid display mode"]; @@ -255,8 +257,7 @@ Java_sun_awt_CGraphicsDevice_nativeSetDisplayMode if (retCode != kCGErrorSuccess){ [JNFException raise:env as:kIllegalArgumentException reason:"Unable to set display mode!"]; - } - + } CFRelease(allModes); JNF_COCOA_EXIT(env); } diff --git a/jdk/test/java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java b/jdk/test/java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java new file mode 100644 index 00000000000..ae7ab9f1908 --- /dev/null +++ b/jdk/test/java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java @@ -0,0 +1,245 @@ +/* + * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 6366359 + * @summary Test that we don't crash when changing from 8 to 16/32 bit modes + * @author Dmitri.Trembovetski@Sun.COM area=FullScreen + * @run main/othervm/timeout=200 DisplayChangeVITest + * @run main/othervm/timeout=200 -Dsun.java2d.d3d=false DisplayChangeVITest + * @run main/othervm/timeout=200 -Dsun.java2d.opengl=true DisplayChangeVITest + */ + +import java.awt.Color; +import java.awt.DisplayMode; +import java.awt.Graphics; +import java.awt.GraphicsDevice; +import java.awt.GraphicsEnvironment; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.image.BufferedImage; +import java.awt.image.VolatileImage; +import java.lang.Exception; +import java.lang.Thread; +import java.util.ArrayList; +import java.util.Random; +import javax.swing.JFrame; + +/** + * The test enters fullscreen mode (if it's supported) and then tries + * to switch between display moes with different depths and dimensions + * while doing both rendering to the screen (via a VolatileImage) + * and Swing repainting just to make things more chaotic. + * + * The procedure is repeated TEST_REPS times (3 by default). + * + * Don't pay attention to what happens on the screen, it won't be pretty. + * If the test doesn't crash or throw exceptions, it passes, otherwise + * it fails. + */ +public class DisplayChangeVITest extends JFrame implements Runnable { + + private final Random rnd = new Random(); + private VolatileImage bb; + private BufferedImage sprite; + private VolatileImage volSprite; + + private static boolean done = false; + private static final Object lock = new Object(); + private static final int TEST_REPS = 3; + + private ArrayList dms; + + DisplayChangeVITest() { + selectDisplayModes(); + addKeyListener(new KeyAdapter() { + public void keyPressed(KeyEvent e) { + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + synchronized (lock) { + done = true; + } + } + } + }); + sprite = new BufferedImage(200, 200, BufferedImage.TYPE_INT_RGB); + sprite.getRaster().getDataBuffer(); + Graphics g = sprite.getGraphics(); + g.setColor(Color.yellow); + g.fillRect(0, 0, sprite.getWidth(), sprite.getHeight()); + } + + void render(Graphics g) { + do { + // volatile images validated here + initBackbuffer(); + + g.setColor(Color.black); + g.fillRect(0, 0, getWidth(), getHeight()); + + Graphics gg = bb.getGraphics(); + gg.setColor(new Color(rnd.nextInt(0x00ffffff))); + gg.fillRect(0, 0, bb.getWidth(), bb.getHeight()); + for (int x = 0; x < 10; x++) { + gg.drawImage(sprite, x*200, 0, null); + gg.drawImage(volSprite, x*200, 500, null); + } + + g.drawImage(bb, 0, 0, null); + } while (bb.contentsLost()); + } + + private static void sleep(long msec) { + try { Thread.sleep(msec); } catch (InterruptedException e) {} + } + + private int reps = 0; + public void run() { + GraphicsDevice gd = getGraphicsConfiguration().getDevice(); + if (gd.isDisplayChangeSupported() && dms.size() > 0) { + while (!done && reps++ < TEST_REPS) { + for (DisplayMode dm : dms) { + System.err.printf("Entering DisplayMode[%dx%dx%d]\n", + dm.getWidth(), dm.getHeight(), dm.getBitDepth()); + gd.setDisplayMode(dm); + + initBackbuffer(); + for (int i = 0; i < 10; i++) { + // render to the screen + render(getGraphics()); + // ask Swing to repaint + repaint(); + sleep(100); + } + sleep(1500); + } + } + } else { + System.err.println("Display mode change " + + "not supported. Test passed."); + } + dispose(); + synchronized (lock) { + done = true; + lock.notify(); + } + } + + private void createBackbuffer() { + if (bb == null || + bb.getWidth() != getWidth() || bb.getHeight() != getHeight()) + { + bb = createVolatileImage(getWidth(), getHeight()); + } + } + + private void initBackbuffer() { + createBackbuffer(); + + int res = bb.validate(getGraphicsConfiguration()); + if (res == VolatileImage.IMAGE_INCOMPATIBLE) { + bb = null; + createBackbuffer(); + bb.validate(getGraphicsConfiguration()); + res = VolatileImage.IMAGE_RESTORED; + } + if (res == VolatileImage.IMAGE_RESTORED) { + Graphics g = bb.getGraphics(); + g.setColor(new Color(rnd.nextInt(0x00ffffff))); + g.fillRect(0, 0, bb.getWidth(), bb.getHeight()); + + volSprite = createVolatileImage(100, 100); + } + volSprite.validate(getGraphicsConfiguration()); + } + + private void selectDisplayModes() { + GraphicsDevice gd = + GraphicsEnvironment.getLocalGraphicsEnvironment(). + getDefaultScreenDevice(); + dms = new ArrayList(); + DisplayMode dmArray[] = gd.getDisplayModes(); + boolean found8 = false, found16 = false, + found24 = false, found32 = false; + for (DisplayMode dm : dmArray) { + if (!found8 && + (dm.getBitDepth() == 8 || + dm.getBitDepth() == DisplayMode.BIT_DEPTH_MULTI) && + (dm.getWidth() >= 800 && dm.getWidth() < 1024)) + { + dms.add(dm); + found8 = true; + continue; + } + if (!found32 && + (dm.getBitDepth() == 32 || + dm.getBitDepth() == DisplayMode.BIT_DEPTH_MULTI) && + dm.getWidth() >= 1280) + { + dms.add(dm); + found32 = true; + continue; + } + if (!found16 && + dm.getBitDepth() == 16 && + (dm.getWidth() >= 1024 && dm.getWidth() < 1280)) + { + dms.add(dm); + found16 = true; + continue; + } + if (found8 && found16 && found32) { + break; + } + } + System.err.println("Found display modes:"); + for (DisplayMode dm : dms) { + System.err.printf("DisplayMode[%dx%dx%d]\n", + dm.getWidth(), dm.getHeight(), dm.getBitDepth()); + } + } + + public static void main(String[] args) throws Exception { + DisplayChangeVITest test = new DisplayChangeVITest(); + GraphicsDevice gd = + GraphicsEnvironment.getLocalGraphicsEnvironment(). + getDefaultScreenDevice(); + if (gd.isFullScreenSupported()) { + gd.setFullScreenWindow(test); + Thread t = new Thread(test); + t.run(); + synchronized (lock) { + while (!done) { + try { + lock.wait(50); + } catch (InterruptedException ex) { + ex.printStackTrace(); + } + } + } + System.err.println("Test Passed."); + } else { + System.err.println("Full screen not supported. Test passed."); + } + } +} From c7f7685c508af7155e1abf6405e4730d6780e1c6 Mon Sep 17 00:00:00 2001 From: Vivi An Date: Mon, 28 Apr 2014 11:03:52 -0700 Subject: [PATCH 18/50] 8036819: JAB: mneumonics not read for textboxes Reviewed-by: alexsch --- .../share/classes/javax/swing/JComponent.java | 13 +- .../swing/JTextField/8036819/bug8036819.java | 132 ++++++++++++++++++ 2 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 jdk/test/javax/swing/JTextField/8036819/bug8036819.java diff --git a/jdk/src/share/classes/javax/swing/JComponent.java b/jdk/src/share/classes/javax/swing/JComponent.java index 98c4d7fb5dd..2d2745957e7 100644 --- a/jdk/src/share/classes/javax/swing/JComponent.java +++ b/jdk/src/share/classes/javax/swing/JComponent.java @@ -3986,7 +3986,18 @@ public abstract class JComponent extends Container implements Serializable, * @see AccessibleKeyBinding * @since 1.4 */ - public AccessibleKeyBinding getAccessibleKeyBinding() { + public AccessibleKeyBinding getAccessibleKeyBinding(){ + // Try to get the linked label's mnemonic if it exists + Object o = getClientProperty(JLabel.LABELED_BY_PROPERTY); + if (o instanceof Accessible){ + AccessibleContext ac = ((Accessible) o).getAccessibleContext(); + if (ac != null){ + AccessibleComponent comp = ac.getAccessibleComponent(); + if (! (comp instanceof AccessibleExtendedComponent)) + return null; + return ((AccessibleExtendedComponent)comp).getAccessibleKeyBinding(); + } + } return null; } } // inner class AccessibleJComponent diff --git a/jdk/test/javax/swing/JTextField/8036819/bug8036819.java b/jdk/test/javax/swing/JTextField/8036819/bug8036819.java new file mode 100644 index 00000000000..558be4c9769 --- /dev/null +++ b/jdk/test/javax/swing/JTextField/8036819/bug8036819.java @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @library ../../regtesthelpers + * @build Util + * @bug 8036819 + * @summary JAB: mnemonics not read for textboxes + * @author Vivi An + * @run main bug8036819 + */ + +import javax.swing.*; +import javax.swing.event.*; +import java.awt.event.*; +import java.awt.*; +import sun.awt.SunToolkit; +import javax.accessibility.*; + +public class bug8036819 { + + public static volatile Boolean passed = false; + + public static void main(String args[]) throws Throwable { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + createAndShowGUI(); + } + }); + + SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); + toolkit.realSync(); + + Robot robo = new Robot(); + robo.setAutoDelay(300); + + // Using mnemonic key to focus on the textfield + Util.hitMnemonics(robo, KeyEvent.VK_P); + toolkit.realSync(); + + if (!passed){ + throw new RuntimeException("Test failed."); + } + } + + private static void createAndShowGUI() { + JFrame mainFrame = new JFrame("bug 8036819"); + + JLabel usernameLabel = new JLabel("Username: "); + JTextField usernameField = new JTextField(20); + usernameLabel.setDisplayedMnemonic(KeyEvent.VK_U); + usernameLabel.setLabelFor(usernameField); + + JLabel pwdLabel = new JLabel("Password: "); + JTextField pwdField = new JTextField(20); + pwdLabel.setDisplayedMnemonic(KeyEvent.VK_P); + pwdLabel.setLabelFor(pwdField); + + pwdField.addKeyListener( + new KeyListener(){ + @Override + public void keyPressed(KeyEvent keyEvent) { + } + + @Override + public void keyTyped(KeyEvent keyEvent) { + } + + @Override + public void keyReleased(KeyEvent keyEvent){ + JComponent comp = (JComponent) pwdField; + AccessibleContext ac = comp.getAccessibleContext(); + AccessibleExtendedComponent aec = (AccessibleExtendedComponent)ac.getAccessibleComponent(); + AccessibleKeyBinding akb = aec.getAccessibleKeyBinding(); + if (akb != null){ + int count = akb.getAccessibleKeyBindingCount(); + if (count != 1){ + passed = false; + return; + } + + // there is 1 accessible key for the text field + System.out.println("Retrieved AccessibleKeyBinding for textfield " + count); + + // the key code is KeyEvent.VK_P + Object o = akb.getAccessibleKeyBinding(0); + if (o instanceof KeyStroke){ + javax.swing.KeyStroke key = (javax.swing.KeyStroke)o; + System.out.println("keystroke is " + key.getKeyCode()); + if (key.getKeyCode() == KeyEvent.VK_P) + passed = true; + } + } + } + } + ); + + mainFrame.getContentPane().add(usernameLabel); + mainFrame.getContentPane().add(usernameField); + mainFrame.getContentPane().add(pwdLabel); + mainFrame.getContentPane().add(pwdField); + + mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + mainFrame.setLayout(new FlowLayout(FlowLayout.LEFT)); + + mainFrame.setSize(200, 200); + mainFrame.setLocation(200, 200); + mainFrame.setVisible(true); + mainFrame.toFront(); + } + } From cb91afdb8cb3561f6bbf68ab116d5732f4139dc4 Mon Sep 17 00:00:00 2001 From: Henry Jen Date: Mon, 28 Apr 2014 19:05:49 -0700 Subject: [PATCH 19/50] 8039642: Fix raw and unchecked warnings in sun.awt.* Reviewed-by: darcy, prr, flar --- jdk/src/share/classes/java/awt/Menu.java | 8 +- .../share/classes/sun/awt/AWTAccessor.java | 4 +- jdk/src/share/classes/sun/awt/AppContext.java | 1 + .../classes/sun/awt/FontConfiguration.java | 44 ++++----- jdk/src/share/classes/sun/awt/HToolkit.java | 3 +- .../classes/sun/awt/HeadlessToolkit.java | 3 +- .../share/classes/sun/awt/PlatformFont.java | 11 +-- jdk/src/share/classes/sun/awt/SunToolkit.java | 2 + .../sun/awt/datatransfer/DataTransferer.java | 45 ++++----- .../sun/awt/datatransfer/SunClipboard.java | 6 +- .../awt/datatransfer/TransferableProxy.java | 20 ++-- .../sun/awt/dnd/SunDragSourceContextPeer.java | 2 +- .../sun/awt/dnd/SunDropTargetContextPeer.java | 8 +- .../share/classes/sun/awt/geom/AreaOp.java | 56 +++++------ .../share/classes/sun/awt/geom/Crossings.java | 16 ++-- jdk/src/share/classes/sun/awt/geom/Curve.java | 8 +- .../share/classes/sun/awt/geom/Order2.java | 4 +- .../share/classes/sun/awt/geom/Order3.java | 4 +- .../sun/awt/image/BufImgSurfaceData.java | 2 +- .../sun/awt/image/GifImageDecoder.java | 2 +- .../classes/sun/awt/image/ImageDecoder.java | 4 +- .../classes/sun/awt/image/ImageFetcher.java | 41 ++++---- .../sun/awt/image/ImageRepresentation.java | 2 +- .../classes/sun/awt/image/ImagingLib.java | 4 +- .../sun/awt/image/JPEGImageDecoder.java | 6 +- .../sun/awt/image/OffScreenImageSource.java | 6 +- .../sun/awt/image/PNGImageDecoder.java | 4 +- .../classes/sun/awt/image/ToolkitImage.java | 6 +- .../classes/sun/awt/shell/ShellFolder.java | 12 ++- .../sun/awt/shell/ShellFolderColumnInfo.java | 10 +- .../sun/awt/util/IdentityArrayList.java | 7 +- .../sun/awt/util/IdentityLinkedList.java | 11 ++- .../classes/sun/awt/X11/InfoWindow.java | 5 +- .../classes/sun/awt/X11/ListHelper.java | 16 ++-- .../awt/X11/MotifDnDDragSourceProtocol.java | 3 +- .../solaris/classes/sun/awt/X11/Native.java | 21 ++--- .../classes/sun/awt/X11/XAWTXSettings.java | 8 +- .../classes/sun/awt/X11/XAtomList.java | 2 +- .../classes/sun/awt/X11/XAwtState.java | 12 +-- .../classes/sun/awt/X11/XBaseMenuWindow.java | 6 +- .../classes/sun/awt/X11/XComponentPeer.java | 14 +-- .../sun/awt/X11/XCreateWindowParams.java | 6 +- .../classes/sun/awt/X11/XDataTransferer.java | 3 +- .../sun/awt/X11/XDnDDragSourceProtocol.java | 3 +- .../sun/awt/X11/XDragAndDropProtocols.java | 24 ++--- .../sun/awt/X11/XDragSourceContextPeer.java | 24 +++-- .../sun/awt/X11/XDragSourceProtocol.java | 6 +- .../sun/awt/X11/XDropTargetContextPeer.java | 17 ++-- .../awt/X11/XDropTargetEventProcessor.java | 5 +- .../sun/awt/X11/XDropTargetProtocol.java | 6 +- .../sun/awt/X11/XDropTargetRegistry.java | 53 +++++------ .../sun/awt/X11/XEmbeddingContainer.java | 2 +- .../classes/sun/awt/X11/XFileDialogPeer.java | 6 +- .../classes/sun/awt/X11/XListPeer.java | 16 ++-- .../classes/sun/awt/X11/XMSelection.java | 24 ++--- .../classes/sun/awt/X11/XMenuBarPeer.java | 6 +- .../classes/sun/awt/X11/XMenuPeer.java | 2 +- .../classes/sun/awt/X11/XMenuWindow.java | 4 +- .../classes/sun/awt/X11/XPopupMenuPeer.java | 4 +- .../classes/sun/awt/X11/XSelection.java | 6 +- .../solaris/classes/sun/awt/X11/XToolkit.java | 94 +++++++++---------- .../classes/sun/awt/X11/XTrayIconPeer.java | 2 +- jdk/src/solaris/classes/sun/awt/X11/XWM.java | 5 +- .../solaris/classes/sun/awt/X11/XWindow.java | 8 +- .../classes/sun/awt/X11/XWindowPeer.java | 2 +- .../classes/sun/awt/X11CustomCursor.java | 6 +- .../classes/sun/awt/X11FontManager.java | 42 ++++----- .../classes/sun/awt/X11GraphicsDevice.java | 8 +- .../sun/awt/X11GraphicsEnvironment.java | 14 +-- .../classes/sun/awt/X11InputMethod.java | 28 +++--- .../solaris/classes/sun/awt/XSettings.java | 8 +- .../sun/awt/motif/MFontConfiguration.java | 6 +- 72 files changed, 452 insertions(+), 437 deletions(-) diff --git a/jdk/src/share/classes/java/awt/Menu.java b/jdk/src/share/classes/java/awt/Menu.java index 629371868d1..ae8e50ea7e1 100644 --- a/jdk/src/share/classes/java/awt/Menu.java +++ b/jdk/src/share/classes/java/awt/Menu.java @@ -66,7 +66,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible { AWTAccessor.setMenuAccessor( new AWTAccessor.MenuAccessor() { - public Vector getItems(Menu menu) { + public Vector getItems(Menu menu) { return menu.items; } }); @@ -78,7 +78,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible { * @serial * @see #countItems() */ - Vector items = new Vector<>(); + Vector items = new Vector<>(); /** * This field indicates whether the menu has the @@ -252,7 +252,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible { * be called on the toolkit thread. */ final MenuItem getItemImpl(int index) { - return (MenuItem)items.elementAt(index); + return items.elementAt(index); } /** @@ -544,7 +544,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible { // HeadlessException will be thrown from MenuComponent's readObject s.defaultReadObject(); for(int i = 0; i < items.size(); i++) { - MenuItem item = (MenuItem)items.elementAt(i); + MenuItem item = items.elementAt(i); item.parent = this; } } diff --git a/jdk/src/share/classes/sun/awt/AWTAccessor.java b/jdk/src/share/classes/sun/awt/AWTAccessor.java index b99ccdfe2ee..1d60a1c332d 100644 --- a/jdk/src/share/classes/sun/awt/AWTAccessor.java +++ b/jdk/src/share/classes/sun/awt/AWTAccessor.java @@ -621,7 +621,7 @@ public final class AWTAccessor { /** * Returns menus */ - Vector getMenus(MenuBar menuBar); + Vector getMenus(MenuBar menuBar); } /** @@ -663,7 +663,7 @@ public final class AWTAccessor { /** * Returns vector of the items that are part of the Menu */ - Vector getItems(Menu menu); + Vector getItems(Menu menu); } /** diff --git a/jdk/src/share/classes/sun/awt/AppContext.java b/jdk/src/share/classes/sun/awt/AppContext.java index 5959e54dea4..23653ba7387 100644 --- a/jdk/src/share/classes/sun/awt/AppContext.java +++ b/jdk/src/share/classes/sun/awt/AppContext.java @@ -890,6 +890,7 @@ public final class AppContext { Supplier supplier) { final AppContext appContext = AppContext.getAppContext(); + @SuppressWarnings("unchecked") SoftReference ref = (SoftReference) appContext.get(key); if (ref != null) { final T object = ref.get(); diff --git a/jdk/src/share/classes/sun/awt/FontConfiguration.java b/jdk/src/share/classes/sun/awt/FontConfiguration.java index f95b36805df..c234b534633 100644 --- a/jdk/src/share/classes/sun/awt/FontConfiguration.java +++ b/jdk/src/share/classes/sun/awt/FontConfiguration.java @@ -64,7 +64,7 @@ public abstract class FontConfiguration { protected static String osName; protected static String encoding; // canonical name of default nio charset protected static Locale startupLocale = null; - protected static Hashtable localeMap = null; + protected static Hashtable localeMap = null; private static FontConfiguration fontConfig; private static PlatformLogger logger; protected static boolean isProperties = true; @@ -159,15 +159,15 @@ public abstract class FontConfiguration { short fontNameID = compFontNameIDs[0][0][0]; short fileNameID = getComponentFileID(fontNameID); final String fileName = mapFileName(getComponentFileName(fileNameID)); - Boolean exists = (Boolean)java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public Object run() { + Boolean exists = java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public Boolean run() { try { File f = new File(fileName); return Boolean.valueOf(f.exists()); } catch (Exception e) { - return false; + return Boolean.FALSE; } } }); @@ -534,11 +534,11 @@ public abstract class FontConfiguration { private short remapLocaleMap(int fontIndex, int styleIndex, short scriptID, short fontID) { String scriptName = getString(table_scriptIDs[scriptID]); - String value = (String)localeMap.get(scriptName); + String value = localeMap.get(scriptName); if (value == null) { String fontName = fontNames[fontIndex]; String styleName = styleNames[styleIndex]; - value = (String)localeMap.get(fontName + "." + styleName + "." + scriptName); + value = localeMap.get(fontName + "." + styleName + "." + scriptName); } if (value == null) { return fontID; @@ -746,7 +746,7 @@ public abstract class FontConfiguration { /* Mappings from file encoding to font config name for font supporting * the corresponding language. This is filled in by initReorderMap() */ - protected HashMap reorderMap = null; + protected HashMap reorderMap = null; /* Platform-specific mappings */ protected abstract void initReorderMap(); @@ -777,7 +777,7 @@ public abstract class FontConfiguration { if (fontConfig.reorderMap == null) { fontConfig.initReorderMap(); } - HashMap reorderMap = fontConfig.reorderMap; + HashMap reorderMap = fontConfig.reorderMap; /* Find the most specific mapping */ String language = startupLocale.getLanguage(); @@ -817,9 +817,9 @@ public abstract class FontConfiguration { } } - private static Vector splitSequence(String sequence) { + private static Vector splitSequence(String sequence) { //String.split would be more convenient, but incurs big performance penalty - Vector parts = new Vector(); + Vector parts = new Vector<>(); int start = 0; int end; while ((end = sequence.indexOf(',', start)) >= 0) { @@ -833,14 +833,14 @@ public abstract class FontConfiguration { } protected String[] split(String sequence) { - Vector v = splitSequence(sequence); - return (String[])v.toArray(new String[0]); + Vector v = splitSequence(sequence); + return v.toArray(new String[0]); } //////////////////////////////////////////////////////////////////////// // Methods for extracting information from the fontconfig data for AWT// //////////////////////////////////////////////////////////////////////// - private Hashtable charsetRegistry = new Hashtable(5); + private Hashtable charsetRegistry = new Hashtable<>(5); /** * Returns FontDescriptors describing the physical fonts used for the @@ -932,9 +932,9 @@ public abstract class FontConfiguration { Charset fc = null; if (charsetName.equals("default")) { - fc = (Charset) charsetRegistry.get(fontName); + fc = charsetRegistry.get(fontName); } else { - fc = (Charset) charsetRegistry.get(charsetName); + fc = charsetRegistry.get(charsetName); } if (fc != null) { return fc.newEncoder(); @@ -943,8 +943,8 @@ public abstract class FontConfiguration { if (!charsetName.startsWith("sun.awt.") && !charsetName.equals("default")) { fc = Charset.forName(charsetName); } else { - Class fcc = (Class) AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + Class fcc = AccessController.doPrivileged(new PrivilegedAction>() { + public Class run() { try { return Class.forName(charsetName, true, ClassLoader.getSystemClassLoader()); @@ -1377,9 +1377,9 @@ public abstract class FontConfiguration { //This method will only be called during build time, do we //need do PrivilegedAction? - String osName = (String)java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public Object run() { + String osName = java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public String run() { return System.getProperty("os.name"); } }); @@ -2139,7 +2139,7 @@ public abstract class FontConfiguration { boolean has1252 = false; //get the scriptID list - String[] ss = (String[])splitSequence(value).toArray(EMPTY_STRING_ARRAY); + String[] ss = splitSequence(value).toArray(EMPTY_STRING_ARRAY); short [] sa = new short[ss.length]; for (int i = 0; i < ss.length; i++) { if ("alphabetic/default".equals(ss[i])) { diff --git a/jdk/src/share/classes/sun/awt/HToolkit.java b/jdk/src/share/classes/sun/awt/HToolkit.java index fdce8ccdcfc..81edd5ef641 100644 --- a/jdk/src/share/classes/sun/awt/HToolkit.java +++ b/jdk/src/share/classes/sun/awt/HToolkit.java @@ -214,7 +214,8 @@ public class HToolkit extends SunToolkit throw new HeadlessException(); } - public Map mapInputMethodHighlight(InputMethodHighlight highlight) + public Map mapInputMethodHighlight( + InputMethodHighlight highlight) throws HeadlessException { throw new HeadlessException(); } diff --git a/jdk/src/share/classes/sun/awt/HeadlessToolkit.java b/jdk/src/share/classes/sun/awt/HeadlessToolkit.java index 9d68bd48b1e..08890486486 100644 --- a/jdk/src/share/classes/sun/awt/HeadlessToolkit.java +++ b/jdk/src/share/classes/sun/awt/HeadlessToolkit.java @@ -29,6 +29,7 @@ import java.awt.*; import java.awt.dnd.*; import java.awt.dnd.peer.DragSourceContextPeer; import java.awt.event.*; +import java.awt.font.TextAttribute; import java.awt.im.InputMethodHighlight; import java.awt.image.*; import java.awt.datatransfer.Clipboard; @@ -224,7 +225,7 @@ public class HeadlessToolkit extends Toolkit throw new HeadlessException(); } - public Map mapInputMethodHighlight(InputMethodHighlight highlight) + public Map mapInputMethodHighlight(InputMethodHighlight highlight) throws HeadlessException { throw new HeadlessException(); } diff --git a/jdk/src/share/classes/sun/awt/PlatformFont.java b/jdk/src/share/classes/sun/awt/PlatformFont.java index f88b192715f..02596457d6f 100644 --- a/jdk/src/share/classes/sun/awt/PlatformFont.java +++ b/jdk/src/share/classes/sun/awt/PlatformFont.java @@ -143,7 +143,7 @@ public abstract class PlatformFont implements FontPeer { if (len < 1) { return new CharsetString[0]; } - Vector mcs = null; + Vector mcs = null; char[] tmpStr = new char[len]; char tmpChar = defaultChar; boolean encoded = false; @@ -198,7 +198,7 @@ public abstract class PlatformFont implements FontPeer { } if (currentFont != fd){ if (mcs == null) { - mcs = new Vector(3); + mcs = new Vector<>(3); } mcs.addElement(new CharsetString(tmpStr, lastIndex, i-lastIndex, currentFont)); @@ -209,16 +209,13 @@ public abstract class PlatformFont implements FontPeer { } CharsetString[] result; CharsetString cs = new CharsetString(tmpStr, lastIndex, - len-lastIndex, currentFont); + len-lastIndex, currentFont); if (mcs == null) { result = new CharsetString[1]; result[0] = cs; } else { mcs.addElement(cs); - result = new CharsetString[mcs.size()]; - for (int i = 0; i < mcs.size(); i++){ - result[i] = (CharsetString)mcs.elementAt(i); - } + result = mcs.toArray(new CharsetString[mcs.size()]); } return result; } diff --git a/jdk/src/share/classes/sun/awt/SunToolkit.java b/jdk/src/share/classes/sun/awt/SunToolkit.java index 1cb15b78a01..6739a603c5d 100644 --- a/jdk/src/share/classes/sun/awt/SunToolkit.java +++ b/jdk/src/share/classes/sun/awt/SunToolkit.java @@ -1915,6 +1915,7 @@ public abstract class SunToolkit extends Toolkit public synchronized void setWindowDeactivationTime(Window w, long time) { AppContext ctx = getAppContext(w); + @SuppressWarnings("unchecked") WeakHashMap map = (WeakHashMap)ctx.get(DEACTIVATION_TIMES_MAP_KEY); if (map == null) { map = new WeakHashMap(); @@ -1925,6 +1926,7 @@ public abstract class SunToolkit extends Toolkit public synchronized long getWindowDeactivationTime(Window w) { AppContext ctx = getAppContext(w); + @SuppressWarnings("unchecked") WeakHashMap map = (WeakHashMap)ctx.get(DEACTIVATION_TIMES_MAP_KEY); if (map == null) { return -1; diff --git a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java index d9c8334df8a..367d90e0b90 100644 --- a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java +++ b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java @@ -324,7 +324,7 @@ public abstract class DataTransferer { return false; } - Class rep_class = flavor.getRepresentationClass(); + Class rep_class = flavor.getRepresentationClass(); if (flavor.isRepresentationClassReader() || String.class.equals(rep_class) || @@ -696,7 +696,7 @@ public abstract class DataTransferer { * DataFlavors and data formats * @throws NullPointerException if formats or map is null */ - public Set getFlavorsForFormatsAsSet(long[] formats, FlavorTable map) { + public Set getFlavorsForFormatsAsSet(long[] formats, FlavorTable map) { Set flavorSet = new HashSet<>(formats.length); for (long format : formats) { @@ -1085,7 +1085,7 @@ search: throw new IOException("data translation failed"); } - final List list = (List)obj; + final List list = (List)obj; final ProtectionDomain userProtectionDomain = getUserProtectionDomain(contents); @@ -1113,7 +1113,7 @@ search: if (targetCharset == null) { targetCharset = "UTF-8"; } - final List list = (List)obj; + final List list = (List)obj; final ProtectionDomain userProtectionDomain = getUserProtectionDomain(contents); final ArrayList fileList = castToFiles(list, userProtectionDomain); final ArrayList uriList = new ArrayList<>(fileList.size()); @@ -1258,7 +1258,7 @@ search: return true; } - private ArrayList castToFiles(final List files, + private ArrayList castToFiles(final List files, final ProtectionDomain userProtectionDomain) throws IOException { try { return AccessController.doPrivileged((PrivilegedExceptionAction>) () -> { @@ -1636,7 +1636,7 @@ search: * instance of the Class as its sole parameter. */ private Object constructFlavoredObject(Object arg, DataFlavor flavor, - Class clazz) + Class clazz) throws IOException { final Class dfrc = flavor.getRepresentationClass(); @@ -1644,19 +1644,19 @@ search: if (clazz.equals(dfrc)) { return arg; // simple case } else { - Constructor[] constructors; + Constructor[] constructors; try { constructors = AccessController.doPrivileged( - (PrivilegedAction) dfrc::getConstructors); + (PrivilegedAction[]>) dfrc::getConstructors); } catch (SecurityException se) { throw new IOException(se.getMessage()); } - Constructor constructor = Stream.of(constructors) + Constructor constructor = Stream.of(constructors) .filter(c -> Modifier.isPublic(c.getModifiers())) .filter(c -> { - Class[] ptypes = c.getParameterTypes(); + Class[] ptypes = c.getParameterTypes(); return ptypes != null && ptypes.length == 1 && clazz.equals(ptypes[0]); @@ -1865,7 +1865,8 @@ search: byte[] bytes, String mimeType) throws IOException { - Iterator readerIterator = ImageIO.getImageReadersByMIMEType(mimeType); + Iterator readerIterator = + ImageIO.getImageReadersByMIMEType(mimeType); if (!readerIterator.hasNext()) { throw new IOException("No registered service provider can decode " + @@ -1875,7 +1876,7 @@ search: IOException ioe = null; while (readerIterator.hasNext()) { - ImageReader imageReader = (ImageReader)readerIterator.next(); + ImageReader imageReader = readerIterator.next(); try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes)) { try (ImageInputStream imageInputStream = ImageIO.createImageInputStream(bais)) { ImageReadParam param = imageReader.getDefaultReadParam(); @@ -1918,7 +1919,8 @@ search: throws IOException { IOException originalIOE = null; - Iterator writerIterator = ImageIO.getImageWritersByMIMEType(mimeType); + Iterator writerIterator = + ImageIO.getImageWritersByMIMEType(mimeType); if (!writerIterator.hasNext()) { throw new IOException("No registered service provider can encode " + @@ -1977,7 +1979,8 @@ search: String mimeType) throws IOException { - Iterator writerIterator = ImageIO.getImageWritersByMIMEType(mimeType); + Iterator writerIterator = + ImageIO.getImageWritersByMIMEType(mimeType); ImageTypeSpecifier typeSpecifier = new ImageTypeSpecifier(renderedImage); @@ -1986,7 +1989,7 @@ search: IOException ioe = null; while (writerIterator.hasNext()) { - ImageWriter imageWriter = (ImageWriter)writerIterator.next(); + ImageWriter imageWriter = writerIterator.next(); ImageWriterSpi writerSpi = imageWriter.getOriginatingProvider(); if (!writerSpi.canEncodeImage(typeSpecifier)) { @@ -2070,7 +2073,7 @@ search: public byte[] convertData(final Object source, final Transferable contents, final long format, - final Map formatMap, + final Map formatMap, final boolean isToolkitThread) throws IOException { @@ -2093,7 +2096,7 @@ search: } byte[] data = null; try { - DataFlavor flavor = (DataFlavor)formatMap.get(format); + DataFlavor flavor = formatMap.get(format); if (flavor != null) { data = translateTransferable(contents, flavor, format); } @@ -2134,7 +2137,7 @@ search: } finally { getToolkitThreadBlockedHandler().unlock(); } else { - DataFlavor flavor = (DataFlavor)formatMap.get(format); + DataFlavor flavor = formatMap.get(format); if (flavor != null) { ret = translateTransferable(contents, flavor, format); } @@ -2183,7 +2186,7 @@ search: * Helper function to convert a Set of DataFlavors to a sorted array. * The array will be sorted according to DataFlavorComparator. */ - public static DataFlavor[] setToSortedDataFlavorArray(Set flavorsSet) { + public static DataFlavor[] setToSortedDataFlavorArray(Set flavorsSet) { DataFlavor[] flavors = new DataFlavor[flavorsSet.size()]; flavorsSet.toArray(flavors); final Comparator comparator = @@ -2544,12 +2547,12 @@ search: String primaryType1 = flavor1.getPrimaryType(); String subType1 = flavor1.getSubType(); String mimeType1 = primaryType1 + "/" + subType1; - Class class1 = flavor1.getRepresentationClass(); + Class class1 = flavor1.getRepresentationClass(); String primaryType2 = flavor2.getPrimaryType(); String subType2 = flavor2.getSubType(); String mimeType2 = primaryType2 + "/" + subType2; - Class class2 = flavor2.getRepresentationClass(); + Class class2 = flavor2.getRepresentationClass(); if (flavor1.isFlavorTextType() && flavor2.isFlavorTextType()) { // First, compare MIME types diff --git a/jdk/src/share/classes/sun/awt/datatransfer/SunClipboard.java b/jdk/src/share/classes/sun/awt/datatransfer/SunClipboard.java index 77162cbadd3..258a298adbe 100644 --- a/jdk/src/share/classes/sun/awt/datatransfer/SunClipboard.java +++ b/jdk/src/share/classes/sun/awt/datatransfer/SunClipboard.java @@ -78,7 +78,7 @@ public abstract class SunClipboard extends Clipboard * this clipboard. It is used for tracking changes * of DataFlavors available on this clipboard. */ - private volatile Set currentDataFlavors; + private volatile Set currentDataFlavors; public SunClipboard(String name) { @@ -338,7 +338,7 @@ public abstract class SunClipboard extends Clipboard protected abstract byte[] getClipboardData(long format) throws IOException; - private static Set formatArrayAsDataFlavorSet(long[] formats) { + private static Set formatArrayAsDataFlavorSet(long[] formats) { return (formats == null) ? null : DataTransferer.getInstance(). getFlavorsForFormatsAsSet(formats, getDefaultFlavorTable()); @@ -417,7 +417,7 @@ public abstract class SunClipboard extends Clipboard * this clipboard */ public void checkChange(long[] formats) { - Set prevDataFlavors = currentDataFlavors; + Set prevDataFlavors = currentDataFlavors; currentDataFlavors = formatArrayAsDataFlavorSet(formats); if (Objects.equals(prevDataFlavors, currentDataFlavors)) { diff --git a/jdk/src/share/classes/sun/awt/datatransfer/TransferableProxy.java b/jdk/src/share/classes/sun/awt/datatransfer/TransferableProxy.java index ac79ecf7127..39ba273ec54 100644 --- a/jdk/src/share/classes/sun/awt/datatransfer/TransferableProxy.java +++ b/jdk/src/share/classes/sun/awt/datatransfer/TransferableProxy.java @@ -111,9 +111,9 @@ final class ClassLoaderObjectOutputStream extends ObjectOutputStream { } protected void annotateClass(final Class cl) throws IOException { - ClassLoader classLoader = - (ClassLoader)AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + ClassLoader classLoader = AccessController.doPrivileged( + new PrivilegedAction() { + public ClassLoader run() { return cl.getClassLoader(); } }); @@ -124,14 +124,14 @@ final class ClassLoaderObjectOutputStream extends ObjectOutputStream { map.put(s, classLoader); } protected void annotateProxyClass(final Class cl) throws IOException { - ClassLoader classLoader = - (ClassLoader)AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + ClassLoader classLoader = AccessController.doPrivileged( + new PrivilegedAction() { + public ClassLoader run() { return cl.getClassLoader(); } }); - Class[] interfaces = cl.getInterfaces(); + Class[] interfaces = cl.getInterfaces(); Set s = new HashSet(interfaces.length); for (int i = 0; i < interfaces.length; i++) { s.add(interfaces[i].getName()); @@ -141,7 +141,7 @@ final class ClassLoaderObjectOutputStream extends ObjectOutputStream { } Map, ClassLoader> getClassLoaderMap() { - return new HashMap(map); + return new HashMap<>(map); } } @@ -191,9 +191,9 @@ final class ClassLoaderObjectInputStream extends ObjectInputStream { boolean hasNonPublicInterface = false; // define proxy in class loader of non-public interface(s), if any - Class[] classObjs = new Class[interfaces.length]; + Class[] classObjs = new Class[interfaces.length]; for (int i = 0; i < interfaces.length; i++) { - Class cl = Class.forName(interfaces[i], false, classLoader); + Class cl = Class.forName(interfaces[i], false, classLoader); if ((cl.getModifiers() & Modifier.PUBLIC) == 0) { if (hasNonPublicInterface) { if (nonPublicLoader != cl.getClassLoader()) { diff --git a/jdk/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java b/jdk/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java index ae0a642dcb2..8baa689296f 100644 --- a/jdk/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java +++ b/jdk/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java @@ -146,7 +146,7 @@ public abstract class SunDragSourceContextPeer implements DragSourceContextPeer } protected abstract void startDrag(Transferable trans, - long[] formats, Map formatMap); + long[] formats, Map formatMap); /** * set cursor diff --git a/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java b/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java index 842b387f6f4..a880f1235f6 100644 --- a/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java +++ b/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java @@ -252,11 +252,11 @@ public abstract class SunDropTargetContextPeer implements DropTargetContextPeer, throw new InvalidDnDOperationException("No drop current"); } - Map flavorMap = DataTransferer.getInstance().getFlavorsForFormats - (currentT, DataTransferer.adaptFlavorMap + Map flavorMap = DataTransferer.getInstance() + .getFlavorsForFormats(currentT, DataTransferer.adaptFlavorMap (currentDT.getFlavorMap())); - lFormat = (Long)flavorMap.get(df); + lFormat = flavorMap.get(df); if (lFormat == null) { throw new UnsupportedFlavorException(df); } @@ -745,7 +745,7 @@ public abstract class SunDropTargetContextPeer implements DropTargetContextPeer, // dispatcher state fields private int returnValue = 0; // set of events to be dispatched by this dispatcher - private final HashSet eventSet = new HashSet(3); + private final HashSet eventSet = new HashSet<>(3); static final ToolkitThreadBlockedHandler handler = DataTransferer.getInstance().getToolkitThreadBlockedHandler(); diff --git a/jdk/src/share/classes/sun/awt/geom/AreaOp.java b/jdk/src/share/classes/sun/awt/geom/AreaOp.java index dd9e957cc28..bdbf2cb2b7e 100644 --- a/jdk/src/share/classes/sun/awt/geom/AreaOp.java +++ b/jdk/src/share/classes/sun/awt/geom/AreaOp.java @@ -152,36 +152,36 @@ public abstract class AreaOp { public abstract int getState(); - public Vector calculate(Vector left, Vector right) { - Vector edges = new Vector(); + public Vector calculate(Vector left, Vector right) { + Vector edges = new Vector<>(); addEdges(edges, left, AreaOp.CTAG_LEFT); addEdges(edges, right, AreaOp.CTAG_RIGHT); - edges = pruneEdges(edges); + Vector curves = pruneEdges(edges); if (false) { System.out.println("result: "); - int numcurves = edges.size(); - Curve[] curvelist = (Curve[]) edges.toArray(new Curve[numcurves]); + int numcurves = curves.size(); + Curve[] curvelist = curves.toArray(new Curve[numcurves]); for (int i = 0; i < numcurves; i++) { System.out.println("curvelist["+i+"] = "+curvelist[i]); } } - return edges; + return curves; } - private static void addEdges(Vector edges, Vector curves, int curvetag) { - Enumeration enum_ = curves.elements(); + private static void addEdges(Vector edges, Vector curves, int curvetag) { + Enumeration enum_ = curves.elements(); while (enum_.hasMoreElements()) { - Curve c = (Curve) enum_.nextElement(); + Curve c = enum_.nextElement(); if (c.getOrder() > 0) { edges.add(new Edge(c, curvetag)); } } } - private static Comparator YXTopComparator = new Comparator() { - public int compare(Object o1, Object o2) { - Curve c1 = ((Edge) o1).getCurve(); - Curve c2 = ((Edge) o2).getCurve(); + private static Comparator YXTopComparator = new Comparator() { + public int compare(Edge o1, Edge o2) { + Curve c1 = o1.getCurve(); + Curve c2 = o2.getCurve(); double v1, v2; if ((v1 = c1.getYTop()) == (v2 = c2.getYTop())) { if ((v1 = c1.getXTop()) == (v2 = c2.getXTop())) { @@ -195,12 +195,13 @@ public abstract class AreaOp { } }; - private Vector pruneEdges(Vector edges) { + private Vector pruneEdges(Vector edges) { int numedges = edges.size(); if (numedges < 2) { - return edges; + // empty vector is expected with less than 2 edges + return new Vector<>(); } - Edge[] edgelist = (Edge[]) edges.toArray(new Edge[numedges]); + Edge[] edgelist = edges.toArray(new Edge[numedges]); Arrays.sort(edgelist, YXTopComparator); if (false) { System.out.println("pruning: "); @@ -214,9 +215,9 @@ public abstract class AreaOp { int cur = 0; int next = 0; double yrange[] = new double[2]; - Vector subcurves = new Vector(); - Vector chains = new Vector(); - Vector links = new Vector(); + Vector subcurves = new Vector<>(); + Vector chains = new Vector<>(); + Vector links = new Vector<>(); // Active edges are between left (inclusive) and right (exclusive) while (left < numedges) { double y = yrange[0]; @@ -385,7 +386,7 @@ public abstract class AreaOp { if (false) { System.out.println("new links:"); for (int i = 0; i < links.size(); i++) { - CurveLink link = (CurveLink) links.elementAt(i); + CurveLink link = links.elementAt(i); System.out.println(" "+link.getSubCurve()); } } @@ -396,10 +397,10 @@ public abstract class AreaOp { yrange[0] = yend; } finalizeSubCurves(subcurves, chains); - Vector ret = new Vector(); - Enumeration enum_ = subcurves.elements(); + Vector ret = new Vector<>(); + Enumeration enum_ = subcurves.elements(); while (enum_.hasMoreElements()) { - CurveLink link = (CurveLink) enum_.nextElement(); + CurveLink link = enum_.nextElement(); ret.add(link.getMoveto()); CurveLink nextlink = link; while ((nextlink = nextlink.getNext()) != null) { @@ -413,7 +414,8 @@ public abstract class AreaOp { return ret; } - public static void finalizeSubCurves(Vector subcurves, Vector chains) { + public static void finalizeSubCurves(Vector subcurves, + Vector chains) { int numchains = chains.size(); if (numchains == 0) { return; @@ -437,9 +439,9 @@ public abstract class AreaOp { private static CurveLink[] EmptyLinkList = new CurveLink[2]; private static ChainEnd[] EmptyChainList = new ChainEnd[2]; - public static void resolveLinks(Vector subcurves, - Vector chains, - Vector links) + public static void resolveLinks(Vector subcurves, + Vector chains, + Vector links) { int numlinks = links.size(); CurveLink[] linklist; diff --git a/jdk/src/share/classes/sun/awt/geom/Crossings.java b/jdk/src/share/classes/sun/awt/geom/Crossings.java index 7ab97bce80c..76a29a15d45 100644 --- a/jdk/src/share/classes/sun/awt/geom/Crossings.java +++ b/jdk/src/share/classes/sun/awt/geom/Crossings.java @@ -77,14 +77,14 @@ public abstract class Crossings { public abstract boolean covers(double ystart, double yend); - public static Crossings findCrossings(Vector curves, + public static Crossings findCrossings(Vector curves, double xlo, double ylo, double xhi, double yhi) { Crossings cross = new EvenOdd(xlo, ylo, xhi, yhi); - Enumeration enum_ = curves.elements(); + Enumeration enum_ = curves.elements(); while (enum_.hasMoreElements()) { - Curve c = (Curve) enum_.nextElement(); + Curve c = enum_.nextElement(); if (c.accumulateCrossings(cross)) { return null; } @@ -237,7 +237,7 @@ public abstract class Crossings { return false; } - private Vector tmp = new Vector(); + private Vector tmp = new Vector<>(); public boolean accumulateQuad(double x0, double y0, double coords[]) { if (y0 < ylo && coords[1] < ylo && coords[3] < ylo) { @@ -258,9 +258,9 @@ public abstract class Crossings { return false; } Curve.insertQuad(tmp, x0, y0, coords); - Enumeration enum_ = tmp.elements(); + Enumeration enum_ = tmp.elements(); while (enum_.hasMoreElements()) { - Curve c = (Curve) enum_.nextElement(); + Curve c = enum_.nextElement(); if (c.accumulateCrossings(this)) { return true; } @@ -296,9 +296,9 @@ public abstract class Crossings { return false; } Curve.insertCubic(tmp, x0, y0, coords); - Enumeration enum_ = tmp.elements(); + Enumeration enum_ = tmp.elements(); while (enum_.hasMoreElements()) { - Curve c = (Curve) enum_.nextElement(); + Curve c = enum_.nextElement(); if (c.accumulateCrossings(this)) { return true; } diff --git a/jdk/src/share/classes/sun/awt/geom/Curve.java b/jdk/src/share/classes/sun/awt/geom/Curve.java index 871be17f4c8..bc478da02b3 100644 --- a/jdk/src/share/classes/sun/awt/geom/Curve.java +++ b/jdk/src/share/classes/sun/awt/geom/Curve.java @@ -38,11 +38,11 @@ public abstract class Curve { protected int direction; - public static void insertMove(Vector curves, double x, double y) { + public static void insertMove(Vector curves, double x, double y) { curves.add(new Order0(x, y)); } - public static void insertLine(Vector curves, + public static void insertLine(Vector curves, double x0, double y0, double x1, double y1) { @@ -59,7 +59,7 @@ public abstract class Curve { } } - public static void insertQuad(Vector curves, + public static void insertQuad(Vector curves, double x0, double y0, double coords[]) { @@ -82,7 +82,7 @@ public abstract class Curve { } } - public static void insertCubic(Vector curves, + public static void insertCubic(Vector curves, double x0, double y0, double coords[]) { diff --git a/jdk/src/share/classes/sun/awt/geom/Order2.java b/jdk/src/share/classes/sun/awt/geom/Order2.java index 69218f5a95e..64d37c88e27 100644 --- a/jdk/src/share/classes/sun/awt/geom/Order2.java +++ b/jdk/src/share/classes/sun/awt/geom/Order2.java @@ -47,7 +47,7 @@ final class Order2 extends Curve { private double ycoeff1; private double ycoeff2; - public static void insert(Vector curves, double tmp[], + public static void insert(Vector curves, double tmp[], double x0, double y0, double cx0, double cy0, double x1, double y1, @@ -74,7 +74,7 @@ final class Order2 extends Curve { tmp[i1 + 4], tmp[i1 + 5], direction); } - public static void addInstance(Vector curves, + public static void addInstance(Vector curves, double x0, double y0, double cx0, double cy0, double x1, double y1, diff --git a/jdk/src/share/classes/sun/awt/geom/Order3.java b/jdk/src/share/classes/sun/awt/geom/Order3.java index ad49c676db3..9c9e5962aea 100644 --- a/jdk/src/share/classes/sun/awt/geom/Order3.java +++ b/jdk/src/share/classes/sun/awt/geom/Order3.java @@ -53,7 +53,7 @@ final class Order3 extends Curve { private double ycoeff2; private double ycoeff3; - public static void insert(Vector curves, double tmp[], + public static void insert(Vector curves, double tmp[], double x0, double y0, double cx0, double cy0, double cx1, double cy1, @@ -105,7 +105,7 @@ final class Order3 extends Curve { } } - public static void addInstance(Vector curves, + public static void addInstance(Vector curves, double x0, double y0, double cx0, double cy0, double cx1, double cy1, diff --git a/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java b/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java index efc4bc97ec4..ac26802b027 100644 --- a/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java +++ b/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java @@ -51,7 +51,7 @@ public class BufImgSurfaceData extends SurfaceData { private BufferedImageGraphicsConfig graphicsConfig; RenderLoops solidloops; - private static native void initIDs(Class ICM, Class ICMColorData); + private static native void initIDs(Class ICM, Class ICMColorData); private static final int DCM_RGBX_RED_MASK = 0xff000000; private static final int DCM_RGBX_GREEN_MASK = 0x00ff0000; diff --git a/jdk/src/share/classes/sun/awt/image/GifImageDecoder.java b/jdk/src/share/classes/sun/awt/image/GifImageDecoder.java index bd8efa8d1a3..33640165fb2 100644 --- a/jdk/src/share/classes/sun/awt/image/GifImageDecoder.java +++ b/jdk/src/share/classes/sun/awt/image/GifImageDecoder.java @@ -61,7 +61,7 @@ public class GifImageDecoder extends ImageDecoder { int trans_pixel = -1; IndexColorModel global_model; - Hashtable props = new Hashtable(); + Hashtable props = new Hashtable<>(); byte[] saved_image; IndexColorModel saved_model; diff --git a/jdk/src/share/classes/sun/awt/image/ImageDecoder.java b/jdk/src/share/classes/sun/awt/image/ImageDecoder.java index 643ec638f11..7f4bbd85efa 100644 --- a/jdk/src/share/classes/sun/awt/image/ImageDecoder.java +++ b/jdk/src/share/classes/sun/awt/image/ImageDecoder.java @@ -83,7 +83,7 @@ public abstract class ImageDecoder { return count; } - protected int setProperties(Hashtable props) { + protected int setProperties(Hashtable props) { ImageConsumerQueue cq = null; int count = 0; while ((cq = nextConsumer(cq)) != null) { @@ -164,7 +164,7 @@ public abstract class ImageDecoder { source.doneDecoding(this); close(); java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { + new java.security.PrivilegedAction() { public Object run() { feeder.interrupt(); return null; diff --git a/jdk/src/share/classes/sun/awt/image/ImageFetcher.java b/jdk/src/share/classes/sun/awt/image/ImageFetcher.java index a5af63512c7..eaccf335db0 100644 --- a/jdk/src/share/classes/sun/awt/image/ImageFetcher.java +++ b/jdk/src/share/classes/sun/awt/image/ImageFetcher.java @@ -152,7 +152,7 @@ class ImageFetcher extends Thread { info.numWaiting--; } } - src = (ImageFetchable) info.waitList.elementAt(0); + src = info.waitList.elementAt(0); info.waitList.removeElement(src); } return src; @@ -303,26 +303,25 @@ class ImageFetcher extends Thread { final ThreadGroup fetcherGroup = fetcherThreadGroup; java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public Object run() { - for (int i = 0; i < info.fetchers.length; i++) { - if (info.fetchers[i] == null) { - ImageFetcher f = new ImageFetcher( - fetcherGroup, i); - try { - f.start(); - info.fetchers[i] = f; - info.numFetchers++; - break; - } catch (Error e) { + new java.security.PrivilegedAction() { + public Object run() { + for (int i = 0; i < info.fetchers.length; i++) { + if (info.fetchers[i] == null) { + ImageFetcher f = new ImageFetcher(fetcherGroup, i); + try { + f.start(); + info.fetchers[i] = f; + info.numFetchers++; + break; + } catch (Error e) { + } } + } + return null; } - } - return null; - } - }); - return; - } + }); + return; + } } @@ -337,13 +336,13 @@ class FetcherInfo { Thread[] fetchers; int numFetchers; int numWaiting; - Vector waitList; + Vector waitList; private FetcherInfo() { fetchers = new Thread[MAX_NUM_FETCHERS_PER_APPCONTEXT]; numFetchers = 0; numWaiting = 0; - waitList = new Vector(); + waitList = new Vector<>(); } /* The key to put()/get() the FetcherInfo into/from the AppContext. */ diff --git a/jdk/src/share/classes/sun/awt/image/ImageRepresentation.java b/jdk/src/share/classes/sun/awt/image/ImageRepresentation.java index 77ee7339a59..90bb2ac6388 100644 --- a/jdk/src/share/classes/sun/awt/image/ImageRepresentation.java +++ b/jdk/src/share/classes/sun/awt/image/ImageRepresentation.java @@ -185,7 +185,7 @@ public class ImageRepresentation extends ImageWatched implements ImageConsumer protected BufferedImage createImage(ColorModel cm, WritableRaster raster, boolean isRasterPremultiplied, - Hashtable properties) + Hashtable properties) { BufferedImage bi = new BufferedImage(cm, raster, isRasterPremultiplied, null); diff --git a/jdk/src/share/classes/sun/awt/image/ImagingLib.java b/jdk/src/share/classes/sun/awt/image/ImagingLib.java index 90ad81836c8..683b8fe7e75 100644 --- a/jdk/src/share/classes/sun/awt/image/ImagingLib.java +++ b/jdk/src/share/classes/sun/awt/image/ImagingLib.java @@ -61,7 +61,7 @@ public class ImagingLib { private static final int AFFINE_OP = 1; private static final int CONVOLVE_OP = 2; - private static Class[] nativeOpClass = new Class[NUM_NATIVE_OPS]; + private static Class[] nativeOpClass = new Class[NUM_NATIVE_OPS]; /** * Returned value indicates whether the library initailization was @@ -134,7 +134,7 @@ public class ImagingLib { } - private static int getNativeOpIndex(Class opClass) { + private static int getNativeOpIndex(Class opClass) { // // Search for this class in cached list of // classes supplying native acceleration diff --git a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java index 872ffc01974..70dacb195c3 100644 --- a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java +++ b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java @@ -47,8 +47,8 @@ public class JPEGImageDecoder extends ImageDecoder { private static ColorModel ARGBcolormodel; private static ColorModel Graycolormodel; - private static final Class InputStreamClass = InputStream.class; - private static native void initIDs(Class InputStreamClass); + private static final Class InputStreamClass = InputStream.class; + private static native void initIDs(Class InputStreamClass); private ColorModel colormodel; @@ -73,7 +73,7 @@ public class JPEGImageDecoder extends ImageDecoder { private native void readImage(InputStream is, byte buf[]) throws ImageFormatException, IOException; - Hashtable props = new Hashtable(); + Hashtable props = new Hashtable<>(); public JPEGImageDecoder(InputStreamImageSource src, InputStream is) { super(src, is); diff --git a/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java b/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java index c1b0453a65b..3dcdde01574 100644 --- a/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java +++ b/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java @@ -40,15 +40,15 @@ public class OffScreenImageSource implements ImageProducer { BufferedImage image; int width; int height; - Hashtable properties; + Hashtable properties; public OffScreenImageSource(BufferedImage image, - Hashtable properties) { + Hashtable properties) { this.image = image; if (properties != null) { this.properties = properties; } else { - this.properties = new Hashtable(); + this.properties = new Hashtable(); } width = image.getWidth(); height = image.getHeight(); diff --git a/jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java b/jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java index adbdb766da1..7f78de6e982 100644 --- a/jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java +++ b/jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java @@ -68,7 +68,7 @@ public class PNGImageDecoder extends ImageDecoder private int filterMethod; private int interlaceMethod; private int gamma = 100000; - private java.util.Hashtable properties; + private java.util.Hashtable properties; /* this is not needed ImageConsumer target; */ @@ -83,7 +83,7 @@ public class PNGImageDecoder extends ImageDecoder private void property(String key,Object value) { if(value==null) return; - if(properties==null) properties=new java.util.Hashtable(); + if(properties==null) properties=new java.util.Hashtable<>(); properties.put(key,value); } private void property(String key,float value) { diff --git a/jdk/src/share/classes/sun/awt/image/ToolkitImage.java b/jdk/src/share/classes/sun/awt/image/ToolkitImage.java index 885648d2265..b1f5873f106 100644 --- a/jdk/src/share/classes/sun/awt/image/ToolkitImage.java +++ b/jdk/src/share/classes/sun/awt/image/ToolkitImage.java @@ -79,7 +79,7 @@ public class ToolkitImage extends Image { private int width = -1; private int height = -1; - private Hashtable properties; + private Hashtable properties; private int availinfo; @@ -254,9 +254,9 @@ public class ToolkitImage extends Image { addInfo(ImageObserver.WIDTH | ImageObserver.HEIGHT); } - void setProperties(Hashtable props) { + void setProperties(Hashtable props) { if (props == null) { - props = new Hashtable(); + props = new Hashtable(); } properties = props; addInfo(ImageObserver.PROPERTIES); diff --git a/jdk/src/share/classes/sun/awt/shell/ShellFolder.java b/jdk/src/share/classes/sun/awt/shell/ShellFolder.java index e8a9407276d..3795e146f2a 100644 --- a/jdk/src/share/classes/sun/awt/shell/ShellFolder.java +++ b/jdk/src/share/classes/sun/awt/shell/ShellFolder.java @@ -127,14 +127,14 @@ public abstract class ShellFolder extends File { File[] files = super.listFiles(); if (!includeHiddenFiles) { - Vector v = new Vector(); + Vector v = new Vector<>(); int nameCount = (files == null) ? 0 : files.length; for (int i = 0; i < nameCount; i++) { if (!files[i].isHidden()) { v.addElement(files[i]); } } - files = (File[])v.toArray(new File[v.size()]); + files = v.toArray(new File[v.size()]); } return files; @@ -208,7 +208,7 @@ public abstract class ShellFolder extends File { static { String managerClassName = (String)Toolkit.getDefaultToolkit(). getDesktopProperty("Shell.shellFolderManager"); - Class managerClass = null; + Class managerClass = null; try { managerClass = ReflectUtil.forName(managerClassName); // swallow the exceptions below and use default shell folder @@ -554,7 +554,7 @@ public abstract class ShellFolder extends File { /** * Provides a default comparator for the default column set */ - private static final Comparator DEFAULT_COMPARATOR = new Comparator() { + private static final Comparator DEFAULT_COMPARATOR = new Comparator() { public int compare(Object o1, Object o2) { int gt; @@ -565,7 +565,9 @@ public abstract class ShellFolder extends File { } else if (o1 == null && o2 != null) { gt = -1; } else if (o1 instanceof Comparable) { - gt = ((Comparable) o1).compareTo(o2); + @SuppressWarnings("unchecked") + Comparable o = (Comparable) o1; + gt = o.compareTo(o2); } else { gt = 0; } diff --git a/jdk/src/share/classes/sun/awt/shell/ShellFolderColumnInfo.java b/jdk/src/share/classes/sun/awt/shell/ShellFolderColumnInfo.java index 3836b04eb32..88dffacec2b 100644 --- a/jdk/src/share/classes/sun/awt/shell/ShellFolderColumnInfo.java +++ b/jdk/src/share/classes/sun/awt/shell/ShellFolderColumnInfo.java @@ -38,7 +38,7 @@ public class ShellFolderColumnInfo { */ private Integer alignment; private SortOrder sortOrder; - private Comparator comparator; + private Comparator comparator; /** * false (default) if the {@link comparator} expects folders as arguments, * and true if folder's column values. The first option is used default for comparison @@ -49,7 +49,7 @@ public class ShellFolderColumnInfo { public ShellFolderColumnInfo(String title, Integer width, Integer alignment, boolean visible, - SortOrder sortOrder, Comparator comparator, + SortOrder sortOrder, Comparator comparator, boolean compareByColumn) { this.title = title; this.width = width; @@ -62,7 +62,7 @@ public class ShellFolderColumnInfo { public ShellFolderColumnInfo(String title, Integer width, Integer alignment, boolean visible, - SortOrder sortOrder, Comparator comparator) { + SortOrder sortOrder, Comparator comparator) { this(title, width, alignment, visible, sortOrder, comparator, false); } @@ -115,11 +115,11 @@ public class ShellFolderColumnInfo { this.sortOrder = sortOrder; } - public Comparator getComparator() { + public Comparator getComparator() { return comparator; } - public void setComparator(Comparator comparator) { + public void setComparator(Comparator comparator) { this.comparator = comparator; } diff --git a/jdk/src/share/classes/sun/awt/util/IdentityArrayList.java b/jdk/src/share/classes/sun/awt/util/IdentityArrayList.java index bf66f427d72..c88452289cb 100644 --- a/jdk/src/share/classes/sun/awt/util/IdentityArrayList.java +++ b/jdk/src/share/classes/sun/awt/util/IdentityArrayList.java @@ -285,6 +285,7 @@ public class IdentityArrayList extends AbstractList * this list * @throws NullPointerException if the specified array is null */ + @SuppressWarnings("unchecked") public T[] toArray(T[] a) { if (a.length < size) // Make a new array of a's runtime type, but my contents: @@ -307,7 +308,9 @@ public class IdentityArrayList extends AbstractList public E get(int index) { rangeCheck(index); - return (E) elementData[index]; + @SuppressWarnings("unchecked") + E rv = (E) elementData[index]; + return rv; } /** @@ -322,6 +325,7 @@ public class IdentityArrayList extends AbstractList public E set(int index, E element) { rangeCheck(index); + @SuppressWarnings("unchecked") E oldValue = (E) elementData[index]; elementData[index] = element; return oldValue; @@ -371,6 +375,7 @@ public class IdentityArrayList extends AbstractList rangeCheck(index); modCount++; + @SuppressWarnings("unchecked") E oldValue = (E) elementData[index]; int numMoved = size - index - 1; diff --git a/jdk/src/share/classes/sun/awt/util/IdentityLinkedList.java b/jdk/src/share/classes/sun/awt/util/IdentityLinkedList.java index 77e0f0062aa..690264ab4d9 100644 --- a/jdk/src/share/classes/sun/awt/util/IdentityLinkedList.java +++ b/jdk/src/share/classes/sun/awt/util/IdentityLinkedList.java @@ -280,7 +280,9 @@ public class IdentityLinkedList Entry successor = (index==size ? header : entry(index)); Entry predecessor = successor.previous; for (int i=0; i e = new Entry((E)a[i], successor, predecessor); + @SuppressWarnings("unchecked") + E tmp = (E) a[i]; + Entry e = new Entry(tmp, successor, predecessor); predecessor.next = e; predecessor = e; } @@ -396,7 +398,7 @@ public class IdentityLinkedList */ public int indexOf(Object o) { int index = 0; - for (Entry e = header.next; e != header; e = e.next) { + for (Entry e = header.next; e != header; e = e.next) { if (o == e.element) { return index; } @@ -418,7 +420,7 @@ public class IdentityLinkedList */ public int lastIndexOf(Object o) { int index = size; - for (Entry e = header.previous; e != header; e = e.previous) { + for (Entry e = header.previous; e != header; e = e.previous) { index--; if (o == e.element) { return index; @@ -787,7 +789,7 @@ public class IdentityLinkedList } /** Adapter to provide descending iterators via ListItr.previous */ - private class DescendingIterator implements Iterator { + private class DescendingIterator implements Iterator { final ListItr itr = new ListItr(size()); public boolean hasNext() { return itr.hasPrevious(); @@ -860,6 +862,7 @@ public class IdentityLinkedList * this list * @throws NullPointerException if the specified array is null */ + @SuppressWarnings("unchecked") public T[] toArray(T[] a) { if (a.length < size) a = (T[])java.lang.reflect.Array.newInstance( diff --git a/jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java b/jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java index 334d1d1c036..fb8b050a7e8 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java +++ b/jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java @@ -207,8 +207,9 @@ public abstract class InfoWindow extends Window { textLabel.setText(tooltipString); } - Point pointer = (Point)AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + Point pointer = AccessController.doPrivileged( + new PrivilegedAction() { + public Point run() { if (!isPointerOverTrayIcon(liveArguments.getBounds())) { return null; } diff --git a/jdk/src/solaris/classes/sun/awt/X11/ListHelper.java b/jdk/src/solaris/classes/sun/awt/X11/ListHelper.java index 0a83eaaf829..caf1c2df5ae 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/ListHelper.java +++ b/jdk/src/solaris/classes/sun/awt/X11/ListHelper.java @@ -55,10 +55,10 @@ public class ListHelper implements XScrollbarClient { private final int SCROLLBAR_WIDTH; // Width of a scrollbar - private java.util.List items; // List of items + private java.util.List items; // List of items // TODO: maybe this would be better as a simple int[] - private java.util.List selected; // List of selected items + private java.util.List selected; // List of selected items private boolean multiSelect; // Can multiple items be selected // at once? private int focusedIndex; @@ -100,8 +100,8 @@ public class ListHelper implements XScrollbarClient { this.peer = peer; this.colors = colors; this.multiSelect = multiSelect; - items = new ArrayList(initialSize); - selected = new ArrayList(1); + items = new ArrayList<>(initialSize); + selected = new ArrayList<>(1); selected.add(Integer.valueOf(-1)); this.maxVisItems = maxVisItems; @@ -190,7 +190,7 @@ public class ListHelper implements XScrollbarClient { /* if called for multiselect, return -1 */ public int getSelectedIndex() { if (!multiSelect) { - Integer val = (Integer)selected.get(0); + Integer val = selected.get(0); return val.intValue(); } return -1; @@ -217,7 +217,7 @@ public class ListHelper implements XScrollbarClient { } public String getItem(int index) { - return (String) items.get(index); + return items.get(index); } /**********************************************************************/ @@ -576,9 +576,9 @@ public class ListHelper implements XScrollbarClient { } boolean isItemSelected(int index) { - Iterator itr = selected.iterator(); + Iterator itr = selected.iterator(); while (itr.hasNext()) { - Integer val = (Integer)itr.next(); + Integer val = itr.next(); if (val.intValue() == index) { return true; } diff --git a/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java b/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java index 35109ebac70..6acc9d683ea 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java +++ b/jdk/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java @@ -26,6 +26,7 @@ package sun.awt.X11; import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.DataFlavor; import java.awt.dnd.DnDConstants; import java.awt.dnd.InvalidDnDOperationException; @@ -65,7 +66,7 @@ class MotifDnDDragSourceProtocol extends XDragSourceProtocol } protected void initializeDragImpl(int actions, Transferable contents, - Map formatMap, long[] formats) + Map formatMap, long[] formats) throws InvalidDnDOperationException, IllegalArgumentException, XException { diff --git a/jdk/src/solaris/classes/sun/awt/X11/Native.java b/jdk/src/solaris/classes/sun/awt/X11/Native.java index 14628b833ec..f61654643f2 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/Native.java +++ b/jdk/src/solaris/classes/sun/awt/X11/Native.java @@ -43,13 +43,12 @@ class Native { static int dataModel; static { - String dataModelProp = (String)AccessController. - doPrivileged( - new PrivilegedAction() { - public Object run() { - return System.getProperty("sun.arch.data.model"); - } - }); + String dataModelProp = AccessController.doPrivileged( + new PrivilegedAction() { + public String run() { + return System.getProperty("sun.arch.data.model"); + } + }); try { dataModel = Integer.parseInt(dataModelProp); } catch (Exception e) { @@ -333,9 +332,9 @@ class Native { * Stores Java Vector of Longs into memory. Memory location is treated as array * of native longs */ - static void putLong(long ptr, Vector arr) { + static void putLong(long ptr, Vector arr) { for (int i = 0; i < arr.size(); i ++, ptr += getLongSize()) { - putLong(ptr, ((Long)arr.elementAt(i)).longValue()); + putLong(ptr, arr.elementAt(i).longValue()); } } @@ -343,9 +342,9 @@ class Native { * Stores Java Vector of Longs into memory. Memory location is treated as array * of native longs. Array is stored in reverse order */ - static void putLongReverse(long ptr, Vector arr) { + static void putLongReverse(long ptr, Vector arr) { for (int i = arr.size()-1; i >= 0; i--, ptr += getLongSize()) { - putLong(ptr, ((Long)arr.elementAt(i)).longValue()); + putLong(ptr, arr.elementAt(i).longValue()); } } /** diff --git a/jdk/src/solaris/classes/sun/awt/X11/XAWTXSettings.java b/jdk/src/solaris/classes/sun/awt/X11/XAWTXSettings.java index 48fcae52f0b..4c7b19c14cc 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XAWTXSettings.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XAWTXSettings.java @@ -98,7 +98,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { * should be "good enough" for most cases. */ - Map updatedSettings = null; + Map updatedSettings = null; XToolkit.awtLock(); try { long display = XToolkit.getDisplay(); @@ -112,7 +112,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { } private void updateXSettings(int screen, long owner) { - final Map updatedSettings = getUpdatedSettings(owner); + final Map updatedSettings = getUpdatedSettings(owner); // this method is called under awt lock and usually on toolkit thread // but parseXSettings() causes public code execution, so we need to transfer // this to EDT @@ -123,7 +123,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { }); } - private Map getUpdatedSettings(final long owner) { + private Map getUpdatedSettings(final long owner) { if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("owner =" + owner); } @@ -131,7 +131,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { return null; } - Map settings = null; + Map settings = null; try { WindowPropertyGetter getter = new WindowPropertyGetter(owner, xSettingsPropertyAtom, 0, MAX_LENGTH, diff --git a/jdk/src/solaris/classes/sun/awt/X11/XAtomList.java b/jdk/src/solaris/classes/sun/awt/X11/XAtomList.java index 7b53b6d2e95..a998850eb4c 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XAtomList.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XAtomList.java @@ -157,7 +157,7 @@ class XAtomList { public String toString() { StringBuffer buf = new StringBuffer(); buf.append("["); - Iterator iter = atoms.iterator(); + Iterator iter = atoms.iterator(); while (iter.hasNext()) { buf.append(iter.next().toString()); if (iter.hasNext()) { diff --git a/jdk/src/solaris/classes/sun/awt/X11/XAwtState.java b/jdk/src/solaris/classes/sun/awt/X11/XAwtState.java index 872f9ea851b..b0a8186c77a 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XAwtState.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XAwtState.java @@ -40,7 +40,7 @@ class XAwtState { * The mouse is over this component. * If the component is not disabled, it received MOUSE_ENTERED but no MOUSE_EXITED. */ - private static WeakReference componentMouseEnteredRef = null; + private static WeakReference componentMouseEnteredRef = null; static void setComponentMouseEntered(Component component) { XToolkit.awtLock(); @@ -50,7 +50,7 @@ class XAwtState { return; } if (component != getComponentMouseEntered()) { - componentMouseEnteredRef = new WeakReference(component); + componentMouseEnteredRef = new WeakReference<>(component); } } finally { XToolkit.awtUnlock(); @@ -63,7 +63,7 @@ class XAwtState { if (componentMouseEnteredRef == null) { return null; } - return (Component)componentMouseEnteredRef.get(); + return componentMouseEnteredRef.get(); } finally { XToolkit.awtUnlock(); } @@ -83,7 +83,7 @@ class XAwtState { return inManualGrab; } - private static WeakReference grabWindowRef = null; + private static WeakReference grabWindowRef = null; /** * The X Active Grab overrides any other active grab by the same @@ -112,7 +112,7 @@ class XAwtState { return; } if (grabWindow != getGrabWindow()) { - grabWindowRef = new WeakReference(grabWindow); + grabWindowRef = new WeakReference<>(grabWindow); } } finally { XToolkit.awtUnlock(); @@ -125,7 +125,7 @@ class XAwtState { if (grabWindowRef == null) { return null; } - XBaseWindow xbw = (XBaseWindow)grabWindowRef.get(); + XBaseWindow xbw = grabWindowRef.get(); if( xbw != null && xbw.isDisposed() ) { xbw = null; grabWindowRef = null; diff --git a/jdk/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java b/jdk/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java index 1d82f04a78c..53aae040883 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java @@ -231,7 +231,7 @@ abstract public class XBaseMenuWindow extends XWindow { */ void instantPreInit(XCreateWindowParams params) { super.instantPreInit(params); - items = new ArrayList(); + items = new ArrayList<>(); } /************************************************ @@ -367,10 +367,10 @@ abstract public class XBaseMenuWindow extends XWindow { * Clears items vector and loads specified vector * @param items vector to be loaded */ - public void reloadItems(Vector items) { + public void reloadItems(Vector items) { synchronized(getMenuTreeLock()) { this.items.clear(); - MenuItem[] itemArray = (MenuItem[])items.toArray(new MenuItem[] {}); + MenuItem[] itemArray = items.toArray(new MenuItem[] {}); int itemCnt = itemArray.length; for(int i = 0; i < itemCnt; i++) { addItem(itemArray[i]); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java index 6d3385cef46..6cc706278fc 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java @@ -236,8 +236,8 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget return false; } - private static Class seClass; - private static Constructor seCtor; + private static Class seClass; + private static Constructor seCtor; final static AWTEvent wrapInSequenced(AWTEvent event) { try { @@ -246,9 +246,11 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget } if (seCtor == null) { - seCtor = (Constructor) AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws Exception { - Constructor ctor = seClass.getConstructor(new Class[] { AWTEvent.class }); + seCtor = AccessController.doPrivileged(new + PrivilegedExceptionAction>() { + public Constructor run() throws Exception { + Constructor ctor = seClass.getConstructor( + new Class[] { AWTEvent.class }); ctor.setAccessible(true); return ctor; } @@ -1322,7 +1324,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget } } - private void addTree(Collection order, Set set, Container cont) { + private void addTree(Collection order, Set set, Container cont) { for (int i = 0; i < cont.getComponentCount(); i++) { Component comp = cont.getComponent(i); ComponentPeer peer = comp.getPeer(); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XCreateWindowParams.java b/jdk/src/solaris/classes/sun/awt/X11/XCreateWindowParams.java index 32d83f193ce..da263eb4890 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XCreateWindowParams.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XCreateWindowParams.java @@ -30,7 +30,7 @@ import java.util.Iterator; import java.util.Map; @SuppressWarnings("serial") // JDK-implementation class -public class XCreateWindowParams extends HashMap { +public class XCreateWindowParams extends HashMap { public XCreateWindowParams() { } public XCreateWindowParams(Object[] map) { @@ -82,9 +82,9 @@ public class XCreateWindowParams extends HashMap { } public String toString() { StringBuffer buf = new StringBuffer(); - Iterator eIter = entrySet().iterator(); + Iterator> eIter = entrySet().iterator(); while (eIter.hasNext()) { - Map.Entry entry = (Map.Entry)eIter.next(); + Map.Entry entry = eIter.next(); buf.append(entry.getKey() + ": " + entry.getValue() + "\n"); } return buf.toString(); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java b/jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java index fd9cbb8f13c..36204203c23 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XDataTransferer.java @@ -49,6 +49,7 @@ import java.util.LinkedHashSet; import java.util.List; import javax.imageio.ImageIO; +import javax.imageio.ImageReader; import javax.imageio.ImageTypeSpecifier; import javax.imageio.ImageWriter; import javax.imageio.spi.ImageWriterSpi; @@ -333,7 +334,7 @@ public class XDataTransferer extends DataTransferer { // flavors to enable dynamic text native-to-flavor mapping generation. // See SystemFlavorMap.getFlavorsForNative() for details. if ("image".equals(primaryType)) { - Iterator readers = ImageIO.getImageReadersByMIMEType(baseType); + Iterator readers = ImageIO.getImageReadersByMIMEType(baseType); if (readers.hasNext()) { flavors.add(DataFlavor.imageFlavor); } diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java b/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java index b1e6f2ad041..4648a836679 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java @@ -26,6 +26,7 @@ package sun.awt.X11; import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.DataFlavor; import java.awt.dnd.DnDConstants; import java.awt.dnd.InvalidDnDOperationException; @@ -70,7 +71,7 @@ class XDnDDragSourceProtocol extends XDragSourceProtocol { * @returns true if the initialized successfully. */ protected void initializeDragImpl(int actions, Transferable contents, - Map formatMap, long[] formats) + Map formatMap, long[] formats) throws InvalidDnDOperationException, IllegalArgumentException, XException { assert XToolkit.isAWTLockHeldByCurrentThread(); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDragAndDropProtocols.java b/jdk/src/solaris/classes/sun/awt/X11/XDragAndDropProtocols.java index b236881aec4..161fc285a02 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XDragAndDropProtocols.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XDragAndDropProtocols.java @@ -36,8 +36,8 @@ import java.util.List; * @since 1.5 */ final class XDragAndDropProtocols { - private final static List dragProtocols; - private final static List dropProtocols; + private final static List dragProtocols; + private final static List dropProtocols; public static final String XDnD = "XDnD"; public static final String MotifDnD = "MotifDnD"; @@ -50,7 +50,7 @@ final class XDragAndDropProtocols { XDropTargetProtocolListener dropTargetProtocolListener = XDropTargetContextPeer.getXDropTargetProtocolListener(); - List tDragSourceProtocols = new ArrayList(); + List tDragSourceProtocols = new ArrayList<>(); XDragSourceProtocol xdndDragSourceProtocol = XDnDDragSourceProtocol.createInstance(dragSourceProtocolListener); tDragSourceProtocols.add(xdndDragSourceProtocol); @@ -58,7 +58,7 @@ final class XDragAndDropProtocols { MotifDnDDragSourceProtocol.createInstance(dragSourceProtocolListener); tDragSourceProtocols.add(motifdndDragSourceProtocol); - List tDropTargetProtocols = new ArrayList(); + List tDropTargetProtocols = new ArrayList<>(); XDropTargetProtocol xdndDropTargetProtocol = XDnDDropTargetProtocol.createInstance(dropTargetProtocolListener); tDropTargetProtocols.add(xdndDropTargetProtocol); @@ -70,11 +70,11 @@ final class XDragAndDropProtocols { dropProtocols = Collections.unmodifiableList(tDropTargetProtocols); } - static Iterator getDragSourceProtocols() { + static Iterator getDragSourceProtocols() { return dragProtocols.iterator(); } - static Iterator getDropTargetProtocols() { + static Iterator getDropTargetProtocols() { return dropProtocols.iterator(); } @@ -88,10 +88,10 @@ final class XDragAndDropProtocols { return null; } - Iterator dragProtocols = XDragAndDropProtocols.getDragSourceProtocols(); + Iterator dragProtocols = + XDragAndDropProtocols.getDragSourceProtocols(); while (dragProtocols.hasNext()) { - XDragSourceProtocol dragProtocol = - (XDragSourceProtocol)dragProtocols.next(); + XDragSourceProtocol dragProtocol = dragProtocols.next(); if (dragProtocol.getProtocolName().equals(name)) { return dragProtocol; } @@ -110,10 +110,10 @@ final class XDragAndDropProtocols { return null; } - Iterator dropProtocols = XDragAndDropProtocols.getDropTargetProtocols(); + Iterator dropProtocols = + XDragAndDropProtocols.getDropTargetProtocols(); while (dropProtocols.hasNext()) { - XDropTargetProtocol dropProtocol = - (XDropTargetProtocol)dropProtocols.next(); + XDropTargetProtocol dropProtocol = dropProtocols.next(); if (dropProtocol.getProtocolName().equals(name)) { return dropProtocol; } diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java index f376b395823..2d67a31a036 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java @@ -29,6 +29,7 @@ import java.awt.Component; import java.awt.Cursor; import java.awt.Window; +import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.dnd.DnDConstants; @@ -110,7 +111,7 @@ public final class XDragSourceContextPeer } protected void startDrag(Transferable transferable, - long[] formats, Map formatMap) { + long[] formats, Map formatMap) { Component component = getTrigger().getComponent(); Component c = null; XWindowPeer wpeer = null; @@ -161,9 +162,10 @@ public final class XDragSourceContextPeer int dropActions = getDragSourceContext().getSourceActions(); - Iterator dragProtocols = XDragAndDropProtocols.getDragSourceProtocols(); + Iterator dragProtocols = + XDragAndDropProtocols.getDragSourceProtocols(); while (dragProtocols.hasNext()) { - XDragSourceProtocol dragProtocol = (XDragSourceProtocol)dragProtocols.next(); + XDragSourceProtocol dragProtocol = dragProtocols.next(); try { dragProtocol.initializeDrag(dropActions, transferable, formatMap, formats); @@ -313,9 +315,10 @@ public final class XDragSourceContextPeer dragDropFinished(false, DnDConstants.ACTION_NONE, xRoot, yRoot); } - Iterator dragProtocols = XDragAndDropProtocols.getDragSourceProtocols(); + Iterator dragProtocols = + XDragAndDropProtocols.getDragSourceProtocols(); while (dragProtocols.hasNext()) { - XDragSourceProtocol dragProtocol = (XDragSourceProtocol)dragProtocols.next(); + XDragSourceProtocol dragProtocol = dragProtocols.next(); try { dragProtocol.cleanup(); } catch (XException xe) { @@ -418,9 +421,10 @@ public final class XDragSourceContextPeer } if (clientWindow != 0) { - Iterator dragProtocols = XDragAndDropProtocols.getDragSourceProtocols(); + Iterator dragProtocols = + XDragAndDropProtocols.getDragSourceProtocols(); while (dragProtocols.hasNext()) { - XDragSourceProtocol dragProtocol = (XDragSourceProtocol)dragProtocols.next(); + XDragSourceProtocol dragProtocol = dragProtocols.next(); if (dragProtocol.attachTargetWindow(clientWindow, time)) { protocol = dragProtocol; break; @@ -550,10 +554,10 @@ public final class XDragSourceContextPeer XClientMessageEvent xclient = ev.get_xclient(); - Iterator dragProtocols = XDragAndDropProtocols.getDragSourceProtocols(); + Iterator dragProtocols = + XDragAndDropProtocols.getDragSourceProtocols(); while (dragProtocols.hasNext()) { - XDragSourceProtocol dragProtocol = - (XDragSourceProtocol)dragProtocols.next(); + XDragSourceProtocol dragProtocol = dragProtocols.next(); if (dragProtocol.processProxyModeEvent(xclient, getProxyModeSourceWindow())) { return true; diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java b/jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java index 6779a156688..20e16f4954e 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java @@ -26,6 +26,7 @@ package sun.awt.X11; import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.DataFlavor; import java.awt.dnd.DnDConstants; import java.awt.dnd.InvalidDnDOperationException; @@ -84,7 +85,7 @@ abstract class XDragSourceProtocol { * @throws XException if some X call failed. */ public final void initializeDrag(int actions, Transferable contents, - Map formatMap, long[] formats) + Map formatMap, long[] formats) throws InvalidDnDOperationException, IllegalArgumentException, XException { XToolkit.awtLock(); @@ -110,7 +111,8 @@ abstract class XDragSourceProtocol { /* The caller must hold AWT_LOCK. */ protected abstract void initializeDragImpl(int actions, Transferable contents, - Map formatMap, long[] formats) + Map formatMap, + long[] formats) throws InvalidDnDOperationException, IllegalArgumentException, XException; /** diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java index 4b5818ab9de..26daceff51a 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java @@ -89,12 +89,12 @@ final class XDropTargetContextPeer extends SunDropTargetContextPeer { /* If the event was not consumed, send a response to the source. */ try { if (ctxt != 0 && !e.isConsumed()) { - Iterator dropTargetProtocols = + Iterator dropTargetProtocols = XDragAndDropProtocols.getDropTargetProtocols(); while (dropTargetProtocols.hasNext()) { XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + dropTargetProtocols.next(); if (dropTargetProtocol.sendResponse(ctxt, e.getID(), returnValue)) { break; @@ -116,12 +116,12 @@ final class XDropTargetContextPeer extends SunDropTargetContextPeer { if (ctxt != 0) { try { - Iterator dropTargetProtocols = + Iterator dropTargetProtocols = XDragAndDropProtocols.getDropTargetProtocols(); while (dropTargetProtocols.hasNext()) { XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + dropTargetProtocols.next(); if (dropTargetProtocol.sendDropDone(ctxt, success, dropAction)) { break; @@ -140,12 +140,12 @@ final class XDropTargetContextPeer extends SunDropTargetContextPeer { long ctxt = getNativeDragContext(); if (ctxt != 0) { - Iterator dropTargetProtocols = + Iterator dropTargetProtocols = XDragAndDropProtocols.getDropTargetProtocols(); while (dropTargetProtocols.hasNext()) { XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + dropTargetProtocols.next(); // getData throws IAE if ctxt is not for this protocol. try { return dropTargetProtocol.getData(ctxt, format); @@ -221,12 +221,11 @@ final class XDropTargetContextPeer extends SunDropTargetContextPeer { public void forwardEventToEmbedded(long embedded, long ctxt, int eventID) { - Iterator dropTargetProtocols = + Iterator dropTargetProtocols = XDragAndDropProtocols.getDropTargetProtocols(); while (dropTargetProtocols.hasNext()) { - XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + XDropTargetProtocol dropTargetProtocol = dropTargetProtocols.next(); if (dropTargetProtocol.forwardEventToEmbedded(embedded, ctxt, eventID)) { break; diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetEventProcessor.java b/jdk/src/solaris/classes/sun/awt/X11/XDropTargetEventProcessor.java index 26a4941788d..a3d9e2fec1c 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetEventProcessor.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XDropTargetEventProcessor.java @@ -79,12 +79,11 @@ final class XDropTargetEventProcessor { } if (protocol == null) { - Iterator dropTargetProtocols = + Iterator dropTargetProtocols = XDragAndDropProtocols.getDropTargetProtocols(); while (dropTargetProtocols.hasNext()) { - XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + XDropTargetProtocol dropTargetProtocol = dropTargetProtocols.next(); // Don't try to process it again with the current protocol. if (dropTargetProtocol == curProtocol) { continue; diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java b/jdk/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java index 2ba4cf2af8d..d4526c993fe 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java @@ -295,7 +295,8 @@ abstract class XDropTargetProtocol { } /* Access to HashMap is synchronized on this XDropTargetProtocol instance. */ - private final HashMap embedderRegistry = new HashMap(); + private final HashMap embedderRegistry = + new HashMap<>(); protected final void putEmbedderRegistryEntry(long embedder, boolean overriden, @@ -310,8 +311,7 @@ abstract class XDropTargetProtocol { protected final EmbedderRegistryEntry getEmbedderRegistryEntry(long embedder) { synchronized (this) { - return - (EmbedderRegistryEntry)embedderRegistry.get(Long.valueOf(embedder)); + return embedderRegistry.get(Long.valueOf(embedder)); } } diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java b/jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java index b8a8441379e..aa3d2da55bb 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java @@ -141,10 +141,10 @@ final class XDropTargetRegistry { } public long[] getSites() { long[] ret = new long[sites.size()]; - Iterator iter = sites.iterator(); + Iterator iter = sites.iterator(); int index = 0; while (iter.hasNext()) { - Long l = (Long)iter.next(); + Long l = iter.next(); ret[index++] = l.longValue(); } return ret; @@ -199,14 +199,13 @@ final class XDropTargetRegistry { private EmbeddedDropSiteEntry registerEmbedderDropSite(long embedder) { assert XToolkit.isAWTLockHeldByCurrentThread(); - Iterator dropTargetProtocols = + Iterator dropTargetProtocols = XDragAndDropProtocols.getDropTargetProtocols(); // The list of protocols supported by the embedder. - List embedderProtocols = new ArrayList(); + List embedderProtocols = new ArrayList<>(); while (dropTargetProtocols.hasNext()) { - XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + XDropTargetProtocol dropTargetProtocol = dropTargetProtocols.next(); if (dropTargetProtocol.isProtocolSupported(embedder)) { embedderProtocols.add(dropTargetProtocol); } @@ -262,7 +261,7 @@ final class XDropTargetRegistry { private void registerProtocols(long embedder, boolean protocols, List supportedProtocols) { - Iterator dropTargetProtocols = null; + Iterator dropTargetProtocols = null; /* * By default, we register a drop site that supports all dnd @@ -289,8 +288,7 @@ final class XDropTargetRegistry { XlibWrapper.XGrabServer(XToolkit.getDisplay()); try { while (dropTargetProtocols.hasNext()) { - XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + XDropTargetProtocol dropTargetProtocol = dropTargetProtocols.next(); if ((protocols == XEMBED_PROTOCOLS) == dropTargetProtocol.isXEmbedSupported()) { dropTargetProtocol.registerEmbedderDropSite(embedder); @@ -310,14 +308,13 @@ final class XDropTargetRegistry { assert XToolkit.isAWTLockHeldByCurrentThread(); - Iterator dropTargetProtocols = + Iterator dropTargetProtocols = XDragAndDropProtocols.getDropTargetProtocols(); // The list of protocols supported by the embedder. - List embedderProtocols = new ArrayList(); + List embedderProtocols = new ArrayList<>(); while (dropTargetProtocols.hasNext()) { - XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + XDropTargetProtocol dropTargetProtocol = dropTargetProtocols.next(); if (dropTargetProtocol.isProtocolSupported(embedder)) { embedderProtocols.add(dropTargetProtocol); } @@ -361,8 +358,7 @@ final class XDropTargetRegistry { XlibWrapper.XGrabServer(XToolkit.getDisplay()); try { while (dropTargetProtocols.hasNext()) { - XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + XDropTargetProtocol dropTargetProtocol = dropTargetProtocols.next(); if (!isXEmbedServer || !dropTargetProtocol.isXEmbedSupported()) { dropTargetProtocol.registerEmbedderDropSite(embedder); } @@ -376,7 +372,7 @@ final class XDropTargetRegistry { EmbeddedDropSiteEntry entry) { assert XToolkit.isAWTLockHeldByCurrentThread(); - Iterator dropTargetProtocols = + Iterator dropTargetProtocols = XDragAndDropProtocols.getDropTargetProtocols(); /* Grab server, since we are working with the window that belongs to @@ -384,8 +380,7 @@ final class XDropTargetRegistry { XlibWrapper.XGrabServer(XToolkit.getDisplay()); try { while (dropTargetProtocols.hasNext()) { - XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + XDropTargetProtocol dropTargetProtocol = dropTargetProtocols.next(); dropTargetProtocol.unregisterEmbedderDropSite(embedder); } @@ -470,14 +465,14 @@ final class XDropTargetRegistry { registerProtocols(toplevel, XEMBED_PROTOCOLS, entry.getSupportedProtocols()); } else { - Iterator dropTargetProtocols = + Iterator dropTargetProtocols = XDragAndDropProtocols.getDropTargetProtocols(); // Register the embedded window as a plain drop site with // all DnD protocols that are supported by XEmbed. while (dropTargetProtocols.hasNext()) { XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + dropTargetProtocols.next(); if (dropTargetProtocol.isXEmbedSupported()) { dropTargetProtocol.registerEmbedderDropSite(window); } @@ -558,12 +553,12 @@ final class XDropTargetRegistry { } if (toplevel == window) { - Iterator dropTargetProtocols = + Iterator dropTargetProtocols = XDragAndDropProtocols.getDropTargetProtocols(); while (dropTargetProtocols.hasNext()) { XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + dropTargetProtocols.next(); dropTargetProtocol.registerDropTarget(toplevel); } } else { @@ -584,13 +579,13 @@ final class XDropTargetRegistry { long toplevel = getToplevelWindow(window); if (toplevel == window) { - Iterator dropProtocols = + Iterator dropProtocols = XDragAndDropProtocols.getDropTargetProtocols(); removeDelayedRegistrationEntry(window); while (dropProtocols.hasNext()) { - XDropTargetProtocol dropProtocol = (XDropTargetProtocol)dropProtocols.next(); + XDropTargetProtocol dropProtocol = dropProtocols.next(); dropProtocol.unregisterDropTarget(window); } } else { @@ -615,12 +610,11 @@ final class XDropTargetRegistry { } registerEmbeddedDropSite(canvasWindow, clientWindow); - Iterator dropTargetProtocols = + Iterator dropTargetProtocols = XDragAndDropProtocols.getDropTargetProtocols(); while (dropTargetProtocols.hasNext()) { - XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + XDropTargetProtocol dropTargetProtocol = dropTargetProtocols.next(); dropTargetProtocol.registerEmbeddedDropSite(clientWindow); } @@ -634,12 +628,11 @@ final class XDropTargetRegistry { if (logger.isLoggable(PlatformLogger.Level.FINE)) { logger.fine(" XEmbed drop site will be unregistered for " + Long.toHexString(clientWindow)); } - Iterator dropTargetProtocols = + Iterator dropTargetProtocols = XDragAndDropProtocols.getDropTargetProtocols(); while (dropTargetProtocols.hasNext()) { - XDropTargetProtocol dropTargetProtocol = - (XDropTargetProtocol)dropTargetProtocols.next(); + XDropTargetProtocol dropTargetProtocol = dropTargetProtocols.next(); dropTargetProtocol.unregisterEmbeddedDropSite(clientWindow); } diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbeddingContainer.java b/jdk/src/solaris/classes/sun/awt/X11/XEmbeddingContainer.java index e23fb93aef8..4096f435e33 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XEmbeddingContainer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XEmbeddingContainer.java @@ -32,7 +32,7 @@ import java.lang.reflect.*; import sun.awt.AWTAccessor; public class XEmbeddingContainer extends XEmbedHelper implements XEventDispatcher { - HashMap children = new HashMap(); + HashMap children = new HashMap<>(); XEmbeddingContainer() { } diff --git a/jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java index b3d0731d5f0..bb13ffda5df 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java @@ -146,9 +146,9 @@ class XFileDialogPeer extends XDialogPeer implements FileDialogPeer, ActionListe savedDir = target.getDirectory(); // Shouldn't save 'user.dir' to 'savedDir' // since getDirectory() will be incorrect after handleCancel - userDir = (String)AccessController.doPrivileged( - new PrivilegedAction() { - public Object run() { + userDir = AccessController.doPrivileged( + new PrivilegedAction() { + public String run() { return System.getProperty("user.dir"); } }); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XListPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XListPeer.java index 91b02d797b8..77545589889 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XListPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XListPeer.java @@ -70,7 +70,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { ListPainter painter; // TODO: ick - Vector? - Vector items; + Vector items; boolean multipleSelections; int active = NONE; @@ -139,7 +139,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { super.preInit(params); // Stuff that must be initialized before layout() is called - items = new Vector(); + items = new Vector<>(); createVerScrollbar(); createHorScrollbar(); @@ -281,7 +281,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { int m = 0; int end = items.size(); for(int i = 0 ; i < end ; i++) { - int l = fm.stringWidth(((String)items.elementAt(i))); + int l = fm.stringWidth(items.elementAt(i)); m = Math.max(m, l); } return m; @@ -292,7 +292,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { */ int getItemWidth(int i) { FontMetrics fm = getFontMetrics(getFont()); - return fm.stringWidth((String)items.elementAt(i)); + return fm.stringWidth(items.elementAt(i)); } /** @@ -659,7 +659,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { ( clickCount % 2 == 0 ) ) { postEvent(new ActionEvent(target, ActionEvent.ACTION_PERFORMED, - (String)items.elementAt(currentIndex), + items.elementAt(currentIndex), mouseEvent.getWhen(), mouseEvent.getModifiers())); // No ext mods } else if (active == WINDOW) { @@ -986,7 +986,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { if (selected.length > 0) { postEvent(new ActionEvent((List)target, ActionEvent.ACTION_PERFORMED, - (String)items.elementAt(getFocusIndex()), + items.elementAt(getFocusIndex()), e.getWhen(), e.getModifiers())); // ActionEvent doesn't have // extended modifiers. @@ -1343,7 +1343,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { */ public void clear() { selected = new int[0]; - items = new Vector(); + items = new Vector<>(); currentIndex = -1; // Fixed 6291736: ITEM_STATE_CHANGED triggered after List.removeAll(), XToolkit // We should update 'focusIndex' variable more carefully @@ -1926,7 +1926,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { } else { g.setColor(getListForeground()); } - String str = (String)items.elementAt(index); + String str = items.elementAt(index); g.drawString(str, x - hsb.getValue(), y + fontAscent); } else { // Clear the remaining area around the item - focus area and the rest of border diff --git a/jdk/src/solaris/classes/sun/awt/X11/XMSelection.java b/jdk/src/solaris/classes/sun/awt/X11/XMSelection.java index a74dad630e7..066a83aae8c 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XMSelection.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XMSelection.java @@ -60,7 +60,7 @@ public class XMSelection { String selectionName; /* list of listeners to be called for events */ - Vector listeners; + Vector listeners; /* X atom array (one per screen) for this selection */ XAtom atoms[]; @@ -75,7 +75,7 @@ public class XMSelection { static XAtom XA_MANAGER; - static HashMap selectionMap; + static HashMap selectionMap; static { long display = XToolkit.getDisplay(); @@ -90,7 +90,7 @@ public class XMSelection { initScreen(display,screen); } - selectionMap = new HashMap(); + selectionMap = new HashMap<>(); } static void initScreen(long display, final int screen) { @@ -227,7 +227,7 @@ public class XMSelection { static XMSelection getInstance(long selection) { - return (XMSelection) selectionMap.get(Long.valueOf(selection)); + return selectionMap.get(Long.valueOf(selection)); } @@ -259,7 +259,7 @@ public class XMSelection { public synchronized void addSelectionListener(XMSelectionListener listener) { if (listeners == null) { - listeners = new Vector(); + listeners = new Vector<>(); } listeners.add(listener); } @@ -270,7 +270,7 @@ public class XMSelection { } } - synchronized Collection getListeners() { + synchronized Collection getListeners() { return listeners; } @@ -310,9 +310,9 @@ public class XMSelection { log.fine("Selection Changed : Screen = " + screen + "Event =" + ev); } if (listeners != null) { - Iterator iter = listeners.iterator(); + Iterator iter = listeners.iterator(); while (iter.hasNext()) { - XMSelectionListener disp = (XMSelectionListener) iter.next(); + XMSelectionListener disp = iter.next(); disp.selectionChanged(screen, this, ev.get_window(), ev); } } @@ -323,9 +323,9 @@ public class XMSelection { log.fine("Owner dead : Screen = " + screen + "Event =" + de); } if (listeners != null) { - Iterator iter = listeners.iterator(); + Iterator iter = listeners.iterator(); while (iter.hasNext()) { - XMSelectionListener disp = (XMSelectionListener) iter.next(); + XMSelectionListener disp = iter.next(); disp.ownerDeath(screen, this, de.get_window()); } @@ -349,9 +349,9 @@ public class XMSelection { synchronized void dispatchOwnerChangedEvent(XEvent ev, int screen, long owner, long data, long timestamp) { if (listeners != null) { - Iterator iter = listeners.iterator(); + Iterator iter = listeners.iterator(); while (iter.hasNext()) { - XMSelectionListener disp = (XMSelectionListener) iter.next(); + XMSelectionListener disp = iter.next(); disp.ownerChanged(screen,this, owner, data, timestamp); } } diff --git a/jdk/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java index c1b568bc0fb..d8f3f17655b 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java @@ -195,10 +195,10 @@ public class XMenuBarPeer extends XBaseMenuWindow implements MenuBarPeer { void postInit(XCreateWindowParams params) { super.postInit(params); // Get menus from the target. - Vector targetMenuVector = AWTAccessor.getMenuBarAccessor() - .getMenus(menuBarTarget); + Vector targetMenuVector = AWTAccessor.getMenuBarAccessor() + .getMenus(menuBarTarget); Menu targetHelpMenu = AWTAccessor.getMenuBarAccessor() - .getHelpMenu(menuBarTarget); + .getHelpMenu(menuBarTarget); reloadItems(targetMenuVector); if (targetHelpMenu != null) { addHelpMenu(targetHelpMenu); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XMenuPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XMenuPeer.java index 067efa13d3a..6aea4c9eacc 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XMenuPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XMenuPeer.java @@ -143,7 +143,7 @@ public class XMenuPeer extends XMenuItemPeer implements MenuPeer { * Access to target's fields * ************************************************/ - Vector getTargetItems() { + Vector getTargetItems() { return AWTAccessor.getMenuAccessor().getItems((Menu)getTarget()); } diff --git a/jdk/src/solaris/classes/sun/awt/X11/XMenuWindow.java b/jdk/src/solaris/classes/sun/awt/X11/XMenuWindow.java index 9863c983873..b5fbfca919c 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XMenuWindow.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XMenuWindow.java @@ -164,7 +164,7 @@ public class XMenuWindow extends XBaseMenuWindow { this.menuPeer = menuPeer; this.target = menuPeer.getContainer().target; // Get menus from the target. - Vector targetItemVector = null; + Vector targetItemVector = null; targetItemVector = getMenuTargetItems(); reloadItems(targetItemVector); } @@ -356,7 +356,7 @@ public class XMenuWindow extends XBaseMenuWindow { * Reads vector of items from target * This function is overriden in XPopupMenuPeer */ - Vector getMenuTargetItems() { + Vector getMenuTargetItems() { return menuPeer.getTargetItems(); } diff --git a/jdk/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java index 81c60dd55b2..03a4db3f9f9 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java @@ -134,7 +134,7 @@ public class XPopupMenuPeer extends XMenuWindow implements PopupMenuPeer { public void show(Event e) { target = (Component)e.target; // Get menus from the target. - Vector targetItemVector = getMenuTargetItems(); + Vector targetItemVector = getMenuTargetItems(); if (targetItemVector != null) { reloadItems(targetItemVector); //Fix for 6287092: JCK15a: api/java_awt/interactive/event/EventTests.html#EventTest0015 fails, mustang @@ -188,7 +188,7 @@ public class XPopupMenuPeer extends XMenuWindow implements PopupMenuPeer { return AWTAccessor.getMenuItemAccessor().isEnabled(popupMenuTarget); } - Vector getMenuTargetItems() { + Vector getMenuTargetItems() { if (popupMenuTarget == null) { return null; } diff --git a/jdk/src/solaris/classes/sun/awt/X11/XSelection.java b/jdk/src/solaris/classes/sun/awt/X11/XSelection.java index 36ebc8e6dba..33f792d7a0b 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XSelection.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XSelection.java @@ -25,6 +25,7 @@ package sun.awt.X11; +import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.io.ByteArrayOutputStream; @@ -87,7 +88,7 @@ public final class XSelection { /* The contents supplied by the current owner. */ private Transferable contents = null; /* The format-to-flavor map for the current owner. */ - private Map formatMap = null; + private Map formatMap = null; /* The formats supported by the current owner was set. */ private long[] formats = null; /* The AppContext in which the current owner was set. */ @@ -134,7 +135,8 @@ public final class XSelection { return selectionAtom; } - public synchronized boolean setOwner(Transferable contents, Map formatMap, + public synchronized boolean setOwner(Transferable contents, + Map formatMap, long[] formats, long time) { long owner = XWindow.getXAWTRootWindow().getWindow(); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java index 3648e874b6a..6ae75161b10 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java @@ -36,6 +36,7 @@ import java.awt.dnd.DragGestureRecognizer; import java.awt.dnd.MouseDragGestureRecognizer; import java.awt.dnd.InvalidDnDOperationException; import java.awt.dnd.peer.DragSourceContextPeer; +import java.awt.font.TextAttribute; import java.awt.im.InputMethodHighlight; import java.awt.im.spi.InputMethodDescriptor; import java.awt.image.ColorModel; @@ -99,9 +100,9 @@ public final class XToolkit extends UNIXToolkit implements Runnable { private FontConfigManager fcManager = new FontConfigManager(); static int arrowCursor; - static TreeMap winMap = new TreeMap(); - static HashMap specialPeerMap = new HashMap(); - static HashMap winToDispatcher = new HashMap(); + static TreeMap winMap = new TreeMap<>(); + static HashMap specialPeerMap = new HashMap<>(); + static HashMap> winToDispatcher = new HashMap<>(); private static long _display; static UIDefaults uidefaults; static X11GraphicsEnvironment localEnv; @@ -358,16 +359,16 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } static XBaseWindow windowToXWindow(long window) { synchronized(winMap) { - return (XBaseWindow) winMap.get(Long.valueOf(window)); + return winMap.get(Long.valueOf(window)); } } static void addEventDispatcher(long window, XEventDispatcher dispatcher) { synchronized(winToDispatcher) { Long key = Long.valueOf(window); - Collection dispatchers = (Collection)winToDispatcher.get(key); + Collection dispatchers = winToDispatcher.get(key); if (dispatchers == null) { - dispatchers = new Vector(); + dispatchers = new Vector<>(); winToDispatcher.put(key, dispatchers); } dispatchers.add(dispatcher); @@ -376,7 +377,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { static void removeEventDispatcher(long window, XEventDispatcher dispatcher) { synchronized(winToDispatcher) { Long key = Long.valueOf(window); - Collection dispatchers = (Collection)winToDispatcher.get(key); + Collection dispatchers = winToDispatcher.get(key); if (dispatchers != null) { dispatchers.remove(dispatcher); } @@ -493,18 +494,18 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } XBaseWindow.dispatchToWindow(ev); - Collection dispatchers = null; + Collection dispatchers = null; synchronized(winToDispatcher) { Long key = Long.valueOf(xany.get_window()); - dispatchers = (Collection)winToDispatcher.get(key); + dispatchers = winToDispatcher.get(key); if (dispatchers != null) { // Clone it to avoid synchronization during dispatching - dispatchers = new Vector(dispatchers); + dispatchers = new Vector<>(dispatchers); } } if (dispatchers != null) { - Iterator iter = dispatchers.iterator(); + Iterator iter = dispatchers.iterator(); while (iter.hasNext()) { - XEventDispatcher disp = (XEventDispatcher)iter.next(); + XEventDispatcher disp = iter.next(); disp.dispatchEvent(ev); } } @@ -764,7 +765,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { Insets insets = new Insets(0, 0, 0, 0); - java.util.List search = new LinkedList(); + java.util.List search = new LinkedList<>(); search.add(root); search.add(0); while (!search.isEmpty()) @@ -929,6 +930,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { return XDragSourceContextPeer.createDragSourceContextPeer(dge); } + @SuppressWarnings("unchecked") public T createDragGestureRecognizer(Class recognizerClass, DragSource ds, @@ -1147,7 +1149,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { return 2; // Black and white. } - public Map mapInputMethodHighlight(InputMethodHighlight highlight) { + public Map mapInputMethodHighlight( InputMethodHighlight highlight) { return XInputMethod.mapInputMethodHighlight(highlight); } @Override @@ -1338,31 +1340,25 @@ public final class XToolkit extends UNIXToolkit implements Runnable { static void dumpPeers() { if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Mapped windows:"); - Iterator iter = winMap.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = (Map.Entry)iter.next(); - log.fine(entry.getKey() + "->" + entry.getValue()); - if (entry.getValue() instanceof XComponentPeer) { - Component target = (Component)((XComponentPeer)entry.getValue()).getTarget(); + winMap.forEach((k, v) -> { + log.fine(k + "->" + v); + if (v instanceof XComponentPeer) { + Component target = (Component)((XComponentPeer)v).getTarget(); log.fine("\ttarget: " + target); } - } + }); SunToolkit.dumpPeers(log); log.fine("Mapped special peers:"); - iter = specialPeerMap.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = (Map.Entry)iter.next(); - log.fine(entry.getKey() + "->" + entry.getValue()); - } + specialPeerMap.forEach((k, v) -> { + log.fine(k + "->" + v); + }); log.fine("Mapped dispatchers:"); - iter = winToDispatcher.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = (Map.Entry)iter.next(); - log.fine(entry.getKey() + "->" + entry.getValue()); - } + winToDispatcher.forEach((k, v) -> { + log.fine(k + "->" + v); + }); } } @@ -1586,16 +1582,16 @@ public final class XToolkit extends UNIXToolkit implements Runnable { * loadXSettings. It is called from the System EDT * if triggered by an XSETTINGS change. */ - void parseXSettings(int screen_XXX_ignored,Map updatedSettings) { + void parseXSettings(int screen_XXX_ignored,Map updatedSettings) { if (updatedSettings == null || updatedSettings.isEmpty()) { return; } - Iterator i = updatedSettings.entrySet().iterator(); + Iterator> i = updatedSettings.entrySet().iterator(); while (i.hasNext()) { - Map.Entry e = (Map.Entry)i.next(); - String name = (String)e.getKey(); + Map.Entry e = i.next(); + String name = e.getKey(); name = "gnome." + name; setDesktopProperty(name, e.getValue()); @@ -1692,7 +1688,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { long window = 0; try{ // get any application window - window = ((Long)(winMap.firstKey())).longValue(); + window = winMap.firstKey().longValue(); }catch(NoSuchElementException nex) { // get root window window = getDefaultRootWindow(); @@ -1798,7 +1794,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } - private static SortedMap timeoutTasks; + private static SortedMap> timeoutTasks; /** * Removed the task from the list of waiting-to-be called tasks. @@ -1819,10 +1815,10 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } return; } - Collection values = timeoutTasks.values(); - Iterator iter = values.iterator(); + Collection> values = timeoutTasks.values(); + Iterator> iter = values.iterator(); while (iter.hasNext()) { - java.util.List list = (java.util.List)iter.next(); + java.util.List list = iter.next(); boolean removed = false; if (list.contains(task)) { list.remove(task); @@ -1869,13 +1865,13 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } if (timeoutTasks == null) { - timeoutTasks = new TreeMap(); + timeoutTasks = new TreeMap<>(); } Long time = Long.valueOf(System.currentTimeMillis() + interval); - java.util.List tasks = (java.util.List)timeoutTasks.get(time); + java.util.List tasks = timeoutTasks.get(time); if (tasks == null) { - tasks = new ArrayList(1); + tasks = new ArrayList<>(1); timeoutTasks.put(time, tasks); } tasks.add(task); @@ -1897,7 +1893,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { if (timeoutTasks == null || timeoutTasks.isEmpty()) { return -1L; } - return (Long)timeoutTasks.firstKey(); + return timeoutTasks.firstKey(); } finally { awtUnlock(); } @@ -1918,13 +1914,13 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } Long currentTime = Long.valueOf(System.currentTimeMillis()); - Long time = (Long)timeoutTasks.firstKey(); + Long time = timeoutTasks.firstKey(); while (time.compareTo(currentTime) <= 0) { - java.util.List tasks = (java.util.List)timeoutTasks.remove(time); + java.util.List tasks = timeoutTasks.remove(time); - for (Iterator iter = tasks.iterator(); iter.hasNext();) { - Runnable task = (Runnable)iter.next(); + for (Iterator iter = tasks.iterator(); iter.hasNext();) { + Runnable task = iter.next(); if (timeoutTaskLog.isLoggable(PlatformLogger.Level.FINER)) { timeoutTaskLog.finer("XToolkit.callTimeoutTasks(): current time={0}" + @@ -1943,7 +1939,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { if (timeoutTasks.isEmpty()) { break; } - time = (Long)timeoutTasks.firstKey(); + time = timeoutTasks.firstKey(); } } diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java index 86e6e064fc0..4b0a1aec85d 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java @@ -85,7 +85,7 @@ public class XTrayIconPeer implements TrayIconPeer, // Fix for 6317038: as EmbeddedFrame is instance of Frame, it is blocked // by modal dialogs, but in the case of TrayIcon it shouldn't. So we // set ModalExclusion property on it. - AccessController.doPrivileged(new PrivilegedAction() { + AccessController.doPrivileged(new PrivilegedAction() { public Object run() { eframe.setModalExclusionType(Dialog.ModalExclusionType.TOOLKIT_EXCLUDE); return null; diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/classes/sun/awt/X11/XWM.java index 26c4b472883..dd98eb01279 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XWM.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XWM.java @@ -1072,6 +1072,7 @@ final class XWM * Returns all protocols supporting given protocol interface */ Collection getProtocols(Class protocolInterface) { + @SuppressWarnings("unchecked") Collection res = (Collection) protocolsMap.get(protocolInterface); if (res != null) { return res; @@ -1322,9 +1323,9 @@ final class XWM } } - HashMap storedInsets = new HashMap(); + HashMap, Insets> storedInsets = new HashMap<>(); Insets guessInsets(XDecoratedPeer window) { - Insets res = (Insets)storedInsets.get(window.getClass()); + Insets res = storedInsets.get(window.getClass()); if (res == null) { switch (WMID) { case ENLIGHTEN_WM: diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWindow.java b/jdk/src/solaris/classes/sun/awt/X11/XWindow.java index d59ac88d3a0..b7d2a7488f4 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XWindow.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XWindow.java @@ -59,7 +59,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { static int lastX = 0, lastY = 0; static long lastTime = 0; static long lastButton = 0; - static WeakReference lastWindowRef = null; + static WeakReference lastWindowRef = null; static int clickCount = 0; // used to check if we need to re-create surfaceData. @@ -692,7 +692,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { if (type == XConstants.ButtonPress) { //Allow this mouse button to generate CLICK event on next ButtonRelease mouseButtonClickAllowed |= XlibUtil.getButtonMask(lbutton); - XWindow lastWindow = (lastWindowRef != null) ? ((XWindow)lastWindowRef.get()):(null); + XWindow lastWindow = (lastWindowRef != null) ? (lastWindowRef.get()):(null); /* multiclick checking */ @@ -705,7 +705,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { clickCount++; } else { clickCount = 1; - lastWindowRef = new WeakReference(this); + lastWindowRef = new WeakReference<>(this); lastButton = lbutton; lastX = x; lastY = y; @@ -820,7 +820,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { */ int x = xme.get_x(); int y = xme.get_y(); - XWindow lastWindow = (lastWindowRef != null) ? ((XWindow)lastWindowRef.get()):(null); + XWindow lastWindow = (lastWindowRef != null) ? (lastWindowRef.get()):(null); if (!(lastWindow == this && (xme.get_time() - lastTime) < XToolkit.getMultiClickTime() && diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java index 521bbc145b3..bebd7212e9e 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java @@ -950,7 +950,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, // make new hash of toplevels of all windows from 'windows' hash. // FIXME: do not call them "toplevel" as it is misleading. // - HashSet toplevels = new HashSet(); + HashSet toplevels = new HashSet<>(); long topl = 0, mytopl = 0; for (XWindowPeer xp : windows) { diff --git a/jdk/src/solaris/classes/sun/awt/X11CustomCursor.java b/jdk/src/solaris/classes/sun/awt/X11CustomCursor.java index 969e7c5116e..c39fcbacda7 100644 --- a/jdk/src/solaris/classes/sun/awt/X11CustomCursor.java +++ b/jdk/src/solaris/classes/sun/awt/X11CustomCursor.java @@ -47,7 +47,7 @@ public abstract class X11CustomCursor extends CustomCursor { protected void createNativeCursor(Image im, int[] pixels, int width, int height, int xHotSpot, int yHotSpot) { - class CCount implements Comparable { + class CCount implements Comparable { int color; int count; @@ -56,8 +56,8 @@ public abstract class X11CustomCursor extends CustomCursor { count = ct; } - public int compareTo(Object cc) { - return ((CCount)cc).count - count; + public int compareTo(CCount cc) { + return cc.count - count; } } diff --git a/jdk/src/solaris/classes/sun/awt/X11FontManager.java b/jdk/src/solaris/classes/sun/awt/X11FontManager.java index c9d2ebc9ba4..987f669cc38 100644 --- a/jdk/src/solaris/classes/sun/awt/X11FontManager.java +++ b/jdk/src/solaris/classes/sun/awt/X11FontManager.java @@ -59,7 +59,7 @@ public class X11FontManager extends SunFontManager { * E.g., the -0-0-0-0-p-0- reported by X is -*-%d-*-*-p-*- in the font * configuration files. We need to remove that part for comparisons. */ - private static Map fontNameMap = new HashMap(); + private static Map fontNameMap = new HashMap<>(); /* * xlfdMap is a map from a platform path like @@ -72,7 +72,7 @@ public class X11FontManager extends SunFontManager { * the full XLFD string like :- * "-ricoh-hg gothic b-medium-r-normal--0-0-0-0-m-0-jisx0201.1976-0" */ - private static Map xlfdMap = new HashMap(); + private static Map> xlfdMap = new HashMap<>(); /* xFontDirsMap is also a map from a font ID to a font filepath. * The difference from fontNameMap is just that it does not have @@ -88,7 +88,7 @@ public class X11FontManager extends SunFontManager { * X11 font directory, then precautions must be taken to include both * directories. */ - private static Map xFontDirsMap; + private static Map xFontDirsMap; /* * This is the set of font directories needed to be on the X font path @@ -121,7 +121,7 @@ public class X11FontManager extends SunFontManager { * of the singleton GE instance is already synchronised and that is * the only code path that accesses this map. */ - private static HashMap registeredDirs = new HashMap(); + private static HashMap registeredDirs = new HashMap<>(); /* Array of directories to be added to the X11 font path. * Used by static method called from Toolkits which use X11 fonts. @@ -183,7 +183,7 @@ public class X11FontManager extends SunFontManager { * Add this XLFD (platform name) to the list of known * ones for this file. */ - Vector xVal = (Vector) xlfdMap.get(fileName); + Vector xVal = xlfdMap.get(fileName); if (xVal == null) { /* Try to be robust on Linux distros which move fonts * around by verifying that the fileName represents a @@ -194,7 +194,7 @@ public class X11FontManager extends SunFontManager { fileName = null; } if (fileName != null) { - xVal = new Vector(); + xVal = new Vector<>(); xVal.add(platName); xlfdMap.put(fileName, xVal); } @@ -211,7 +211,7 @@ public class X11FontManager extends SunFontManager { } if (fontID != null) { - fileName = (String)fontNameMap.get(fontID); + fileName = fontNameMap.get(fontID); /* On Linux check for the Lucida Oblique fonts */ if (fileName == null && FontUtilities.isLinux && !isOpenJDK()) { if (oblmap == null) { @@ -235,7 +235,7 @@ public class X11FontManager extends SunFontManager { FontUtilities.getLogger() .warning("** Finished registering all font paths"); } - fileName = (String)fontNameMap.get(fontID); + fileName = fontNameMap.get(fontID); } if (fileName == null && !isHeadless()) { /* Query X11 directly to see if this font is available @@ -245,7 +245,7 @@ public class X11FontManager extends SunFontManager { } if (fileName == null) { fontID = switchFontIDForName(platName); - fileName = (String)fontNameMap.get(fontID); + fileName = fontNameMap.get(fontID); } if (fileName != null) { fontNameMap.put(fontID, fileName); @@ -257,8 +257,8 @@ public class X11FontManager extends SunFontManager { @Override protected String[] getNativeNames(String fontFileName, String platformName) { - Vector nativeNames; - if ((nativeNames=(Vector)xlfdMap.get(fontFileName))==null) { + Vector nativeNames; + if ((nativeNames=xlfdMap.get(fontFileName))==null) { if (platformName == null) { return null; } else { @@ -271,7 +271,7 @@ public class X11FontManager extends SunFontManager { } } else { int len = nativeNames.size(); - return (String[])nativeNames.toArray(new String[len]); + return nativeNames.toArray(new String[len]); } } @@ -366,7 +366,7 @@ public class X11FontManager extends SunFontManager { } String fontPart = st.sval.substring(breakPos+1); String fontID = specificFontIDForName(fontPart); - String sVal = (String) fontNameMap.get(fontID); + String sVal = fontNameMap.get(fontID); if (FontUtilities.debugFonts()) { PlatformLogger logger = FontUtilities.getLogger(); @@ -386,14 +386,14 @@ public class X11FontManager extends SunFontManager { * wants to use the native rasteriser. */ if (xFontDirsMap == null) { - xFontDirsMap = new HashMap(); + xFontDirsMap = new HashMap<>(); } xFontDirsMap.put(fontID, path); fullPath = file.getCanonicalPath(); } catch (IOException e) { fullPath = path + File.separator + fileName; } - Vector xVal = (Vector) xlfdMap.get(fullPath); + Vector xVal = xlfdMap.get(fullPath); if (FontUtilities.debugFonts()) { FontUtilities.getLogger() .info("fullPath=" + fullPath + @@ -408,7 +408,7 @@ public class X11FontManager extends SunFontManager { } fontNameMap.put(fontID, fullPath); if (xVal == null) { - xVal = new Vector(); + xVal = new Vector<>(); xlfdMap.put (fullPath, xVal); } xVal.add(fontPart); @@ -447,8 +447,8 @@ public class X11FontManager extends SunFontManager { * will typically not ever need to initialise it so it can be null. */ xFontDirsMap = null; - xlfdMap = new HashMap(1); - fontNameMap = new HashMap(1); + xlfdMap = new HashMap<>(1); + fontNameMap = new HashMap<>(1); } private String getObliqueLucidaFontID(String fontID) { @@ -579,10 +579,10 @@ public class X11FontManager extends SunFontManager { String fileName = null; String fontID = specificFontIDForName(name); if (fontID != null) { - fileName = (String)fontNameMap.get(fontID); + fileName = fontNameMap.get(fontID); if (fileName == null) { fontID = switchFontIDForName(name); - fileName = (String)fontNameMap.get(fontID); + fileName = fontNameMap.get(fontID); } if (fileName == null) { fileName = getDefaultFontFile(); @@ -685,7 +685,7 @@ public class X11FontManager extends SunFontManager { getPlatformFontPathFromFontConfig(); if (xFontDirsMap != null) { String fontID = specificFontIDForName(platformName); - String dirName = (String)xFontDirsMap.get(fontID); + String dirName = xFontDirsMap.get(fontID); if (dirName != null) { fontConfigDirs.add(dirName); } diff --git a/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java b/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java index 10365f9a647..4e5bb1bd3d9 100644 --- a/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java +++ b/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java @@ -56,7 +56,7 @@ public class X11GraphicsDevice implements DisplayChangedListener { int screen; - HashMap x11ProxyKeyMap = new HashMap(); + HashMap x11ProxyKeyMap = new HashMap<>(); private static AWTPermission fullScreenExclusivePermission; private static Boolean xrandrExtSupported; @@ -127,7 +127,7 @@ public class X11GraphicsDevice GraphicsConfiguration[] configs; GraphicsConfiguration defaultConfig; - HashSet doubleBufferVisuals; + HashSet doubleBufferVisuals; /** * Returns all of the graphics @@ -159,7 +159,7 @@ public class X11GraphicsDevice boolean dbeSupported = isDBESupported(); if (dbeSupported && doubleBufferVisuals == null) { - doubleBufferVisuals = new HashSet(); + doubleBufferVisuals = new HashSet<>(); getDoubleBufferVisuals(screen); } for ( ; i < num; i++) { @@ -249,7 +249,7 @@ public class X11GraphicsDevice int depth = getConfigDepth(0, screen); boolean doubleBuffer = false; if (isDBESupported() && doubleBufferVisuals == null) { - doubleBufferVisuals = new HashSet(); + doubleBufferVisuals = new HashSet<>(); getDoubleBufferVisuals(screen); doubleBuffer = doubleBufferVisuals.contains(Integer.valueOf(visNum)); diff --git a/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java b/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java index 547af9c3bed..02f491d6707 100644 --- a/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java +++ b/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java @@ -72,7 +72,7 @@ public class X11GraphicsEnvironment static { java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { + new java.security.PrivilegedAction() { public Object run() { System.loadLibrary("awt"); @@ -254,12 +254,12 @@ public class X11GraphicsEnvironment return true; } - Boolean result = (Boolean)java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public Object run() { + Boolean result = java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public Boolean run() { InetAddress remAddr[] = null; - Enumeration locals = null; - Enumeration interfaces = null; + Enumeration locals = null; + Enumeration interfaces = null; try { interfaces = NetworkInterface.getNetworkInterfaces(); remAddr = InetAddress.getAllByName(hostName); @@ -275,7 +275,7 @@ public class X11GraphicsEnvironment } for (; interfaces.hasMoreElements();) { - locals = ((NetworkInterface)interfaces.nextElement()).getInetAddresses(); + locals = interfaces.nextElement().getInetAddresses(); for (; locals.hasMoreElements();) { for (int i = 0; i < remAddr.length; i++) { if (locals.nextElement().equals(remAddr[i])) { diff --git a/jdk/src/solaris/classes/sun/awt/X11InputMethod.java b/jdk/src/solaris/classes/sun/awt/X11InputMethod.java index 29135e1a37c..444a2a66aaf 100644 --- a/jdk/src/solaris/classes/sun/awt/X11InputMethod.java +++ b/jdk/src/solaris/classes/sun/awt/X11InputMethod.java @@ -100,7 +100,7 @@ public abstract class X11InputMethod extends InputMethodAdapter { private boolean isLastTemporary = false; private boolean isActive = false; private boolean isActiveClient = false; - private static Map[] highlightStyles; + private static Map[] highlightStyles; private boolean disposed = false; //reset the XIC if necessary @@ -136,31 +136,29 @@ public abstract class X11InputMethod extends InputMethodAdapter { // Initialize highlight mapping table static { - Map styles[] = new Map[4]; - HashMap map; + @SuppressWarnings({"unchecked", "rawtypes"}) + Map styles[] = new Map[4]; + HashMap map; // UNSELECTED_RAW_TEXT_HIGHLIGHT - map = new HashMap(1); - map.put(TextAttribute.WEIGHT, - TextAttribute.WEIGHT_BOLD); + map = new HashMap<>(1); + map.put(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD); styles[0] = Collections.unmodifiableMap(map); // SELECTED_RAW_TEXT_HIGHLIGHT - map = new HashMap(1); - map.put(TextAttribute.SWAP_COLORS, - TextAttribute.SWAP_COLORS_ON); + map = new HashMap<>(1); + map.put(TextAttribute.SWAP_COLORS, TextAttribute.SWAP_COLORS_ON); styles[1] = Collections.unmodifiableMap(map); // UNSELECTED_CONVERTED_TEXT_HIGHLIGHT - map = new HashMap(1); + map = new HashMap<>(1); map.put(TextAttribute.INPUT_METHOD_UNDERLINE, - TextAttribute.UNDERLINE_LOW_ONE_PIXEL); + TextAttribute.UNDERLINE_LOW_ONE_PIXEL); styles[2] = Collections.unmodifiableMap(map); // SELECTED_CONVERTED_TEXT_HIGHLIGHT - map = new HashMap(1); - map.put(TextAttribute.SWAP_COLORS, - TextAttribute.SWAP_COLORS_ON); + map = new HashMap<>(1); + map.put(TextAttribute.SWAP_COLORS, TextAttribute.SWAP_COLORS_ON); styles[3] = Collections.unmodifiableMap(map); highlightStyles = styles; @@ -433,7 +431,7 @@ public abstract class X11InputMethod extends InputMethodAdapter { /** * @see java.awt.Toolkit#mapInputMethodHighlight */ - public static Map mapInputMethodHighlight(InputMethodHighlight highlight) { + public static Map mapInputMethodHighlight(InputMethodHighlight highlight) { int index; int state = highlight.getState(); if (state == InputMethodHighlight.RAW_TEXT) { diff --git a/jdk/src/solaris/classes/sun/awt/XSettings.java b/jdk/src/solaris/classes/sun/awt/XSettings.java index 987b80ba778..59fb9a08ad2 100644 --- a/jdk/src/solaris/classes/sun/awt/XSettings.java +++ b/jdk/src/solaris/classes/sun/awt/XSettings.java @@ -52,7 +52,7 @@ public class XSettings { * settings manager. * @return a Map of changed settings. */ - public Map update(byte[] data) { + public Map update(byte[] data) { return (new Update(data)).update(); } @@ -79,7 +79,7 @@ public class XSettings { private int nsettings = 0; private boolean isValid; - private HashMap updatedSettings; + private HashMap updatedSettings; /** @@ -113,7 +113,7 @@ public class XSettings { idx = 8; nsettings = getINT32(); - updatedSettings = new HashMap(); + updatedSettings = new HashMap<>(); isValid = true; } @@ -213,7 +213,7 @@ public class XSettings { /** * Update settings. */ - public Map update() { + public Map update() { if (!isValid) { return null; } diff --git a/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java b/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java index 6c28d201779..b1d05fa671a 100644 --- a/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java +++ b/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java @@ -67,7 +67,7 @@ public class MFontConfiguration extends FontConfiguration { * the fontconfig files. */ protected void initReorderMap() { - reorderMap = new HashMap(); + reorderMap = new HashMap<>(); if (osName == null) { /* null means SunOS */ initReorderMapForSolaris(); } else { @@ -240,7 +240,7 @@ public class MFontConfiguration extends FontConfiguration { return "sun.awt.Symbol"; } } - String encoding = (String) encodingMap.get(xlfdEncoding); + String encoding = encodingMap.get(xlfdEncoding); if (encoding == null) { encoding = "default"; } @@ -288,7 +288,7 @@ public class MFontConfiguration extends FontConfiguration { /* methods for table setup ***********************************************/ - private static HashMap encodingMap = new HashMap(); + private static HashMap encodingMap = new HashMap<>(); private void initTables() { // encodingMap maps XLFD encoding component to From 0224281ecb9eeb69639851c53592c664e51798f4 Mon Sep 17 00:00:00 2001 From: Yuri Nesterenko Date: Tue, 29 Apr 2014 14:32:38 +0400 Subject: [PATCH 20/50] 8041592: [TEST_BUG] Move 42 AWT hw/lw mixing tests to jdk Reviewed-by: anthony, pchelko --- .../Mixing/AWT_Mixing/FrameBorderCounter.java | 95 +++ .../GlassPaneOverlappingTestBase.java | 144 ++++ .../HierarchyBoundsListenerMixingTest.java | 692 +++++++++++++++ .../JButtonInGlassPaneOverlapping.java | 51 ++ .../Mixing/AWT_Mixing/JButtonOverlapping.java | 51 ++ .../AWT_Mixing/JColorChooserOverlapping.java | 54 ++ .../AWT_Mixing/JComboBoxOverlapping.java | 99 +++ .../JEditorPaneInGlassPaneOverlapping.java | 53 ++ .../AWT_Mixing/JEditorPaneOverlapping.java | 50 ++ .../JGlassPaneInternalFrameOverlapping.java | 127 +++ .../AWT_Mixing/JGlassPaneMoveOverlapping.java | 167 ++++ .../JInternalFrameMoveOverlapping.java | 124 +++ .../AWT_Mixing/JInternalFrameOverlapping.java | 102 +++ .../JLabelInGlassPaneOverlapping.java | 53 ++ .../Mixing/AWT_Mixing/JLabelOverlapping.java | 52 ++ .../JListInGlassPaneOverlapping.java | 50 ++ .../Mixing/AWT_Mixing/JListOverlapping.java | 49 ++ .../AWT_Mixing/JMenuBarOverlapping.java | 149 ++++ .../JPanelInGlassPaneOverlapping.java | 53 ++ .../Mixing/AWT_Mixing/JPanelOverlapping.java | 52 ++ .../AWT_Mixing/JPopupMenuOverlapping.java | 124 +++ .../JProgressBarInGlassPaneOverlapping.java | 53 ++ .../AWT_Mixing/JProgressBarOverlapping.java | 52 ++ .../JScrollBarInGlassPaneOverlapping.java | 67 ++ .../AWT_Mixing/JScrollBarOverlapping.java | 66 ++ .../AWT_Mixing/JScrollPaneOverlapping.java | 129 +++ .../JSliderInGlassPaneOverlapping.java | 52 ++ .../Mixing/AWT_Mixing/JSliderOverlapping.java | 51 ++ .../JSpinnerInGlassPaneOverlapping.java | 67 ++ .../AWT_Mixing/JSpinnerOverlapping.java | 64 ++ .../AWT_Mixing/JSplitPaneOverlapping.java | 130 +++ .../JTableInGlassPaneOverlapping.java | 87 ++ .../Mixing/AWT_Mixing/JTableOverlapping.java | 73 ++ .../JTextAreaInGlassPaneOverlapping.java | 53 ++ .../AWT_Mixing/JTextAreaOverlapping.java | 52 ++ .../JTextFieldInGlassPaneOverlapping.java | 53 ++ .../AWT_Mixing/JTextFieldOverlapping.java | 52 ++ .../JToggleButtonInGlassPaneOverlapping.java | 51 ++ .../AWT_Mixing/JToggleButtonOverlapping.java | 50 ++ .../AWT_Mixing/MixingFrameResizing.java | 127 +++ .../AWT_Mixing/MixingPanelsResizing.java | 462 ++++++++++ .../Mixing/AWT_Mixing/OpaqueOverlapping.java | 164 ++++ .../AWT_Mixing/OpaqueOverlappingChoice.java | 48 ++ .../AWT_Mixing/OverlappingTestBase.java | 800 ++++++++++++++++++ .../AWT_Mixing/SimpleOverlappingTestBase.java | 160 ++++ jdk/test/java/awt/Mixing/AWT_Mixing/Util.java | 601 +++++++++++++ .../AWT_Mixing/ViewportOverlapping.java | 151 ++++ 47 files changed, 6106 insertions(+) create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/FrameBorderCounter.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/Util.java create mode 100644 jdk/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/FrameBorderCounter.java b/jdk/test/java/awt/Mixing/AWT_Mixing/FrameBorderCounter.java new file mode 100644 index 00000000000..a7380cece35 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/FrameBorderCounter.java @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +import java.awt.Dimension; +import java.awt.EventQueue; +import java.awt.Frame; +import java.awt.Point; +import java.awt.Robot; +import java.awt.event.MouseEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.WindowEvent; +import java.awt.event.WindowAdapter; + +public class FrameBorderCounter { + + private static Frame frame; + private static Frame background; + private static Dimension size; + private static Point location; + private static Point entered; + + public static void main(String[] args) throws Exception { + final Robot robot = new Robot(); + EventQueue.invokeAndWait(new Runnable() { + public void run() { + robot.mouseMove(0, 0); + } + }); + EventQueue.invokeAndWait(new Runnable() { + public void run() { + background = new Frame(); + background.setBounds(100, 100, 300, 300); + background.addMouseListener(new MouseAdapter() { + @Override + public void mouseEntered(MouseEvent e) { + entered = e.getLocationOnScreen(); + System.err.println("[ENTERED] : " + entered); + } + }); + background.setVisible(true); + } + }); + EventQueue.invokeAndWait(new Runnable() { + public void run() { + frame = new Frame("Frame"); + frame.setBounds(200, 200, 100, 100); + frame.addWindowListener(new WindowAdapter() { + public void windowClosing(WindowEvent e) { + System.exit(0); + } + }); + frame.setVisible(true); + } + }); + Thread.sleep(1000); + EventQueue.invokeAndWait(new Runnable() { + public void run() { + location = frame.getLocationOnScreen(); + size = frame.getSize(); + } + }); + int out = 20; + for (int x = location.x + size.width - out; x <= location.x + size.width + out; ++x) { + robot.mouseMove(x, location.y + size.height / 2); + Thread.sleep(50); + } + System.err.println("[LOCATION] : " + location); + System.err.println("[SIZE] : " + size); + Thread.sleep(250); + int shift = entered.x - location.x - size.width - 1; + System.err.println("Done"); + System.out.println(shift); + frame.dispose(); + background.dispose(); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java b/jdk/test/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java new file mode 100644 index 00000000000..6b7ba1cc60e --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java @@ -0,0 +1,144 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Container; +import java.awt.Point; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.InputEvent; +import java.lang.reflect.InvocationTargetException; +import javax.swing.JFrame; +import javax.swing.SpringLayout; +import javax.swing.SwingUtilities; + +/** + * Base class for testing overlapping of Swing and AWT component put into GlassPane. + * Validates drawing and event delivery at the components intersection. + *

See {@link OverlappingTestBase} for usage + * + * @author Sergey Grinev + */ +public abstract class GlassPaneOverlappingTestBase extends SimpleOverlappingTestBase { + + /** + * If true components is additionally tested to be correctly drawn after resize. + */ + protected boolean testResize = true; + private JFrame f = null; + private volatile Point ancestorLoc; + + /** + * Setups GlassPane with lightweight component returned by {@link SimpleOverlappingTestBase#getSwingComponent() } + * Called by base class. + */ + @Override + protected void prepareControls() { + wasLWClicked = false; + + if(f != null) { + f.setVisible(false); + } + f = new JFrame("Mixing : GlassPane Overlapping test"); + f.setLayout(new SpringLayout()); + f.setSize(200, 200); + + propagateAWTControls(f); + + f.getGlassPane().setVisible(true); + Container glassPane = (Container) f.getGlassPane(); + glassPane.setLayout(null); + + testedComponent = getSwingComponent(); + if (useDefaultClickValidation) { + testedComponent.addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + //System.err.println("lw mouse clicked"); + wasLWClicked = true; + } + }); + } + testedComponent.setBounds(0, 0, testedComponent.getPreferredSize().width, testedComponent.getPreferredSize().height); + glassPane.add(testedComponent); + + f.setVisible(true); + } + + public GlassPaneOverlappingTestBase() { + super(); + } + + public GlassPaneOverlappingTestBase(boolean defaultClickValidation) { + super(defaultClickValidation); + } + + /** + * Run test by {@link OverlappingTestBase#clickAndBlink(java.awt.Robot, java.awt.Point) } validation for current lightweight component. + *

Also resize component and repeat validation in the resized area. + *

Called by base class. + * @return true if test passed + * @see GlassPaneOverlappingTestBase#testResize + */ + @Override + protected boolean performTest() { + if (!super.performTest()) { + return false; + } + if (testResize) { + wasLWClicked = false; + try { + SwingUtilities.invokeAndWait(new Runnable() { + + public void run() { + testedComponent.setBounds(0, 0, testedComponent.getPreferredSize().width, testedComponent.getPreferredSize().height + 20); + ancestorLoc = f.getLocationOnScreen(); + } + }); + } catch (InterruptedException ex) { + fail(ex.getMessage()); + } catch (InvocationTargetException ex) { + fail(ex.getMessage()); + } + Point lLoc = testedComponent.getLocationOnScreen(); + lLoc.translate(1, testedComponent.getPreferredSize().height + 1); + + /* this is a workaround for certain jtreg(?) focus issue: + tests fail starting after failing mixing tests but always pass alone. + */ + Util.waitForIdle(robot); + ancestorLoc.translate(f.getWidth()/2-15, 2); + robot.mouseMove(ancestorLoc.x, ancestorLoc.y); + Util.waitForIdle(robot); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.delay(50); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + Util.waitForIdle(robot); + + clickAndBlink(robot, lLoc); + return wasLWClicked; + } else { + return true; + } + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java b/jdk/test/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java new file mode 100644 index 00000000000..13e600b30e5 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java @@ -0,0 +1,692 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.*; +import java.awt.event.*; +import java.lang.reflect.InvocationTargetException; +import javax.swing.SwingUtilities; +import java.io.*; + +/** + * AWT Mixing test for HierarchyBoundsListener ancestors. + *

See CR6768230 for details. + */ +/* +@test +@bug 6768230 +@summary Mixing test for HierarchyBoundsListener ancestors +@build FrameBorderCounter +@run main HierarchyBoundsListenerMixingTest + */ +public class HierarchyBoundsListenerMixingTest { + + protected void prepareControls() { + dummy = new Frame(); + dummy.setSize(100, 100); + dummy.setLocation(0, 350); + dummy.setVisible(true); + + frame = new Frame("Test Frame"); + frame.setLayout(new FlowLayout()); + + panel = new Panel(); + button = new Button("Button"); + label = new Label("Label"); + list = new List(); + list.add("One"); + list.add("Two"); + list.add("Three"); + choice = new Choice(); + choice.add("Red"); + choice.add("Orange"); + choice.add("Yellow"); + checkbox = new Checkbox("Checkbox"); + scrollbar = new Scrollbar(Scrollbar.HORIZONTAL, 0, 1, 0, 255); + textfield = new TextField(15); + textarea = new TextArea(5, 15); + + components = new Component[] { + panel, button, label, list, choice, checkbox, scrollbar, textfield, textarea + }; + ancestorResized = new boolean[components.length]; + ancestorMoved = new boolean[components.length]; + + frame.addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent event) { + System.err.println("User closed the window"); + System.exit(1); + } + }); + + HierarchyBoundsListener listener = new HierarchyBoundsListenerImpl(); + for (int i = 0; i < components.length; i++) { + components[i].addHierarchyBoundsListener(listener); + frame.add(components[i]); + } + frame.setSize(300, 300); + frame.setVisible(true); + } + + private int frameBorderCounter() { + String JAVA_HOME = System.getProperty("java.home"); + + try { + Process p = Runtime.getRuntime().exec(JAVA_HOME + "/bin/java FrameBorderCounter"); + try { + p.waitFor(); + } catch (InterruptedException e) { + e.printStackTrace(); + throw new RuntimeException(e); + } + if (p.exitValue() != 0) { + throw new RuntimeException("FrameBorderCounter exited with not null code!\n" + readInputStream(p.getErrorStream())); + } + return Integer.parseInt(readInputStream(p.getInputStream()).trim()); + } catch (IOException e) { + e.printStackTrace(); + throw new RuntimeException(e); + } + } + + private String readInputStream(InputStream is) throws IOException { + byte[] buffer = new byte[4096]; + int len = 0; + StringBuilder sb = new StringBuilder(); + try (InputStreamReader isr = new InputStreamReader(is)) { + while ((len = is.read(buffer)) > 0) { + sb.append(new String(buffer, 0, len)); + } + } + return sb.toString(); + } + + protected boolean performTest() { + int BORDER_SHIFT = frameBorderCounter(); + BORDER_SHIFT = Math.abs(BORDER_SHIFT) == 1 ? BORDER_SHIFT : BORDER_SHIFT / 2; + Robot robot = null; + try { + robot = new Robot(); + Thread.sleep(delay * 10); + } catch (Exception e) { + e.printStackTrace(); + System.exit(1); + } + + robot.mouseMove((int) components[0].getLocationOnScreen().x + components[0].getSize().width / 2, + (int) components[0].getLocationOnScreen().y + components[0].getSize().height / 2); + robot.delay(delay); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.delay(delay); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + robot.delay(delay); + + resetValues(); + try { + EventQueue.invokeAndWait(new Runnable() { + public void run() { + frame.setSize(new Dimension(frame.getSize().width + 10, frame.getSize().height + 10)); + frame.invalidate(); + frame.validate(); + } + }); + } catch (Exception e) { + e.printStackTrace(); + passed = false; + } + if (! resizeTriggered) { + synchronized (resizeLock) { + try { + resizeLock.wait(delay * 10); + } catch (Exception e) { + } + } + } + for (int i = 0; i < components.length; i++) { + if (! ancestorResized[i]) { + System.err.println("FAIL: Frame resized using API call. " + + "Ancestor resized event did not occur for " + components[i].getClass()); + passed = false; + } + } + if (moveCount > 0) { + System.err.println("FAIL: Ancestor moved event occured when Frame resized using API"); + passed = false; + } + robot.delay(delay * 5); + + resetValues(); + int x = (int) frame.getLocationOnScreen().x; + int y = (int) frame.getLocationOnScreen().y; + int w = frame.getSize().width; + int h = frame.getSize().height; + + robot.mouseMove(x + w + BORDER_SHIFT, y + h / 2); + robot.delay(delay); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.delay(delay); + for (int i = 0; i < 20; i++) { + robot.mouseMove(x + w + i + BORDER_SHIFT, y + h / 2); + robot.delay(50); + } + robot.delay(delay); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + + if (! resizeTriggered) { + synchronized (resizeLock) { + try { + resizeLock.wait(delay * 10); + } catch (Exception e) { + } + } + } + + for (int i = 0; i < components.length; i++) { + if (! ancestorResized[i]) { + System.err.println("FAIL: Frame resized using mouse action. " + + "Ancestor resized event did not occur for " + + components[i].getClass()); + passed = false; + } + } + if (moveCount > 0) { + System.err.println("FAIL: Ancestor moved event occured when Frame resized using mouse"); + passed = false; + } + + resetValues(); + try { + EventQueue.invokeAndWait(new Runnable() { + public void run() { + frame.setLocation(frame.getLocation().x + 20, frame.getLocation().y + 20); + frame.invalidate(); + frame.validate(); + } + }); + } catch (Exception e) { + e.printStackTrace(); + passed = false; + } + if (! moveTriggered) { + synchronized (moveLock) { + try { + moveLock.wait(delay * 10); + } catch (Exception e) { + } + } + } + for (int i = 0; i < components.length; i++) { + if (! ancestorMoved[i]) { + System.err.println("FAIL: Frame moved using API call. " + + "Ancestor moved event did not occur for " + components[i].getClass()); + passed = false; + } + } + if (resizeCount > 0) { + System.err.println("FAIL: Ancestor resized event occured when Frame moved using API"); + passed = false; + } + robot.delay(delay * 10); + + resetValues(); + x = (int) frame.getLocationOnScreen().x; + y = (int) frame.getLocationOnScreen().y; + w = frame.getSize().width; + h = frame.getSize().height; + + //Click on the dummy frame so that the test frame loses focus. This is to workaround + //a bug in Linux AS. + robot.mouseMove((int) dummy.getLocationOnScreen().x + dummy.getSize().width / 2, + (int) dummy.getLocationOnScreen().y + dummy.getSize().height / 2); + robot.delay(delay); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.delay(delay); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + robot.delay(delay); + + robot.mouseMove(x + w / 2, y + 10); + robot.delay(delay); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.delay(delay); + for (int i = 1; i <= 20; i++) { + robot.mouseMove(x + w / 2 + i, y + 10); + robot.delay(50); + } + robot.delay(delay); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + + if (! moveTriggered) { + synchronized (moveLock) { + try { + moveLock.wait(delay * 10); + } catch (Exception e) { + } + } + } + + for (int i = 0; i < components.length; i++) { + if (! ancestorMoved[i]) { + System.err.println("FAIL: Frame moved using mouse action. " + + "Ancestor moved event did not occur for " + components[i].getClass()); + passed = false; + } + } + if (resizeCount > 0) { + System.err.println("FAIL: Ancestor resized event occured when Frame moved using mouse"); + passed = false; + } + + return passed; + } + + private void resetValues() { + moveTriggered = false; + resizeTriggered = false; + moveCount = 0; + resizeCount = 0; + for (int i = 0; i < ancestorResized.length; i++) { + ancestorResized[i] = false; + ancestorMoved[i] = false; + } + } + + private void keyType(int key, Robot robot) throws Exception { + robot.keyPress(key); + robot.delay(keyDelay); + robot.keyRelease(key); + robot.delay(keyDelay); + } + + class HierarchyBoundsListenerImpl implements HierarchyBoundsListener { + // checks for Ancestor_Moved events + public void ancestorMoved(HierarchyEvent ce) { + if (check) { + System.out.println("Moved " + ce.getComponent()); + } + for (int i = 0; i < components.length; i++) { + if (components[i].equals(ce.getComponent())) { + //setting this array for purpose of checking ancestor_moved. + ancestorMoved[i] = true; + moveCount++; + if (moveCount == components.length) { + moveTriggered = true; + synchronized (moveLock) { + try { + moveLock.notifyAll(); + } catch (Exception e) { + } + } + } + } + } + } + // checks for Ancestor_Moved events + public void ancestorResized(HierarchyEvent ce) { + if (check) { + System.out.println("Resized " + ce.getComponent()); + } + for (int i = 0; i < components.length; i++) { + if (components[i].equals(ce.getComponent())) { + if (! frame.equals(ce.getChanged()) || ce.getChangedParent() != null) { + System.err.println("FAIL: Invalid value of HierarchyEvent.getXXX"); + System.err.println("ce.getChanged() : " + ce.getChanged()); + System.err.println("ce.getChangedParent() : " + ce.getChangedParent()); + passed = false; + } + //setting this array for purpose of checking ancestor_resized + ancestorResized[i] = true; + resizeCount++; + if (resizeCount == components.length) { + resizeTriggered = true; + synchronized (resizeLock) { + try { + resizeLock.notifyAll(); + } catch (Exception e) { + } + } + } + } + } + } + } + + private Frame frame, dummy; + private Panel panel; + private Button button; + private Label label; + private List list; + private Choice choice; + private Checkbox checkbox; + private Scrollbar scrollbar; + private TextField textfield; + private TextArea textarea; + private Component[] components; + private boolean[] ancestorResized; + private boolean[] ancestorMoved; + + private int delay = 500; + private int keyDelay = 50; + private int moveCount = 0; + private int resizeCount = 0; + + private boolean passed = true; + private boolean moveTriggered = false; + private boolean resizeTriggered = false; + private final Object moveLock = new Object(); + private final Object resizeLock = new Object(); + + private boolean check = false; + + private void invoke() throws InterruptedException { + try { + SwingUtilities.invokeAndWait(new Runnable() { + + public void run() { + prepareControls(); + } + }); + try { + Thread.sleep(1000); // wait for graphic effects on systems like Win7 + } catch (InterruptedException ex) { + } + if (!performTest()) { + fail("Test failed"); + } + } catch (InvocationTargetException ex) { + fail(ex.getMessage()); + } + } + + /***************************************************** + * Standard Test Machinery Section + * DO NOT modify anything in this section -- it's a + * standard chunk of code which has all of the + * synchronisation necessary for the test harness. + * By keeping it the same in all tests, it is easier + * to read and understand someone else's test, as + * well as insuring that all tests behave correctly + * with the test harness. + * There is a section following this for test- + * classes + ******************************************************/ + private static void init() throws InterruptedException { + //*** Create instructions for the user here *** + //System.setProperty("sun.awt.disableMixing", "true"); + + String[] instructions = { + "This is an AUTOMATIC test, simply wait until it is done.", + "The result (passed or failed) will be shown in the", + "message window below." + }; + Sysout.createDialog(); + Sysout.printInstructions(instructions); + + HierarchyBoundsListenerMixingTest instance = new HierarchyBoundsListenerMixingTest(); + + instance.invoke(); + + pass(); + }//End init() + private static boolean theTestPassed = false; + private static boolean testGeneratedInterrupt = false; + private static String failureMessage = ""; + private static Thread mainThread = null; + private static int sleepTime = 300000; + + // Not sure about what happens if multiple of this test are + // instantiated in the same VM. Being static (and using + // static vars), it aint gonna work. Not worrying about + // it for now. + public static void main(String args[]) throws InterruptedException { + mainThread = Thread.currentThread(); + try { + init(); + } catch (TestPassedException e) { + //The test passed, so just return from main and harness will + // interepret this return as a pass + return; + } + //At this point, neither test pass nor test fail has been + // called -- either would have thrown an exception and ended the + // test, so we know we have multiple threads. + + //Test involves other threads, so sleep and wait for them to + // called pass() or fail() + try { + Thread.sleep(sleepTime); + //Timed out, so fail the test + throw new RuntimeException("Timed out after " + sleepTime / 1000 + " seconds"); + } catch (InterruptedException e) { + //The test harness may have interrupted the test. If so, rethrow the exception + // so that the harness gets it and deals with it. + if (!testGeneratedInterrupt) { + throw e; + } + + //reset flag in case hit this code more than once for some reason (just safety) + testGeneratedInterrupt = false; + + if (theTestPassed == false) { + throw new RuntimeException(failureMessage); + } + } + + }//main + + public static synchronized void setTimeoutTo(int seconds) { + sleepTime = seconds * 1000; + } + + public static synchronized void pass() { + Sysout.println("The test passed."); + Sysout.println("The test is over, hit Ctl-C to stop Java VM"); + //first check if this is executing in main thread + if (mainThread == Thread.currentThread()) { + //Still in the main thread, so set the flag just for kicks, + // and throw a test passed exception which will be caught + // and end the test. + theTestPassed = true; + throw new TestPassedException(); + } + theTestPassed = true; + testGeneratedInterrupt = true; + mainThread.interrupt(); + }//pass() + + public static synchronized void fail() { + //test writer didn't specify why test failed, so give generic + fail("it just plain failed! :-)"); + } + + public static synchronized void fail(String whyFailed) { + Sysout.println("The test failed: " + whyFailed); + Sysout.println("The test is over, hit Ctl-C to stop Java VM"); + //check if this called from main thread + if (mainThread == Thread.currentThread()) { + //If main thread, fail now 'cause not sleeping + throw new RuntimeException(whyFailed); + } + theTestPassed = false; + testGeneratedInterrupt = true; + failureMessage = whyFailed; + mainThread.interrupt(); + }//fail() +}// class LWComboBox +class TestPassedException extends RuntimeException { +} + +//*********** End Standard Test Machinery Section ********** +//************ Begin classes defined for the test **************** +// if want to make listeners, here is the recommended place for them, then instantiate +// them in init() + +/* Example of a class which may be written as part of a test +class NewClass implements anInterface +{ +static int newVar = 0; + +public void eventDispatched(AWTEvent e) +{ +//Counting events to see if we get enough +eventCount++; + +if( eventCount == 20 ) +{ +//got enough events, so pass + +LWComboBox.pass(); +} +else if( tries == 20 ) +{ +//tried too many times without getting enough events so fail + +LWComboBox.fail(); +} + +}// eventDispatched() + +}// NewClass class + + */ +//************** End classes defined for the test ******************* +/**************************************************** +Standard Test Machinery +DO NOT modify anything below -- it's a standard +chunk of code whose purpose is to make user +interaction uniform, and thereby make it simpler +to read and understand someone else's test. + ****************************************************/ +/** +This is part of the standard test machinery. +It creates a dialog (with the instructions), and is the interface +for sending text messages to the user. +To print the instructions, send an array of strings to Sysout.createDialog +WithInstructions method. Put one line of instructions per array entry. +To display a message for the tester to see, simply call Sysout.println +with the string to be displayed. +This mimics System.out.println but works within the test harness as well +as standalone. + */ +class Sysout { + + private static TestDialog dialog; + + public static void createDialogWithInstructions(String[] instructions) { + dialog = new TestDialog(new Frame(), "Instructions"); + dialog.printInstructions(instructions); + dialog.setVisible(true); + println("Any messages for the tester will display here."); + } + + public static void createDialog() { + dialog = new TestDialog(new Frame(), "Instructions"); + String[] defInstr = {"Instructions will appear here. ", ""}; + dialog.printInstructions(defInstr); + dialog.setVisible(true); + println("Any messages for the tester will display here."); + } + + public static void printInstructions(String[] instructions) { + dialog.printInstructions(instructions); + } + + public static void println(String messageIn) { + dialog.displayMessage(messageIn); + System.out.println(messageIn); + } +}// Sysout class + +/** +This is part of the standard test machinery. It provides a place for the +test instructions to be displayed, and a place for interactive messages +to the user to be displayed. +To have the test instructions displayed, see Sysout. +To have a message to the user be displayed, see Sysout. +Do not call anything in this dialog directly. + */ +class TestDialog extends Dialog { + + TextArea instructionsText; + TextArea messageText; + int maxStringLength = 80; + + //DO NOT call this directly, go through Sysout + public TestDialog(Frame frame, String name) { + super(frame, name); + int scrollBoth = TextArea.SCROLLBARS_BOTH; + instructionsText = new TextArea("", 15, maxStringLength, scrollBoth); + add("North", instructionsText); + + messageText = new TextArea("", 5, maxStringLength, scrollBoth); + add("Center", messageText); + + pack(); + + setVisible(true); + }// TestDialog() + + //DO NOT call this directly, go through Sysout + public void printInstructions(String[] instructions) { + //Clear out any current instructions + instructionsText.setText(""); + + //Go down array of instruction strings + + String printStr, remainingStr; + for (int i = 0; i < instructions.length; i++) { + //chop up each into pieces maxSringLength long + remainingStr = instructions[i]; + while (remainingStr.length() > 0) { + //if longer than max then chop off first max chars to print + if (remainingStr.length() >= maxStringLength) { + //Try to chop on a word boundary + int posOfSpace = remainingStr.lastIndexOf(' ', maxStringLength - 1); + + if (posOfSpace <= 0) { + posOfSpace = maxStringLength - 1; + } + + printStr = remainingStr.substring(0, posOfSpace + 1); + remainingStr = remainingStr.substring(posOfSpace + 1); + } //else just print + else { + printStr = remainingStr; + remainingStr = ""; + } + + instructionsText.append(printStr + "\n"); + + }// while + + }// for + + }//printInstructions() + + //DO NOT call this directly, go through Sysout + public void displayMessage(String messageIn) { + messageText.append(messageIn + "\n"); + System.out.println(messageIn); + } +}// TestDialog class + diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java new file mode 100644 index 00000000000..11aef8209bd --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JButton } component in GlassPane. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JButton +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JButtonInGlassPaneOverlapping + */ +public class JButtonInGlassPaneOverlapping extends GlassPaneOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JButton ch = new JButton(); + ch.setText("Swing component"); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JButtonInGlassPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java new file mode 100644 index 00000000000..119c131cc85 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JButton } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JButton +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JButtonOverlapping + */ +public class JButtonOverlapping extends SimpleOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JButton ch = new JButton(); + ch.setText("Swing component"); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JButtonOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java new file mode 100644 index 00000000000..c756041db65 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JColorChooser } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JColorChooser +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JColorChooserOverlapping + */ +public class JColorChooserOverlapping extends SimpleOverlappingTestBase { + + public JColorChooserOverlapping() { + super(false); + } + + @Override + protected JComponent getSwingComponent() { + wasLWClicked = true; + JColorChooser ch = new JColorChooser(); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JColorChooserOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java new file mode 100644 index 00000000000..b0887068a09 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Point; +import java.awt.Robot; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import javax.swing.BoxLayout; +import javax.swing.JComboBox; +import javax.swing.JFrame; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JCombobox } component. + *

This test creates combobox and test if heavyweight component is drawn correctly then dropdown is shown. + *

See base class for details. + */ +/* +@test +@summary Overlapping test for javax.swing.JScrollPane +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JComboBoxOverlapping + */ +public class JComboBoxOverlapping extends OverlappingTestBase { + + private boolean lwClicked = false; + private Point loc; + private Point loc2; + + {testEmbeddedFrame = true;} + + protected void prepareControls() { + final JFrame frame = new JFrame("Mixing : Dropdown Overlapping test"); + frame.getContentPane().setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.Y_AXIS)); + frame.setSize(200, 200); + frame.setVisible(true); + + final JComboBox cb = new JComboBox(petStrings); + cb.setPreferredSize(new Dimension(frame.getContentPane().getWidth(), 20)); + cb.addActionListener(new ActionListener() { + + public void actionPerformed(ActionEvent e) { + if (e.getSource() == cb) { + lwClicked = true; + } + } + }); + + frame.add(cb); + propagateAWTControls(frame); + frame.setVisible(true); + loc = cb.getLocationOnScreen(); + loc2 = frame.getContentPane().getLocationOnScreen(); + } + + @Override + protected boolean performTest() { + // run robot + Robot robot = Util.createRobot(); + robot.setAutoDelay(ROBOT_DELAY); + + loc2.translate(75, 75); + pixelPreCheck(robot, loc2, currentAwtControl); + + loc.translate(3, 3); + clickAndBlink(robot, loc, false); + + clickAndBlink(robot, loc2, false); + + return lwClicked; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JComboBoxOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java new file mode 100644 index 00000000000..d14f078aa2d --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Point; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JBEditorPane } component in GlassPane. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JLabel +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JEditorPaneInGlassPaneOverlapping + */ +public class JEditorPaneInGlassPaneOverlapping extends GlassPaneOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JEditorPane ch = new JEditorPane(); + ch.setText("Swing component"); + OverlappingTestBase.shift = new Point(12, 12); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JEditorPaneInGlassPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java new file mode 100644 index 00000000000..513ca0dce7f --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JEditorPane } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JLabel +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JEditorPaneOverlapping + */ +public class JEditorPaneOverlapping extends SimpleOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JEditorPane ch = new JEditorPane(); + ch.setText("Swing component"); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JEditorPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java new file mode 100644 index 00000000000..3e2575375e8 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Container; +import java.awt.Point; +import java.awt.Robot; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import javax.swing.JFrame; +import javax.swing.JInternalFrame; +import javax.swing.SwingUtilities; + +/** + * AWT/Swing overlapping test with JInternalFrame being put in GlassPane. + * See JDK-6637655 and + * JDK-6985776. + *

See base class for details. + */ +/* +@test +@bug 6637655 6985776 +@summary Overlapping test for javax.swing.JScrollPane +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JGlassPaneInternalFrameOverlapping + */ +public class JGlassPaneInternalFrameOverlapping extends OverlappingTestBase { + + private boolean lwClicked = true; + private Point lLoc; + private Point lLoc2; + private JInternalFrame internalFrame; + + protected boolean performTest() { + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + lLoc = internalFrame.getContentPane().getLocationOnScreen(); + lLoc2 = lLoc.getLocation(); + lLoc2.translate(0, internalFrame.getContentPane().getHeight() + 10); + } + }); + } catch (Exception e) { + e.printStackTrace(); + System.exit(1); + } + // run robot + Robot robot = Util.createRobot(); + robot.setAutoDelay(ROBOT_DELAY); + + clickAndBlink(robot, lLoc); + + Color c = robot.getPixelColor(lLoc2.x, lLoc2.y); + robot.mouseMove(lLoc2.x, lLoc2.y); + if (!c.equals(AWT_BACKGROUND_COLOR) && + currentAwtControl.getClass() != java.awt.Scrollbar.class && + currentAwtControl.getClass() != java.awt.Choice.class) { + fail("The HW component did not pass pixel color check and is not drawn correctly"); + } + + return lwClicked; + } + + // {debugClassName = "Choice";} + + @Override + protected void prepareControls() { + JFrame frame = new JFrame("Glass Pane children test"); + frame.setLayout(null); + + Container contentPane = frame.getContentPane(); + contentPane.setLayout(new BorderLayout()); + super.propagateAWTControls(contentPane); + + Container glassPane = (Container) frame.getRootPane().getGlassPane(); + glassPane.setVisible(true); + glassPane.setLayout(null); + + internalFrame = new JInternalFrame("Internal Frame", true); + internalFrame.setBounds(50, 0, 200, 100); + internalFrame.setVisible(true); + glassPane.add(internalFrame); + + internalFrame.addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + lwClicked = true; + } + }); + + frame.setSize(300, 180); + frame.setLocationRelativeTo(null); + frame.setVisible(true); + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + if (System.getProperty("os.name").toLowerCase().contains("os x")) { + System.out.println("Aqua L&F ignores setting color to component. Test passes on Mac OS X."); + return; + } + instance = new JGlassPaneInternalFrameOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java new file mode 100644 index 00000000000..43e060a2438 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java @@ -0,0 +1,167 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Container; +import java.awt.Point; +import java.awt.Robot; +import java.awt.event.InputEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import javax.swing.JFrame; +import javax.swing.JInternalFrame; +import javax.swing.SwingUtilities; + +/** + * AWT/Swing overlapping test with JInternalFrame being moved in GlassPane. + * See JDK-6637655 and + * JDK-6981919. + *

See base class for details. + */ +/* +@test +@bug 6637655 6981919 +@summary Overlapping test for javax.swing.JScrollPane +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JGlassPaneMoveOverlapping + */ +public class JGlassPaneMoveOverlapping extends OverlappingTestBase { + + private boolean lwClicked = true; + private volatile Point lLoc; + private volatile Point lLoc2; + + private JInternalFrame internalFrame; + private JFrame frame = null; + private volatile Point frameLoc; + + protected boolean performTest() { + + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + lLoc = internalFrame.getContentPane().getLocationOnScreen(); + lLoc2 = lLoc.getLocation(); + lLoc2.translate(0, internalFrame.getHeight()); + frameLoc = frame.getLocationOnScreen(); + frameLoc.translate(frame.getWidth()/2, 3); + } + }); + } catch (Exception e) { + e.printStackTrace(); + System.exit(1); + } + + // run robot + Robot robot = Util.createRobot(); + robot.setAutoDelay(ROBOT_DELAY); + + // force focus on JFrame (jtreg workaround) + robot.mouseMove(frameLoc.x, frameLoc.y); + Util.waitForIdle(robot); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.delay(50); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + Util.waitForIdle(robot); + + + //slow move + robot.mouseMove(lLoc.x + 25, lLoc.y - 5); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.delay(100); + robot.mouseMove(lLoc.x + 45, lLoc.y - 5); + robot.delay(100); + robot.mouseMove(lLoc.x + internalWidth - 75, lLoc.y - 5); + robot.delay(100); + robot.mouseMove(lLoc.x + internalWidth - 55, lLoc.y - 5); + robot.delay(100); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + + Color c2 = robot.getPixelColor(lLoc.x + internalWidth + 15, lLoc.y - 5); + if (c2.equals(AWT_BACKGROUND_COLOR)) { + error("Foreground frame is not drawn properly"); + } + Color c = robot.getPixelColor(lLoc.x + internalWidth - 95, lLoc.y + 5); + robot.mouseMove(lLoc.x + internalWidth - 95, lLoc.y + 5); + System.out.println("color: " + c + " " + AWT_BACKGROUND_COLOR); + if (!c.equals(AWT_BACKGROUND_COLOR) && currentAwtControl.getClass() != java.awt.Scrollbar.class) { + error("Background AWT component is not drawn properly"); + } + + return true; + } + + // {debugClassName = "Choice";} + + private static void error(String st) { + //System.out.println(st); + fail(st); + } + + private static final int internalWidth = 200; + + @Override + protected void prepareControls() { + if(frame != null) { + frame.setVisible(false); + } + frame = new JFrame("Glass Pane children test"); + frame.setLayout(null); + + Container contentPane = frame.getContentPane(); + contentPane.setLayout(new BorderLayout()); + super.propagateAWTControls(contentPane); + + Container glassPane = (Container) frame.getRootPane().getGlassPane(); + glassPane.setVisible(true); + glassPane.setLayout(null); + + internalFrame = new JInternalFrame("Internal Frame", true); + internalFrame.setBounds(50, 0, internalWidth, 100); + internalFrame.setVisible(true); + glassPane.add(internalFrame); + + internalFrame.addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + lwClicked = true; + } + }); + + frame.setSize(400, 180); + frame.setLocationRelativeTo(null); + frame.setVisible(true); + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + if (System.getProperty("os.name").toLowerCase().contains("os x")) { + System.out.println("Aqua L&F ignores setting color to component. Test passes on Mac OS X."); + return; + } + instance = new JGlassPaneMoveOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java new file mode 100644 index 00000000000..99a9e015921 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java @@ -0,0 +1,124 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Point; +import java.awt.Robot; +import java.awt.event.InputEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import javax.swing.JButton; +import javax.swing.JDesktopPane; +import javax.swing.JFrame; +import javax.swing.JInternalFrame; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JInternalFrame } component during move. + *

See CR6768230 for details and base class for test info. + */ +/* +@test +@bug 6985399 +@summary Overlapping test for javax.swing.JScrollPane +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JInternalFrameMoveOverlapping + */ +public class JInternalFrameMoveOverlapping extends OverlappingTestBase { + + private boolean lwClicked = true; + private Point locTopFrame; + private Point locTarget; + + protected boolean performTest() { + // run robot + Robot robot = Util.createRobot(); + robot.setAutoDelay(ROBOT_DELAY); + + robot.mouseMove(locTopFrame.x + 25, locTopFrame.y + 25); + robot.mousePress(InputEvent.BUTTON1_MASK); + try { + Thread.sleep(500); + } catch (InterruptedException ex) { + } + robot.mouseMove(locTopFrame.x + (locTarget.x - locTopFrame.x)/2, locTopFrame.y + (locTarget.y - locTopFrame.y)/2); + try { + Thread.sleep(500); + } catch (InterruptedException ex) { + } + robot.mouseMove(locTarget.x, locTarget.y); + try { + Thread.sleep(500); + } catch (InterruptedException ex) { + } + robot.mouseRelease(InputEvent.BUTTON1_MASK); + + clickAndBlink(robot, locTarget); + + return lwClicked; + } + + //static {debugClassName = "Choice";} + + @Override + protected void prepareControls() { + + + JDesktopPane desktopPane = new JDesktopPane(); + + JInternalFrame bottomFrame = new JInternalFrame("bottom frame", false, false, false, false); + bottomFrame.setSize(220, 220); + super.propagateAWTControls(bottomFrame); + desktopPane.add(bottomFrame); + bottomFrame.setVisible(true); + + JInternalFrame topFrame = new JInternalFrame("top frame", false, false, false, false); + topFrame.setSize(200, 200); + topFrame.add(new JButton("LW Button") { + + { + addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + lwClicked = true; + } + }); + } + }); + desktopPane.add(topFrame); + topFrame.setVisible(true); + + JFrame frame = new JFrame("Test Window"); + frame.setSize(300, 300); + frame.setContentPane(desktopPane); + frame.setVisible(true); + + locTopFrame = topFrame.getLocationOnScreen(); + locTarget = new Point(locTopFrame.x + bottomFrame.getWidth() / 2, locTopFrame.y + bottomFrame.getHeight()/2); + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JInternalFrameMoveOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java new file mode 100644 index 00000000000..320a82adcce --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Point; +import java.awt.Robot; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import javax.swing.JButton; +import javax.swing.JDesktopPane; +import javax.swing.JFrame; +import javax.swing.JInternalFrame; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JInternalFrame } component. + *

See base class for test info. + */ +/* +@test +@summary Overlapping test for javax.swing.JScrollPane +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JInternalFrameOverlapping + */ +public class JInternalFrameOverlapping extends OverlappingTestBase { + + private boolean lwClicked = true; + private Point lLoc; + + protected boolean performTest() { + + + // run robot + Robot robot = Util.createRobot(); + robot.setAutoDelay(ROBOT_DELAY); + + clickAndBlink(robot, lLoc); + + return lwClicked; + } + + /** + * Creating two JInternalFrames in JDesktopPanes. Put lightweight component into one frame and heavyweight into another. + */ + @Override + protected void prepareControls() { + JDesktopPane desktopPane = new JDesktopPane(); + + JFrame frame = new JFrame("Test Window"); + frame.setSize(300, 300); + frame.setContentPane(desktopPane); + frame.setVisible(true); + JInternalFrame bottomFrame = new JInternalFrame("bottom frame", false, false, false, false); + bottomFrame.setSize(220, 220); + desktopPane.add(bottomFrame); + bottomFrame.setVisible(true); + + super.propagateAWTControls(bottomFrame); + JInternalFrame topFrame = new JInternalFrame("top frame", false, false, false, false); + topFrame.setSize(200, 200); + JButton jbutton = new JButton("LW Button") {{ + addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + lwClicked = true; + } + }); + }}; + topFrame.add(jbutton); + desktopPane.add(topFrame); + topFrame.setVisible(true); + lLoc = jbutton.getLocationOnScreen(); + lLoc.translate(jbutton.getWidth()/2, jbutton.getWidth()/2); //click at middle of the button + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JInternalFrameOverlapping(); + OverlappingTestBase.doMain(args); + } + +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java new file mode 100644 index 00000000000..bdde7409344 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Dimension; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JLabel } component in GlassPane. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JLabel +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JLabelInGlassPaneOverlapping + */ +public class JLabelInGlassPaneOverlapping extends GlassPaneOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JLabel ch = new JLabel(); + ch.setPreferredSize(new Dimension(50, 50)); + ch.setText("Swing component"); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JLabelInGlassPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java new file mode 100644 index 00000000000..e6038bc8038 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Dimension; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JLabel } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JLabel +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JLabelOverlapping + */ +public class JLabelOverlapping extends SimpleOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JLabel ch = new JLabel(); + ch.setPreferredSize(new Dimension(50, 50)); + ch.setText("Swing component"); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JLabelOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java new file mode 100644 index 00000000000..4a2e1419bae --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JList } component in GlassPane. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JList +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JListInGlassPaneOverlapping + */ +public class JListInGlassPaneOverlapping extends GlassPaneOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JList ch = new JList(new String[] {"one", "two", "three"}); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JListInGlassPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java new file mode 100644 index 00000000000..76ee46ccbfa --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JList } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JList +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JListOverlapping + */ +public class JListOverlapping extends SimpleOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JList ch = new JList(new String[] {"one", "two", "three", "four"}); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JListOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java new file mode 100644 index 00000000000..5ae75bd55b7 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Color; +import java.awt.GridLayout; +import java.awt.Point; +import java.awt.Robot; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import javax.swing.JFrame; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JSeparator; +import javax.swing.SwingUtilities; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JMenuBar } and {@link javax.swing.JSeparator} components. + *

This test creates menu bar and test if heavyweight component is drawn correctly then menu dropdown is shown. + *

See base class for test info. + */ +/* +@test +@summary Overlapping test for javax.swing.JScrollPane +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JMenuBarOverlapping + */ +public class JMenuBarOverlapping extends OverlappingTestBase { + + {testEmbeddedFrame = true;} + + private boolean lwClicked = false; + private boolean spClicked = false; + private Point loc; + private Point loc2; + private Point sepLoc; + private JFrame frame; + private JMenuBar menuBar; + JSeparator separator; + + protected void prepareControls() { + frame = new JFrame("Mixing : Dropdown Overlapping test"); + frame.setLayout(new GridLayout(0,1)); + frame.setSize(200, 200); + frame.setVisible(true); + + menuBar = new JMenuBar(); + JMenu menu = new JMenu("Test Menu"); + ActionListener menuListener = new ActionListener() { + + public void actionPerformed(ActionEvent event) { + lwClicked = true; + } + }; + + JMenuItem item; + menu.add(item = new JMenuItem("first")); + item.addActionListener(menuListener); + separator = new JSeparator(); + separator.addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + spClicked = true; + } + }); + menu.add(separator); + + for (int i = 0; i < petStrings.length; i++) { + menu.add(item = new JMenuItem(petStrings[i])); + item.addActionListener(menuListener); + } + menuBar.add(menu); + frame.setJMenuBar(menuBar); + + propagateAWTControls(frame); + frame.setVisible(true); + } + + @Override + protected boolean performTest() { + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + loc = menuBar.getLocationOnScreen(); + loc2 = frame.getContentPane().getLocationOnScreen(); + } + }); + } catch (Exception e) { + } + // run robot + Robot robot = Util.createRobot(); + robot.setAutoDelay(ROBOT_DELAY); + + loc2.translate(75, 75); + pixelPreCheck(robot, loc2, currentAwtControl); + + loc.translate(3, 3); + clickAndBlink(robot, loc, false); + + clickAndBlink(robot, loc2, false); + + clickAndBlink(robot, loc, false); + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + sepLoc = separator.getLocationOnScreen(); + } + }); + } catch (Exception e) { + e.printStackTrace(); + System.exit(1); + } + sepLoc.translate(20, 1); + clickAndBlink(robot, sepLoc, false); + + clickAndBlink(robot, loc, false); // close menu before running next step + return lwClicked && spClicked; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JMenuBarOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java new file mode 100644 index 00000000000..189a17b000f --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Dimension; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JPanel } component in GlassPane. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JPanel +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JPanelInGlassPaneOverlapping + */ +public class JPanelInGlassPaneOverlapping extends GlassPaneOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JPanel ch = new JPanel(); + ch.setPreferredSize(new Dimension(50, 50)); + ch.setBorder(BorderFactory.createTitledBorder("Swing Component")); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JPanelInGlassPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java new file mode 100644 index 00000000000..5decd49d461 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Dimension; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JPanel } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JPanel +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JPanelOverlapping + */ +public class JPanelOverlapping extends SimpleOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JPanel ch = new JPanel(); + ch.setPreferredSize(new Dimension(50, 50)); + ch.setBorder(BorderFactory.createTitledBorder("Swing Component")); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JPanelOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java new file mode 100644 index 00000000000..fead4e441fd --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java @@ -0,0 +1,124 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Color; +import java.awt.Point; +import java.awt.Robot; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.lang.reflect.InvocationTargetException; +import javax.swing.JFrame; +import javax.swing.JMenuItem; +import javax.swing.JPopupMenu; +import javax.swing.SpringLayout; +import javax.swing.SwingUtilities; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JPopupMenu } component. + *

This test creates menu and test if heavyweight component is drawn correctly then menu dropdown is shown. + *

See base class for test info. + */ +/* +@test +@summary Overlapping test for javax.swing.JScrollPane +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JPopupMenuOverlapping + */ +public class JPopupMenuOverlapping extends OverlappingTestBase { + + {testEmbeddedFrame = true;} + + private boolean lwClicked = false; + private Point loc; + private JPopupMenu popup; + private JFrame frame=null; + + protected void prepareControls() { + if(frame != null) { + frame.setVisible(false); + } + frame = new JFrame("Mixing : Dropdown Overlapping test"); + frame.setLayout(new SpringLayout()); + frame.setSize(200, 200); + + popup = new JPopupMenu(); + ActionListener menuListener = new ActionListener() { + + public void actionPerformed(ActionEvent event) { + lwClicked = true; + } + }; + JMenuItem item; + for (int i = 0; i < petStrings.length; i++) { + popup.add(item = new JMenuItem(petStrings[i])); + item.addActionListener(menuListener); + } + propagateAWTControls(frame); + frame.setVisible(true); + loc = frame.getContentPane().getLocationOnScreen(); + } + + @Override + protected boolean performTest() { + // run robot + Robot robot = Util.createRobot(); + robot.setAutoDelay(ROBOT_DELAY); + + loc.translate(75, 75); + + pixelPreCheck(robot, loc, currentAwtControl); + + try { + SwingUtilities.invokeAndWait(new Runnable() { + + public void run() { + popup.show(frame.getContentPane(), 15, 15); + } + }); + + robot.waitForIdle(); + + clickAndBlink(robot, loc, false); + + SwingUtilities.invokeAndWait(new Runnable() { + + public void run() { + popup.setVisible(false); + } + }); + } catch (InterruptedException ex) { + fail(ex.getMessage()); + } catch (InvocationTargetException ex) { + fail(ex.getMessage()); + } + + return lwClicked; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JPopupMenuOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java new file mode 100644 index 00000000000..1f60eefe5d6 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Dimension; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JProgressBar } component in GlassPane. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JProgressBar +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JProgressBarInGlassPaneOverlapping + */ +public class JProgressBarInGlassPaneOverlapping extends GlassPaneOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JProgressBar ch = new JProgressBar(); + ch.setValue(50); + ch.setPreferredSize(new Dimension(50, 50)); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JProgressBarInGlassPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java new file mode 100644 index 00000000000..3db75cc6e4d --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Dimension; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JProgressBar } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JProgressBar +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JProgressBarOverlapping + */ +public class JProgressBarOverlapping extends SimpleOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JProgressBar ch = new JProgressBar(); + ch.setValue(50); + ch.setPreferredSize(new Dimension(50, 50)); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JProgressBarOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java new file mode 100644 index 00000000000..a12a6f8b5af --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Point; +import java.awt.Dimension; +import java.awt.event.AdjustmentEvent; +import java.awt.event.AdjustmentListener; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JScrollBar } component in GlassPane. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JScrollBar +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JScrollBarInGlassPaneOverlapping + */ +public class JScrollBarInGlassPaneOverlapping extends GlassPaneOverlappingTestBase { + + public JScrollBarInGlassPaneOverlapping() { + super(false); + } + + @Override + protected JComponent getSwingComponent() { + JScrollBar ch = new JScrollBar(JScrollBar.VERTICAL); + ch.setPreferredSize(new Dimension(50, 50)); + ch.setValue(50); + ch.addAdjustmentListener(new AdjustmentListener() { + + public void adjustmentValueChanged(AdjustmentEvent e) { + wasLWClicked = true; + } + }); + OverlappingTestBase.shift = new Point(20, 16); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JScrollBarInGlassPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java new file mode 100644 index 00000000000..9a3dd8e0a8a --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Point; +import java.awt.Dimension; +import java.awt.event.AdjustmentEvent; +import java.awt.event.AdjustmentListener; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JScrollBar } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JScrollBar +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JScrollBarOverlapping + */ +public class JScrollBarOverlapping extends SimpleOverlappingTestBase { + + public JScrollBarOverlapping() { + super(false); + } + + @Override + protected JComponent getSwingComponent() { + JScrollBar ch = new JScrollBar(JScrollBar.VERTICAL); + ch.setPreferredSize(new Dimension(50, 50)); + ch.setValue(50); + ch.addAdjustmentListener(new AdjustmentListener() { + + public void adjustmentValueChanged(AdjustmentEvent e) { + wasLWClicked = true; + } + }); + OverlappingTestBase.shift = new Point(20, 16); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JScrollBarOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java new file mode 100644 index 00000000000..d4ae51d38e4 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java @@ -0,0 +1,129 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Dimension; +import java.awt.GridLayout; +import java.awt.Point; +import java.awt.Robot; +import java.awt.event.AdjustmentEvent; +import java.awt.event.AdjustmentListener; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.SwingUtilities; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JScrollPane } component. + *

See base class for test info. + */ +/* +@test +@summary Overlapping test for javax.swing.JScrollPane +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JScrollPaneOverlapping + */ +public class JScrollPaneOverlapping extends OverlappingTestBase { + +// {testEmbeddedFrame = true;} + + private boolean horizontalClicked = false; + private boolean verticalClicked = false; + private Point hLoc; + private Point vLoc; + + private JFrame f; + private JPanel p; + private JScrollPane scrollPane; + + protected void prepareControls() { + + f = new JFrame("JScrollPane"); + f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + f.setSize(120, 120); + + p = new JPanel(new GridLayout(0, 1)); + + scrollPane = new JScrollPane(p); + scrollPane.setPreferredSize(new Dimension(300,300)); + scrollPane.setHorizontalScrollBarPolicy( + JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); + scrollPane.setVerticalScrollBarPolicy( + JScrollPane.VERTICAL_SCROLLBAR_ALWAYS); + + scrollPane.getHorizontalScrollBar().setValue(1); + scrollPane.getHorizontalScrollBar().addAdjustmentListener(new AdjustmentListener() { + + public void adjustmentValueChanged(AdjustmentEvent e) { + horizontalClicked = true; + } + }); + + scrollPane.getVerticalScrollBar().setValue(1); + scrollPane.getVerticalScrollBar().addAdjustmentListener(new AdjustmentListener() { + + public void adjustmentValueChanged(AdjustmentEvent e) { + verticalClicked = true; + } + }); + + f.getContentPane().add(scrollPane); + f.setVisible(true); + propagateAWTControls(p); +// JButton b = new JButton("Space extender"); +// b.setPreferredSize(new Dimension(150,150)); +// p.add( b ); + + //b.requestFocus(); // to change the look of AWT component, especially Choice + } + + @Override + protected boolean performTest() { + // run robot + Robot robot = Util.createRobot(); + robot.setAutoDelay(ROBOT_DELAY); + + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + hLoc = scrollPane.getHorizontalScrollBar().getLocationOnScreen(); + vLoc = scrollPane.getVerticalScrollBar().getLocationOnScreen(); + } + }); + } catch (Exception e) { + } + hLoc.translate(2, 2); + vLoc.translate(2, 2); + + clickAndBlink(robot, hLoc, false); + clickAndBlink(robot, vLoc, false); + + return horizontalClicked && verticalClicked; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JScrollPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java new file mode 100644 index 00000000000..8cdafc17903 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Dimension; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JSlider } component in GlassPane. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JSlider +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JSliderInGlassPaneOverlapping + */ +public class JSliderInGlassPaneOverlapping extends GlassPaneOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JSlider ch = new JSlider(); + ch.setPreferredSize(new Dimension(50, 50)); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JSliderInGlassPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java new file mode 100644 index 00000000000..f6553db0311 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Dimension; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JSlider } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JSlider +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JSliderOverlapping + */ +public class JSliderOverlapping extends SimpleOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JSlider ch = new JSlider(); + ch.setPreferredSize(new Dimension(50, 50)); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JSliderOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java new file mode 100644 index 00000000000..1c60597c5a2 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Dimension; +import javax.swing.event.ChangeEvent; +import javax.swing.*; +import javax.swing.event.ChangeListener; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JSpinner } component in GlassPane. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JSpinner +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JSpinnerInGlassPaneOverlapping + */ +public class JSpinnerInGlassPaneOverlapping extends GlassPaneOverlappingTestBase { + + {testResize = false;} + + public JSpinnerInGlassPaneOverlapping() { + super(false); + } + +// static {debugClassName = "Choice";} + @Override + protected JComponent getSwingComponent() { + JSpinner ch = new JSpinner(); + ch.setPreferredSize(new Dimension(30, 50)); + ch.addChangeListener(new ChangeListener() { + + public void stateChanged(ChangeEvent e) { + wasLWClicked = true; + } + }); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JSpinnerInGlassPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java new file mode 100644 index 00000000000..90e4e5b85e9 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Dimension; +import javax.swing.event.ChangeEvent; +import javax.swing.*; +import javax.swing.event.ChangeListener; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JSpinner } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JSpinner +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JSpinnerOverlapping + */ +public class JSpinnerOverlapping extends SimpleOverlappingTestBase { + + public JSpinnerOverlapping() { + super(false); + } + +// static {debugClassName = "Choice";} + @Override + protected JComponent getSwingComponent() { + JSpinner ch = new JSpinner(); + ch.setPreferredSize(new Dimension(30, 50)); + ch.addChangeListener(new ChangeListener() { + + public void stateChanged(ChangeEvent e) { + wasLWClicked = true; + } + }); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JSpinnerOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java new file mode 100644 index 00000000000..c4f2265824a --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.GridLayout; +import java.awt.Point; +import java.awt.Robot; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.InputEvent; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JSplitPane; +import javax.swing.SwingUtilities; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JSplitPane } component. + *

This test creates puts heavyweight and lightweight components into different panels and test if splitter image and components itself are drawn correctly. + *

See base class for test info. + */ +/* +@test +@bug 6986109 +@summary Overlapping test for javax.swing.JSplitPane +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JSplitPaneOverlapping + */ +public class JSplitPaneOverlapping extends OverlappingTestBase { + + private boolean clicked = false; + private Point splitterLoc; + private JScrollPane sp1; + private JScrollPane sp2; + + protected void prepareControls() { + JFrame frame = new JFrame("SplitPane Mixing"); + JPanel p = new JPanel(new GridLayout()); + p.setPreferredSize(new Dimension(500, 500)); + propagateAWTControls(p); + sp1 = new JScrollPane(p); + + JButton button = new JButton("JButton"); + button.setBackground(Color.RED); + button.addActionListener(new ActionListener() { + + public void actionPerformed(ActionEvent e) { + clicked = true; + } + }); + sp2 = new JScrollPane(button); + + JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, sp1, sp2); + splitPane.setOneTouchExpandable(false); + splitPane.setDividerLocation(150); + + splitPane.setPreferredSize(new Dimension(400, 200)); + + frame.getContentPane().add(splitPane); + frame.pack(); + frame.setVisible(true); + } + + private static final boolean ignoreFail = false; + + @Override + protected boolean performTest() { + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + splitterLoc = sp2.getLocationOnScreen(); + Point leftLoc = sp1.getLocationOnScreen(); + leftLoc.translate(sp1.getWidth(), 0); + splitterLoc.translate(-(splitterLoc.x - leftLoc.x) / 2, 30); + } + }); + } catch (Exception e) { + e.printStackTrace(); + System.exit(1); + } + // run robot + Robot robot = Util.createRobot(); + robot.setAutoDelay(ROBOT_DELAY); + + robot.mouseMove(splitterLoc.x, splitterLoc.y); + Util.waitForIdle(robot); + + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.mouseMove(splitterLoc.x - 50, splitterLoc.y); + Color c = robot.getPixelColor(splitterLoc.x - 50, splitterLoc.y); + System.out.println("Actual: "+c+", (not) expected: "+AWT_VERIFY_COLOR+" at "+(splitterLoc.x - 50)+", "+ splitterLoc.y); + if (!ignoreFail && c.equals(AWT_VERIFY_COLOR)) { + fail("The JSplitPane drag-n-drop image did not pass pixel color check and is overlapped"); + } + robot.mouseRelease(InputEvent.BUTTON1_MASK); + + clickAndBlink(robot, splitterLoc); + + return clicked; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JSplitPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java new file mode 100644 index 00000000000..af4803b9c50 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import javax.swing.JComponent; +import javax.swing.JTable; +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JTable } component in GlassPane. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for JTable +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JTableInGlassPaneOverlapping + */ +public class JTableInGlassPaneOverlapping extends GlassPaneOverlappingTestBase { + + { + testResize = false; + } + + @Override + protected JComponent getSwingComponent() { + // Create columns names + String columnNames[] = {"Column 1", "Column 2", "Column 3"}; + + // Create some data + String dataValues[][] = { + {"12", "234", "67"}, + {"-123", "43", "853"}, + {"93", "89.2", "109"}, + {"279", "9033", "3092"}, + {"12", "234", "67"}, + {"-123", "43", "853"}, + {"93", "89.2", "109"}, + {"279", "9033", "3092"}, + {"12", "234", "67"}, + {"-123", "43", "853"}, + {"93", "89.2", "109"}, + {"279", "9033", "3092"}, + {"12", "234", "67"}, + {"-123", "43", "853"}, + {"93", "89.2", "109"}, + {"279", "9033", "3092"} + }; + + // Create a new table instance + JTable jt = new JTable(dataValues, columnNames); + jt.getModel().addTableModelListener(new TableModelListener() { + + public void tableChanged(TableModelEvent e) { + System.err.println("table changed"); + } + }); + return jt; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JTableInGlassPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java new file mode 100644 index 00000000000..d96732feedc --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JTable } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for JTable +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JTableOverlapping + */ +public class JTableOverlapping extends SimpleOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + // Create columns names + String columnNames[] = { "Column 1", "Column 2", "Column 3" }; + + // Create some data + String dataValues[][] = + { + { "12", "234", "67" }, + { "-123", "43", "853" }, + { "93", "89.2", "109" }, + { "279", "9033", "3092" }, + { "12", "234", "67" }, + { "-123", "43", "853" }, + { "93", "89.2", "109" }, + { "279", "9033", "3092" }, + { "12", "234", "67" }, + { "-123", "43", "853" }, + { "93", "89.2", "109" }, + { "279", "9033", "3092" }, + { "12", "234", "67" }, + { "-123", "43", "853" }, + { "93", "89.2", "109" }, + { "279", "9033", "3092" } + }; + + // Create a new table instance + return new JTable( dataValues, columnNames ); + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JTableOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java new file mode 100644 index 00000000000..dba86e2747f --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Dimension; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JTextArea } component in GlassPane. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JLabel +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JTextAreaInGlassPaneOverlapping + */ +public class JTextAreaInGlassPaneOverlapping extends GlassPaneOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JTextArea ch = new JTextArea(); + ch.setPreferredSize(new Dimension(50, 50)); + ch.setText("Swing component"); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JTextAreaInGlassPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java new file mode 100644 index 00000000000..51f2b5ffddb --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Dimension; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JTextArea } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JLabel +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JTextAreaOverlapping + */ +public class JTextAreaOverlapping extends SimpleOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JTextArea ch = new JTextArea(); + ch.setPreferredSize(new Dimension(50, 50)); + ch.setText("Swing component"); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JTextAreaOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java new file mode 100644 index 00000000000..d6dd69436ea --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.Dimension; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JTextField } component in GlassPane. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JLabel +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JTextFieldInGlassPaneOverlapping + */ +public class JTextFieldInGlassPaneOverlapping extends GlassPaneOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JTextField ch = new JTextField(); + ch.setPreferredSize(new Dimension(50, 50)); + ch.setText("Swing component"); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JTextFieldInGlassPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java new file mode 100644 index 00000000000..ffaecdcb589 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Dimension; +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JTextField } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JLabel +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JTextFieldOverlapping + */ +public class JTextFieldOverlapping extends SimpleOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JTextField ch = new JTextField(); + ch.setPreferredSize(new Dimension(50, 50)); + ch.setText("Swing component"); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JTextFieldOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java new file mode 100644 index 00000000000..3c4a62d9f50 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JToggleButton } component in GlassPane. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JToggleButton +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JToggleButtonInGlassPaneOverlapping + */ +public class JToggleButtonInGlassPaneOverlapping extends GlassPaneOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JToggleButton ch = new JToggleButton(); + ch.setText("Swing component"); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JToggleButtonInGlassPaneOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java new file mode 100644 index 00000000000..3b311d71e10 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import javax.swing.*; + +/** + * AWT/Swing overlapping test for {@link javax.swing.JToggleButton } component. + *

See base class for details. + */ +/* +@test +@summary Simple Overlapping test for javax.swing.JToggleButton +@author sergey.grinev@oracle.com: area=awt.mixing +@run main JToggleButtonOverlapping + */ +public class JToggleButtonOverlapping extends SimpleOverlappingTestBase { + + @Override + protected JComponent getSwingComponent() { + JToggleButton ch = new JToggleButton(); + ch.setText("Swing component"); + return ch; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new JToggleButtonOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java b/jdk/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java new file mode 100644 index 00000000000..fd15ca1dc85 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Point; +import java.awt.Robot; +import java.awt.event.InputEvent; +import javax.swing.JFrame; +import javax.swing.SpringLayout; +import javax.swing.SwingUtilities; + +/** + * AWT/Swing overlapping test. + *

This test puts heavyweight component into JFrame and verifies that it's being drawn correctly after resizing the frame. + *

See base class for test info. + */ +/* +@test +@bug 6777370 +@summary Issues when resizing the JFrame with HW components +@author sergey.grinev@oracle.com: area=awt.mixing +@run main MixingFrameResizing + */ +public class MixingFrameResizing extends OverlappingTestBase { + + {testEmbeddedFrame = true;} + + private JFrame frame = null; + private Point lLoc; + private Point lLoc2; + private Dimension size; + + protected void prepareControls() { + if(frame != null) { + frame.setVisible(false); + } + frame = new JFrame("Mixing : Frame Resizing test"); + frame.setLayout(new SpringLayout()); + frame.setSize(50, 50); + frame.setVisible(true); + propagateAWTControls(frame); + Util.waitTillShown(frame); + } + + @Override + protected boolean performTest() { + int BORDER_SHIFT = frameBorderCounter(); + BORDER_SHIFT = Math.abs(BORDER_SHIFT) == 1 ? BORDER_SHIFT : (BORDER_SHIFT / 2); + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + lLoc = frame.getLocationOnScreen(); + size = frame.getSize(); + lLoc2 = frame.getContentPane().getLocationOnScreen(); + } + }); + } catch (Exception e) { + e.printStackTrace(); + System.exit(1); + } + Robot robot = Util.createRobot(); + robot.setAutoDelay(ROBOT_DELAY/2); + + // resize window + robot.mouseMove(lLoc.x + size.width / 2 + BORDER_SHIFT, lLoc.y + size.height + BORDER_SHIFT); + Util.waitForIdle(robot); + robot.mousePress(InputEvent.BUTTON1_MASK); + for (int i = 0; i < 10; i++) { + robot.mouseMove(lLoc.x + size.width / 2 + BORDER_SHIFT, lLoc.y + size.height + BORDER_SHIFT + 20 * i); + } + robot.mouseRelease(InputEvent.BUTTON1_MASK); + + robot.mouseMove(lLoc.x + size.width + BORDER_SHIFT, lLoc.y + size.height + BORDER_SHIFT); + Util.waitForIdle(robot); + robot.mousePress(InputEvent.BUTTON1_MASK); + for (int i = 0; i < 10; i++) { + robot.mouseMove(lLoc.x + size.width + BORDER_SHIFT + 20 * i, lLoc.y + size.height + BORDER_SHIFT); + } + robot.mouseRelease(InputEvent.BUTTON1_MASK); + + Util.waitForIdle(robot); + // check if component is visible on the opened space + try { + Thread.sleep(300); //some more wait for Solaris (for some reason) + }catch(Exception ex) {} + lLoc2.translate(75, 75); + Color c = robot.getPixelColor(lLoc2.x, lLoc2.y); + System.out.println("Actual: "+c+", expected: "+AWT_VERIFY_COLOR); + + if (!c.equals(AWT_VERIFY_COLOR)) { + fail("HW component is not visible after resizing"); + } + + return true; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + if (System.getProperty("os.name").toLowerCase().contains("os x")) { + System.out.println("Aqua L&F ignores setting color to component. Test passes on Mac OS X."); + return; + } + instance = new MixingFrameResizing(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java b/jdk/test/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java new file mode 100644 index 00000000000..d7e46b9ffc6 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java @@ -0,0 +1,462 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.*; +import java.awt.event.InputEvent; +import javax.swing.*; +import java.io.*; + +/** + * AWT/Swing overlapping test for Panel and JPanel behavior during resizing. + *

See JDK-6786219 for details + */ +/* +@test +@bug 6786219 +@summary Issues when resizing the frame after mixing of heavy weight & light weight components +@author sergey.grinev@oracle.com: area=awt.mixing +@build FrameBorderCounter +@run main MixingPanelsResizing + */ +public class MixingPanelsResizing { + + static volatile boolean failed = false; + + private static JFrame frame; + private static JButton jbutton; + private static Button awtButton; + private static JButton jbutton2; + private static Button awtButton2; + private static final Color jbColor = Color.RED; + private static final Color awtColor = Color.ORANGE; + private static final Color jb2Color = Color.BLUE; + private static final Color awt2Color = Color.CYAN; + private static final int ROBOT_DELAY = 500; + + private static Point lLoc; + private static int borderShift; + + private static int frameBorderCounter() { + String JAVA_HOME = System.getProperty("java.home"); + try { + Process p = Runtime.getRuntime().exec(JAVA_HOME + "/bin/java FrameBorderCounter"); + try { + p.waitFor(); + } catch (InterruptedException e) { + e.printStackTrace(); + throw new RuntimeException(e); + } + if (p.exitValue() != 0) { + throw new RuntimeException("FrameBorderCounter exited with not null code!\n" + readInputStream(p.getErrorStream())); + } + return Integer.parseInt(readInputStream(p.getInputStream()).trim()); + } catch (IOException e) { + e.printStackTrace(); + throw new RuntimeException(e); + } + } + + private static String readInputStream(InputStream is) throws IOException { + byte[] buffer = new byte[4096]; + int len = 0; + StringBuilder sb = new StringBuilder(); + try (InputStreamReader isr = new InputStreamReader(is)) { + while ((len = is.read(buffer)) > 0) { + sb.append(new String(buffer, 0, len)); + } + } + return sb.toString(); + } + + private static void init() throws Exception { + //*** Create instructions for the user here *** + + borderShift = frameBorderCounter(); + borderShift = Math.abs(borderShift) == 1 ? borderShift : (borderShift / 2); + String[] instructions = { + "This is an AUTOMATIC test, simply wait until it is done.", + "The result (passed or failed) will be shown in the", + "message window below." + }; + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + Sysout.createDialog(); + Sysout.printInstructions(instructions); + + // prepare controls + + frame = new JFrame(); + + Panel awtPanel = new Panel(); + awtPanel.setBackground(Color.GREEN); + awtButton = new Button("AWTButton"); + awtPanel.add(awtButton); + awtButton.setForeground(awtColor); + awtButton.setBackground(awtColor); + jbutton = new JButton("SwingButton"); + awtPanel.add(jbutton); + jbutton.setForeground(jbColor); + jbutton.setBackground(jbColor); + + JPanel jPanel = new JPanel(); + jbutton2 = new JButton("SwingButton2"); + jPanel.add(jbutton2); + jbutton2.setForeground(jb2Color); + jbutton2.setBackground(jb2Color); + awtButton2 = new Button("AWT Button2"); + jPanel.add(awtButton2); + awtButton2.setForeground(awt2Color); + awtButton2.setBackground(awt2Color); + jPanel.setBackground(Color.YELLOW); + + frame.add(awtPanel, BorderLayout.SOUTH); + frame.add(jPanel, BorderLayout.NORTH); + + frame.pack(); + frame.setVisible(true); + } + }); + + ///////////////////////// + + final Robot robot = Util.createRobot(); + robot.setAutoDelay(ROBOT_DELAY); + + Util.waitForIdle(robot); + + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + lLoc = frame.getLocationOnScreen(); + lLoc.translate(frame.getWidth() + borderShift, frame.getHeight() + borderShift); + } + }); + + //grow + robot.mouseMove(lLoc.x, lLoc.y); + robot.mousePress(InputEvent.BUTTON1_MASK); + + Runnable test = new Runnable() { + + public void run() { + Point btnLoc = jbutton.getLocationOnScreen(); + Color c = robot.getPixelColor(btnLoc.x + 5, btnLoc.y + 5); + if (!c.equals(jbColor)) { + fail("JButton was not redrawn properly on AWT Panel during move"); + } + + btnLoc = awtButton.getLocationOnScreen(); + c = robot.getPixelColor(btnLoc.x + 5, btnLoc.y + 5); + if (!c.equals(awtColor)) { + fail("AWT Button was not redrawn properly on AWT Panel during move"); + } + + btnLoc = jbutton2.getLocationOnScreen(); + c = robot.getPixelColor(btnLoc.x + 5, btnLoc.y + 5); + if (!c.equals(jb2Color)) { + fail("JButton was not redrawn properly on JPanel during move"); + } + + btnLoc = awtButton2.getLocationOnScreen(); + c = robot.getPixelColor(btnLoc.x + 5, btnLoc.y + 5); + if (!c.equals(awt2Color)) { + fail("ATW Button was not redrawn properly on JPanel during move"); + } + } + }; + + for (int i = 0; i < 30; i++) { + test.run(); + robot.mouseMove(lLoc.x + 20 * i, lLoc.y + 10 * i); + } + robot.mouseRelease(InputEvent.BUTTON1_MASK); + + //back + System.out.println("fast back"); + robot.mousePress(InputEvent.BUTTON1_MASK); + for (int i = 5; i >= 0; i--) { + test.run(); + robot.mouseMove(lLoc.x + 120 * i, lLoc.y + 60 * i); + } + robot.mouseRelease(InputEvent.BUTTON1_MASK); + + pass(); + }//End init() + /***************************************************** + * Standard Test Machinery Section + * DO NOT modify anything in this section -- it's a + * standard chunk of code which has all of the + * synchronisation necessary for the test harness. + * By keeping it the same in all tests, it is easier + * to read and understand someone else's test, as + * well as insuring that all tests behave correctly + * with the test harness. + * There is a section following this for test- + * classes + ******************************************************/ + private static boolean theTestPassed = false; + private static boolean testGeneratedInterrupt = false; + private static String failureMessage = ""; + private static Thread mainThread = null; + private static int sleepTime = 300000; + + // Not sure about what happens if multiple of this test are + // instantiated in the same VM. Being static (and using + // static vars), it aint gonna work. Not worrying about + // it for now. + public static void main(String args[]) throws Exception { + if (!Toolkit.getDefaultToolkit().isDynamicLayoutActive()) { + System.out.println("Dynamic layout is not active. Test passes."); + return; + } + mainThread = Thread.currentThread(); + try { + init(); + } catch (TestPassedException e) { + //The test passed, so just return from main and harness will + // interepret this return as a pass + return; + } + //At this point, neither test pass nor test fail has been + // called -- either would have thrown an exception and ended the + // test, so we know we have multiple threads. + + //Test involves other threads, so sleep and wait for them to + // called pass() or fail() + try { + Thread.sleep(sleepTime); + //Timed out, so fail the test + throw new RuntimeException("Timed out after " + sleepTime / 1000 + " seconds"); + } catch (InterruptedException e) { + //The test harness may have interrupted the test. If so, rethrow the exception + // so that the harness gets it and deals with it. + if (!testGeneratedInterrupt) { + throw e; + } + + //reset flag in case hit this code more than once for some reason (just safety) + testGeneratedInterrupt = false; + + if (theTestPassed == false) { + throw new RuntimeException(failureMessage); + } + } + + }//main + + public static synchronized void setTimeoutTo(int seconds) { + sleepTime = seconds * 1000; + } + + public static synchronized void pass() { + Sysout.println("The test passed."); + Sysout.println("The test is over, hit Ctl-C to stop Java VM"); + //first check if this is executing in main thread + if (mainThread == Thread.currentThread()) { + //Still in the main thread, so set the flag just for kicks, + // and throw a test passed exception which will be caught + // and end the test. + theTestPassed = true; + throw new TestPassedException(); + } + theTestPassed = true; + testGeneratedInterrupt = true; + mainThread.interrupt(); + }//pass() + + public static synchronized void fail() { + //test writer didn't specify why test failed, so give generic + fail("it just plain failed! :-)"); + } + + public static synchronized void fail(String whyFailed) { + Sysout.println("The test failed: " + whyFailed); + Sysout.println("The test is over, hit Ctl-C to stop Java VM"); + //check if this called from main thread + if (mainThread == Thread.currentThread()) { + //If main thread, fail now 'cause not sleeping + throw new RuntimeException(whyFailed); + } + theTestPassed = false; + testGeneratedInterrupt = true; + failureMessage = whyFailed; + mainThread.interrupt(); + }//fail() +}// class JButtonInGlassPane +class TestPassedException extends RuntimeException { +} + +//*********** End Standard Test Machinery Section ********** +//************ Begin classes defined for the test **************** +// if want to make listeners, here is the recommended place for them, then instantiate +// them in init() + +/* Example of a class which may be written as part of a test +class NewClass implements anInterface +{ +static int newVar = 0; + +public void eventDispatched(AWTEvent e) +{ +//Counting events to see if we get enough +eventCount++; + +if( eventCount == 20 ) +{ +//got enough events, so pass + +JButtonInGlassPane.pass(); +} +else if( tries == 20 ) +{ +//tried too many times without getting enough events so fail + +JButtonInGlassPane.fail(); +} + +}// eventDispatched() + +}// NewClass class + + */ +//************** End classes defined for the test ******************* +/**************************************************** +Standard Test Machinery +DO NOT modify anything below -- it's a standard +chunk of code whose purpose is to make user +interaction uniform, and thereby make it simpler +to read and understand someone else's test. + ****************************************************/ +/** +This is part of the standard test machinery. +It creates a dialog (with the instructions), and is the interface +for sending text messages to the user. +To print the instructions, send an array of strings to Sysout.createDialog +WithInstructions method. Put one line of instructions per array entry. +To display a message for the tester to see, simply call Sysout.println +with the string to be displayed. +This mimics System.out.println but works within the test harness as well +as standalone. + */ +class Sysout { + + private static TestDialog dialog; + + public static void createDialogWithInstructions(String[] instructions) { + dialog = new TestDialog(new Frame(), "Instructions"); + dialog.printInstructions(instructions); + dialog.setVisible(true); + println("Any messages for the tester will display here."); + } + + public static void createDialog() { + dialog = new TestDialog(new Frame(), "Instructions"); + String[] defInstr = {"Instructions will appear here. ", ""}; + dialog.printInstructions(defInstr); + dialog.setVisible(true); + println("Any messages for the tester will display here."); + } + + public static void printInstructions(String[] instructions) { + dialog.printInstructions(instructions); + } + + public static void println(String messageIn) { + dialog.displayMessage(messageIn); + System.out.println(messageIn); + } +}// Sysout class + +/** +This is part of the standard test machinery. It provides a place for the +test instructions to be displayed, and a place for interactive messages +to the user to be displayed. +To have the test instructions displayed, see Sysout. +To have a message to the user be displayed, see Sysout. +Do not call anything in this dialog directly. + */ +class TestDialog extends Dialog { + + TextArea instructionsText; + TextArea messageText; + int maxStringLength = 80; + + //DO NOT call this directly, go through Sysout + public TestDialog(Frame frame, String name) { + super(frame, name); + int scrollBoth = TextArea.SCROLLBARS_BOTH; + instructionsText = new TextArea("", 15, maxStringLength, scrollBoth); + add("North", instructionsText); + + messageText = new TextArea("", 5, maxStringLength, scrollBoth); + add("Center", messageText); + + pack(); + + setVisible(true); + }// TestDialog() + + //DO NOT call this directly, go through Sysout + public void printInstructions(String[] instructions) { + //Clear out any current instructions + instructionsText.setText(""); + + //Go down array of instruction strings + + String printStr, remainingStr; + for (int i = 0; i < instructions.length; i++) { + //chop up each into pieces maxSringLength long + remainingStr = instructions[i]; + while (remainingStr.length() > 0) { + //if longer than max then chop off first max chars to print + if (remainingStr.length() >= maxStringLength) { + //Try to chop on a word boundary + int posOfSpace = remainingStr.lastIndexOf(' ', maxStringLength - 1); + + if (posOfSpace <= 0) { + posOfSpace = maxStringLength - 1; + } + + printStr = remainingStr.substring(0, posOfSpace + 1); + remainingStr = remainingStr.substring(posOfSpace + 1); + } //else just print + else { + printStr = remainingStr; + remainingStr = ""; + } + + instructionsText.append(printStr + "\n"); + + }// while + + }// for + + }//printInstructions() + + //DO NOT call this directly, go through Sysout + public void displayMessage(String messageIn) { + messageText.append(messageIn + "\n"); + System.out.println(messageIn); + } +}// TestDialog class + diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java new file mode 100644 index 00000000000..fcfd9ce12be --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java @@ -0,0 +1,164 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import com.sun.awt.AWTUtilities; +import java.awt.Frame; +import java.awt.Panel; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Robot; +import java.awt.event.InputEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import javax.swing.JButton; +import javax.swing.SwingUtilities; + +/** + * AWT/Swing overlapping test for opaque Swing components. + *

This test verify if AWT components are drawn correctly under opaque components. + *

See JDK-6776743 for details + *

See base class for test info. + */ +/* +@test +@bug 6776743 +@summary Opaque overlapping test for each AWT component +@run main OpaqueOverlapping + */ +public class OpaqueOverlapping extends OverlappingTestBase { + + { + useClickValidation = false; + failMessage = "Opacity test mismatchs"; + + // CR 6994264 (Choice autohides dropdown on Solaris 10) + skipClassNames = new String[] { "Choice" }; + } + private String testSeq; + private final static String checkSeq = "010000101"; + private Point heavyLoc; + private JButton light; + private Frame frame = null; + + protected void prepareControls() { + testSeq = ""; + // Create components + if(frame != null) { + frame.setVisible(false); + } + frame = new Frame("OpaqueOverlapping mixing test"); + final Panel panel = new Panel(); + panel.setLayout(null); + + propagateAWTControls(panel); + + // Overlap the buttons + currentAwtControl.setBounds(30, 30, 200, 200); + + light = new JButton(" LW Button "); + light.setBounds(10, 10, 50, 50); + + // Put the components into the frame + panel.add(light); + frame.add(panel); + frame.setBounds(50, 50, 400, 400); + frame.setVisible(true); + + currentAwtControl.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + panel.setComponentZOrder(light, 0); + frame.validate(); + testSeq = testSeq + "0"; + } + }); + light.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + panel.setComponentZOrder(currentAwtControl, 0); + frame.validate(); + testSeq = testSeq + "1"; + } + }); + } + + @Override + protected boolean performTest() { + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + heavyLoc = currentAwtControl.getLocationOnScreen(); + } + }); + } catch (Exception e) { + } + Robot robot = Util.createRobot(); + robot.setAutoDelay(ROBOT_DELAY); + + Util.waitForIdle(robot); + + // Move the mouse pointer to the position where both + // components overlap + robot.mouseMove(heavyLoc.x + 5, heavyLoc.y + 5); + + // Now perform the click at this point for 9 times + // In the middle of the process toggle the opaque + // flag value. + for (int i = 0; i < 9; ++i) { + if (i == 3) { + AWTUtilities.setComponentMixingCutoutShape(light, + new Rectangle()); + } + if (i == 6) { + AWTUtilities.setComponentMixingCutoutShape(light, + null); + } + + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + Util.waitForIdle(robot); + + if (currentAwtControl.getClass() == java.awt.Choice.class && i != 1 && i != 6 && i != 8) { + // due to the fact that Choice doesn't get mouseClicked event if its dropdown is shown + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + Util.waitForIdle(robot); + } + } + + Util.waitForIdle(robot); + + boolean result = testSeq.equals(checkSeq); + if (!result) { + System.err.println("Expected: " + checkSeq); + System.err.println("Observed: " + testSeq); + } + return result; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new OpaqueOverlapping(); + OverlappingTestBase.doMain(args); + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java b/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java new file mode 100644 index 00000000000..896b096b4bb --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/** + * AWT/Swing overlapping test for opaque Choice. + * + * This test case was separated from {@link OpaqueOverlapping} due to CR 6994264 (Choice autohides dropdown on Solaris 10) + */ +/* +@test +@bug 6994264 +@summary Opaque overlapping test for Choice AWT component +@run main OpaqueOverlappingChoice + */ +public class OpaqueOverlappingChoice extends OpaqueOverlapping { + { + onlyClassName = "Choice"; + skipClassNames = null; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new OpaqueOverlappingChoice(); + OverlappingTestBase.doMain(args); + } +} + diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java b/jdk/test/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java new file mode 100644 index 00000000000..f3730b89302 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java @@ -0,0 +1,800 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.*; +import java.awt.event.*; +import java.awt.peer.ComponentPeer; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import javax.swing.*; +import sun.awt.*; +import java.io.*; + +/** + *

This class provides basis for AWT Mixing testing. + *

It provides all standard test machinery and should be used by + * extending and overriding next methods: + *

  • {@link OverlappingTestBase#prepareControls()} - setup UI components + *
  • {@link OverlappingTestBase#performTest()} - run particular test + * Those methods would be run in the loop for each AWT component. + *

    Current AWT component should be added to the tested UI by {@link OverlappingTestBase#propagateAWTControls(java.awt.Container) ()}. + * There AWT components are prepared to be tested as being overlayed by other (e.g. Swing) components - they are colored to + * {@link OverlappingTestBase#AWT_BACKGROUND_COLOR} and throws failure on catching mouse event. + *

    Validation of component being overlayed should be tested by {@link OverlappingTestBase#clickAndBlink(java.awt.Robot, java.awt.Point) } + * See each method javadoc for more details. + * + *

    Due to test machinery limitations all test should be run from their own main() by calling next coe + * + * public static void main(String args[]) throws InterruptedException { + * instance = new YourTestInstance(); + * OverlappingTestBase.doMain(args); + * } + * + * + * @author Sergey Grinev + */ +public abstract class OverlappingTestBase { + // working variables + private static volatile boolean wasHWClicked = false; + private static volatile boolean passed = true; + // constants + /** + * Default color for AWT component used for validate correct drawing of overlapping. Never use it for lightweight components. + */ + protected static final Color AWT_BACKGROUND_COLOR = new Color(21, 244, 54); + protected static Color AWT_VERIFY_COLOR = AWT_BACKGROUND_COLOR; + protected static final int ROBOT_DELAY = 500; + private static final String[] simpleAwtControls = {"Button", "Checkbox", "Label", "TextArea"}; + /** + * Generic strings array. To be used for population of List based controls. + */ + protected static final String[] petStrings = {"Bird", "Cat", "Dog", "Rabbit", "Rhynocephalia Granda", "Bear", "Tiger", "Mustang"}; + // "properties" + /** + * Tests customization. Set this variable to test only control from java.awt + *

    Usage of this variable should be marked with CR being the reason. + *

    Do not use this variable simultaneously with {@link OverlappingTestBase#skipClassNames} + */ + protected String onlyClassName = null; + /** + * For customizing tests. List classes' simple names to skip them from testings. + *

    Usage of this variable should be marked with CR being the reason. + */ + protected String[] skipClassNames = null; + /** + * Set to false to avoid event delivery validation + * @see OverlappingTestBase#clickAndBlink(java.awt.Robot, java.awt.Point, boolean) + */ + protected boolean useClickValidation = true; + /** + * Set to false if test doesn't supposed to verify EmbeddedFrame + */ + protected boolean testEmbeddedFrame = false; + /** + * Set this variable to true if testing embedded frame is impossible (on Mac, for instance, for now). + * The testEmbeddedFrame is explicitly set to true in dozen places. + */ + protected boolean skipTestingEmbeddedFrame = false; + + public static final boolean isMac = System.getProperty("os.name").toLowerCase().contains("os x"); + private boolean isFrameBorderCalculated; + private int borderShift; + + { if (Toolkit.getDefaultToolkit().getClass().getName().matches(".*L.*Toolkit")) { + // No EmbeddedFrame in LWToolkit/LWCToolkit, yet + // And it should be programmed some other way, too, in any case + System.err.println("skipTestingEmbeddedFrame"); + skipTestingEmbeddedFrame = true; + }else { + System.err.println("do not skipTestingEmbeddedFrame"); + } + } + + protected int frameBorderCounter() { + if (!isFrameBorderCalculated) { + try { + new FrameBorderCounter(); // force compilation by jtreg + String JAVA_HOME = System.getProperty("java.home"); + Process p = Runtime.getRuntime().exec(JAVA_HOME + "/bin/java FrameBorderCounter"); + try { + p.waitFor(); + } catch (InterruptedException e) { + e.printStackTrace(); + throw new RuntimeException(e); + } + if (p.exitValue() != 0) { + throw new RuntimeException("FrameBorderCounter exited with not null code!\n" + readInputStream(p.getErrorStream())); + } + borderShift = Integer.parseInt(readInputStream(p.getInputStream()).trim()); + isFrameBorderCalculated = true; + } catch (IOException e) { + e.printStackTrace(); + System.exit(1); + } + } + return borderShift; + } + + public void getVerifyColor() { + try { + final int size = 200; + final SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); + final Point[] p = new Point[1]; + SwingUtilities.invokeAndWait(new Runnable() { + public void run(){ + JFrame frame = new JFrame("set back"); + frame.getContentPane().setBackground(AWT_BACKGROUND_COLOR); + frame.setSize(size, size); + frame.setUndecorated(true); + frame.setVisible(true); + frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + p[0] = frame.getLocation(); + } + }); + Robot robot = new Robot(); + toolkit.realSync(); + Thread.sleep(ROBOT_DELAY); + AWT_VERIFY_COLOR = robot.getPixelColor(p[0].x+size/2, p[0].y+size/2); + System.out.println("Color will be compared with " + AWT_VERIFY_COLOR + " instead of " + AWT_BACKGROUND_COLOR); + } catch (Exception e) { + System.err.println("Cannot get verify color: "+e.getMessage()); + } + } + + private String readInputStream(InputStream is) throws IOException { + byte[] buffer = new byte[4096]; + int len = 0; + StringBuilder sb = new StringBuilder(); + try (InputStreamReader isr = new InputStreamReader(is)) { + while ((len = is.read(buffer)) > 0) { + sb.append(new String(buffer, 0, len)); + } + } + return sb.toString(); + } + + private void setupControl(final Component control) { + if (useClickValidation) { + control.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + System.err.println("ERROR: " + control.getClass() + " received mouse click."); + wasHWClicked = true; + } + }); + } + control.setBackground(AWT_BACKGROUND_COLOR); + control.setForeground(AWT_BACKGROUND_COLOR); + control.setPreferredSize(new Dimension(150, 150)); + control.setFocusable(false); + } + + private void addAwtControl(java.util.List container, final Component control) { + String simpleName = control.getClass().getSimpleName(); + if (onlyClassName != null && !simpleName.equals(onlyClassName)) { + return; + } + if (skipClassNames != null) { + for (String skipMe : skipClassNames) { + if (simpleName.equals(skipMe)) { + return; + } + } + } + setupControl(control); + container.add(control); + } + + private void addSimpleAwtControl(java.util.List container, String className) { + try { + Class definition = Class.forName("java.awt." + className); + Constructor constructor = definition.getConstructor(new Class[]{String.class}); + java.awt.Component component = (java.awt.Component) constructor.newInstance(new Object[]{"AWT Component " + className}); + addAwtControl(container, component); + } catch (Exception ex) { + System.err.println(ex.getMessage()); + fail("Setup error, this jdk doesn't have awt conrol " + className); + } + } + + /** + * Adds current AWT control to container + *

    N.B.: if testEmbeddedFrame == true this method will also add EmbeddedFrame over Canvas + * and it should be called after Frame.setVisible(true) call + * @param container container to hold AWT component + */ + protected final void propagateAWTControls(Container container) { + if (currentAwtControl != null) { + container.add(currentAwtControl); + } else { // embedded frame + try { + + //create embedder + Canvas embedder = new Canvas(); + embedder.setBackground(Color.RED); + embedder.setPreferredSize(new Dimension(150, 150)); + container.add(embedder); + container.setVisible(true); // create peer + + long frameWindow = 0; + String getWindowMethodName = "getHWnd"; + if (Toolkit.getDefaultToolkit().getClass().getName().contains("XToolkit")) { + getWindowMethodName = "getWindow"; + } + ComponentPeer peer = embedder.getPeer(); +// System.err.println("Peer: " + peer); + Method getWindowMethod = peer.getClass().getMethod(getWindowMethodName); + frameWindow = (Long) getWindowMethod.invoke(peer); +// System.err.println("frame peer ID: " + frameWindow); + + String eframeClassName = "sun.awt.windows.WEmbeddedFrame"; + if (Toolkit.getDefaultToolkit().getClass().getName().contains("XToolkit")) { + eframeClassName = "sun.awt.X11.XEmbeddedFrame"; + } + Class eframeClass = Class.forName(eframeClassName); + Constructor eframeCtor = eframeClass.getConstructor(long.class); + EmbeddedFrame eframe = (EmbeddedFrame) eframeCtor.newInstance(frameWindow); + setupControl(eframe); + eframe.setSize(new Dimension(150, 150)); + eframe.setVisible(true); +// System.err.println(eframe.getSize()); + } catch (Exception ex) { + ex.printStackTrace(); + fail("Failed to instantiate EmbeddedFrame: " + ex.getMessage()); + } + } + } + private static final Font hugeFont = new Font("Arial", Font.BOLD, 70); + + private java.util.List getAWTControls() { + java.util.List components = new ArrayList(); + + for (String clazz : simpleAwtControls) { + addSimpleAwtControl(components, clazz); + } + + TextField tf = new TextField(); + tf.setFont(hugeFont); + addAwtControl(components, tf); + + // more complex controls + Choice c = new Choice(); + for (int i = 0; i < petStrings.length; i++) { + c.add(petStrings[i]); + } + addAwtControl(components, c); + c.setPreferredSize(null); + c.setFont(hugeFont); // to make control bigger as setPrefferedSize don't do his job here + + List l = new List(petStrings.length); + for (int i = 0; i < petStrings.length; i++) { + l.add(petStrings[i]); + } + addAwtControl(components, l); + + Canvas canvas = new Canvas(); + canvas.setSize(100, 200); + addAwtControl(components, canvas); + + Scrollbar sb = new Scrollbar(Scrollbar.VERTICAL, 500, 1, 0, 500); + addAwtControl(components, sb); + + Scrollbar sb2 = new Scrollbar(Scrollbar.HORIZONTAL, 500, 1, 0, 500); + addAwtControl(components, sb2); + + return components; + } + /** + * Default shift for {@link OverlappingTestBase#clickAndBlink(java.awt.Robot, java.awt.Point) } + */ + protected static Point shift = new Point(16, 16); + + /** + * Verifies point using specified AWT Robot. Supposes defaultShift == true for {@link OverlappingTestBase#clickAndBlink(java.awt.Robot, java.awt.Point, boolean) }. + * This method is used to verify controls by providing just their plain screen coordinates. + * @param robot AWT Robot. Usually created by {@link Util#createRobot() } + * @param lLoc point to verify + * @see OverlappingTestBase#clickAndBlink(java.awt.Robot, java.awt.Point, boolean) + */ + protected void clickAndBlink(Robot robot, Point lLoc) { + clickAndBlink(robot, lLoc, true); + } + /** + * Default failure message for color check + * @see OverlappingTestBase#performTest() + */ + protected String failMessageColorCheck = "The LW component did not pass pixel color check and is overlapped"; + /** + * Default failure message event check + * @see OverlappingTestBase#performTest() + */ + protected String failMessage = "The LW component did not received the click."; + + private static boolean isValidForPixelCheck(Component component) { + if ((component instanceof java.awt.Scrollbar) || isMac && (component instanceof java.awt.Button)) { + return false; + } + return true; + } + + /** + * Preliminary validation - should be run before overlapping happens to ensure test is correct. + * @param robot AWT Robot. Usually created by {@link Util#createRobot() } + * @param lLoc point to validate to be of {@link OverlappingTestBase#AWT_BACKGROUND_COLOR} + * @param component tested component, should be pointed out as not all components are valid for pixel check. + */ + protected void pixelPreCheck(Robot robot, Point lLoc, Component component) { + if (isValidForPixelCheck(component)) { + int tries = 10; + Color c = null; + while (tries-- > 0) { + c = robot.getPixelColor(lLoc.x, lLoc.y); + System.out.println("Precheck. color: "+c+" compare with "+AWT_VERIFY_COLOR); + if (c.equals(AWT_VERIFY_COLOR)) { + return; + } + try { + Thread.sleep(100); + } catch (InterruptedException e) { + } + } + System.err.println(lLoc + ": " + c); + fail("Dropdown test setup failure, colored part of AWT component is not located at click area"); + } + } + + /** + * Verifies point using specified AWT Robot. + *

    Firstly, verifies point by color pixel check + *

    Secondly, verifies event delivery by mouse click + * @param robot AWT Robot. Usually created by {@link Util#createRobot() } + * @param lLoc point to verify + * @param defaultShift if true verified position will be shifted by {@link OverlappingTestBase#shift }. + */ + protected void clickAndBlink(Robot robot, Point lLoc, boolean defaultShift) { + Point loc = lLoc.getLocation(); + //check color + Util.waitForIdle(robot); + try{ + Thread.sleep(500); + }catch(Exception exx){ + exx.printStackTrace(); + } + + if (defaultShift) { + loc.translate(shift.x, shift.y); + } + if (!(System.getProperty("os.name").toLowerCase().contains("os x"))) { + Color c = robot.getPixelColor(loc.x, loc.y); + System.out.println("C&B. color: "+c+" compare with "+AWT_VERIFY_COLOR); + if (c.equals(AWT_VERIFY_COLOR)) { + fail(failMessageColorCheck); + passed = false; + } + + // perform click + Util.waitForIdle(robot); + } + + robot.mouseMove(loc.x, loc.y); + + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + Util.waitForIdle(robot); + } + + /** + * This method should be overriden with code which setups UI for testing. + * Code in this method will be called only from AWT thread so Swing operations can be called directly. + * + * @see {@link OverlappingTestBase#propagateAWTControls(java.awt.Container) } for instructions about adding tested AWT control to UI + */ + protected abstract void prepareControls(); + + /** + * This method should be overriden with test execution. It will not be called from AWT thread so all Swing operations should be treated accordingly. + * @return true if test passed. Otherwise fail with default fail message. + * @see {@link OverlappingTestBase#failMessage} default fail message + */ + protected abstract boolean performTest(); + /** + * This method can be overriden with cleanup routines. It will be called from AWT thread so all Swing operations should be treated accordingly. + */ + protected void cleanup() { + // intentionally do nothing + } + /** + * Currect tested AWT Control. Usually shouldn't be accessed directly. + * + * @see {@link OverlappingTestBase#propagateAWTControls(java.awt.Container) } for instructions about adding tested AWT control to UI + */ + protected Component currentAwtControl; + + private void testComponent(Component component) throws InterruptedException, InvocationTargetException { + currentAwtControl = component; + System.out.println("Testing " + currentAwtControl.getClass().getSimpleName()); + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + prepareControls(); + } + }); + if (component != null) { + Util.waitTillShown(component); + } + Util.waitForIdle(null); + try { + Thread.sleep(500); // wait for graphic effects on systems like Win7 + } catch (InterruptedException ex) { + } + if (!instance.performTest()) { + fail(failMessage); + passed = false; + } + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + cleanup(); + } + }); + } + + private void testEmbeddedFrame() throws InvocationTargetException, InterruptedException { + System.out.println("Testing EmbeddedFrame"); + currentAwtControl = null; + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + prepareControls(); + } + }); + Util.waitForIdle(null); + try { + Thread.sleep(500); // wait for graphic effects on systems like Win7 + } catch (InterruptedException ex) { + } + if (!instance.performTest()) { + fail(failMessage); + passed = false; + } + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + cleanup(); + } + }); + } + + private void testAwtControls() throws InterruptedException { + try { + for (Component component : getAWTControls()) { + testComponent(component); + } + if (testEmbeddedFrame && !skipTestingEmbeddedFrame) { + testEmbeddedFrame(); + } + } catch (InvocationTargetException ex) { + ex.printStackTrace(); + fail(ex.getMessage()); + } + } + /** + * Used by standard test machinery. See usage at {@link OverlappingTestBase } + */ + protected static OverlappingTestBase instance; + + protected OverlappingTestBase() { + getVerifyColor(); + } + + /***************************************************** + * Standard Test Machinery Section + * DO NOT modify anything in this section -- it's a + * standard chunk of code which has all of the + * synchronisation necessary for the test harness. + * By keeping it the same in all tests, it is easier + * to read and understand someone else's test, as + * well as insuring that all tests behave correctly + * with the test harness. + * There is a section following this for test- + * classes + ******************************************************/ + private static void init() throws InterruptedException { + //*** Create instructions for the user here *** + //System.setProperty("sun.awt.disableMixing", "true"); + + String[] instructions = { + "This is an AUTOMATIC test, simply wait until it is done.", + "The result (passed or failed) will be shown in the", + "message window below." + }; + Sysout.createDialog(); + Sysout.printInstructions(instructions); + + instance.testAwtControls(); + + if (wasHWClicked) { + fail("HW component received the click."); + passed = false; + } + if (passed) { + pass(); + } + }//End init() + private static boolean theTestPassed = false; + private static boolean testGeneratedInterrupt = false; + private static String failureMessage = ""; + private static Thread mainThread = null; + private static int sleepTime = 300000; + + // Not sure about what happens if multiple of this test are + // instantiated in the same VM. Being static (and using + // static vars), it aint gonna work. Not worrying about + // it for now. + /** + * Starting point for test runs. See usage at {@link OverlappingTestBase } + * @param args regular main args, not used. + * @throws InterruptedException + */ + public static void doMain(String args[]) throws InterruptedException { + mainThread = Thread.currentThread(); + try { + init(); + } catch (TestPassedException e) { + //The test passed, so just return from main and harness will + // interepret this return as a pass + return; + } + //At this point, neither test pass nor test fail has been + // called -- either would have thrown an exception and ended the + // test, so we know we have multiple threads. + + //Test involves other threads, so sleep and wait for them to + // called pass() or fail() + try { + Thread.sleep(sleepTime); + //Timed out, so fail the test + throw new RuntimeException("Timed out after " + sleepTime / 1000 + " seconds"); + } catch (InterruptedException e) { + //The test harness may have interrupted the test. If so, rethrow the exception + // so that the harness gets it and deals with it. + if (!testGeneratedInterrupt) { + throw e; + } + + //reset flag in case hit this code more than once for some reason (just safety) + testGeneratedInterrupt = false; + + if (theTestPassed == false) { + throw new RuntimeException(failureMessage); + } + } + + }//main + + /** + * Test will fail if not passed after this timeout. Default timeout is 300 seconds. + * @param seconds timeout in seconds + */ + public static synchronized void setTimeoutTo(int seconds) { + sleepTime = seconds * 1000; + } + + /** + * Set test as passed. Usually shoudn't be called directly. + */ + public static synchronized void pass() { + Sysout.println("The test passed."); + Sysout.println("The test is over, hit Ctl-C to stop Java VM"); + //first check if this is executing in main thread + if (mainThread == Thread.currentThread()) { + //Still in the main thread, so set the flag just for kicks, + // and throw a test passed exception which will be caught + // and end the test. + theTestPassed = true; + throw new TestPassedException(); + } + theTestPassed = true; + testGeneratedInterrupt = true; + mainThread.interrupt(); + }//pass() + + /** + * Fail test generic message. + */ + public static synchronized void fail() { + //test writer didn't specify why test failed, so give generic + fail("it just plain failed! :-)"); + } + + /** + * Fail test providing specific reason. + * @param whyFailed reason + */ + public static synchronized void fail(String whyFailed) { + Sysout.println("The test failed: " + whyFailed); + Sysout.println("The test is over, hit Ctl-C to stop Java VM"); + //check if this called from main thread + if (mainThread == Thread.currentThread()) { + //If main thread, fail now 'cause not sleeping + throw new RuntimeException(whyFailed); + } + theTestPassed = false; + testGeneratedInterrupt = true; + failureMessage = whyFailed; + mainThread.interrupt(); + }//fail() +}// class LWComboBox +class TestPassedException extends RuntimeException { +} + +//*********** End Standard Test Machinery Section ********** +//************ Begin classes defined for the test **************** +// if want to make listeners, here is the recommended place for them, then instantiate +// them in init() + +/* Example of a class which may be written as part of a test +class NewClass implements anInterface +{ +static int newVar = 0; + +public void eventDispatched(AWTEvent e) +{ +//Counting events to see if we get enough +eventCount++; + +if( eventCount == 20 ) +{ +//got enough events, so pass + +LWComboBox.pass(); +} +else if( tries == 20 ) +{ +//tried too many times without getting enough events so fail + +LWComboBox.fail(); +} + +}// eventDispatched() + +}// NewClass class + + */ +//************** End classes defined for the test ******************* +/**************************************************** +Standard Test Machinery +DO NOT modify anything below -- it's a standard +chunk of code whose purpose is to make user +interaction uniform, and thereby make it simpler +to read and understand someone else's test. + ****************************************************/ +/** +This is part of the standard test machinery. +It creates a dialog (with the instructions), and is the interface +for sending text messages to the user. +To print the instructions, send an array of strings to Sysout.createDialog +WithInstructions method. Put one line of instructions per array entry. +To display a message for the tester to see, simply call Sysout.println +with the string to be displayed. +This mimics System.out.println but works within the test harness as well +as standalone. + */ +class Sysout { + private static TestDialog dialog; + + public static void createDialogWithInstructions(String[] instructions) { + dialog = new TestDialog(new Frame(), "Instructions"); + dialog.printInstructions(instructions); + //dialog.setVisible(true); + println("Any messages for the tester will display here."); + } + + public static void createDialog() { + dialog = new TestDialog(new Frame(), "Instructions"); + String[] defInstr = {"Instructions will appear here. ", ""}; + dialog.printInstructions(defInstr); + //dialog.setVisible(true); + println("Any messages for the tester will display here."); + } + + public static void printInstructions(String[] instructions) { + dialog.printInstructions(instructions); + } + + public static void println(String messageIn) { + dialog.displayMessage(messageIn); + System.out.println(messageIn); + } +}// Sysout class + +/** +This is part of the standard test machinery. It provides a place for the +test instructions to be displayed, and a place for interactive messages +to the user to be displayed. +To have the test instructions displayed, see Sysout. +To have a message to the user be displayed, see Sysout. +Do not call anything in this dialog directly. + */ +class TestDialog extends Dialog { + TextArea instructionsText; + TextArea messageText; + int maxStringLength = 80; + + //DO NOT call this directly, go through Sysout + public TestDialog(Frame frame, String name) { + super(frame, name); + int scrollBoth = TextArea.SCROLLBARS_BOTH; + instructionsText = new TextArea("", 15, maxStringLength, scrollBoth); + add("North", instructionsText); + + messageText = new TextArea("", 5, maxStringLength, scrollBoth); + add("Center", messageText); + + pack(); + + //setVisible(true); + }// TestDialog() + + //DO NOT call this directly, go through Sysout + public void printInstructions(String[] instructions) { + //Clear out any current instructions + instructionsText.setText(""); + + //Go down array of instruction strings + + String printStr, remainingStr; + for (int i = 0; i < instructions.length; i++) { + //chop up each into pieces maxSringLength long + remainingStr = instructions[i]; + while (remainingStr.length() > 0) { + //if longer than max then chop off first max chars to print + if (remainingStr.length() >= maxStringLength) { + //Try to chop on a word boundary + int posOfSpace = remainingStr.lastIndexOf(' ', maxStringLength - 1); + + if (posOfSpace <= 0) { + posOfSpace = maxStringLength - 1; + } + + printStr = remainingStr.substring(0, posOfSpace + 1); + remainingStr = remainingStr.substring(posOfSpace + 1); + } //else just print + else { + printStr = remainingStr; + remainingStr = ""; + } + + instructionsText.append(printStr + "\n"); + + }// while + + }// for + + }//printInstructions() + + //DO NOT call this directly, go through Sysout + public void displayMessage(String messageIn) { + messageText.append(messageIn + "\n"); + System.out.println(messageIn); + } +}// TestDialog class + diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java b/jdk/test/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java new file mode 100644 index 00000000000..4d81127a772 --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java @@ -0,0 +1,160 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.*; +import java.awt.event.*; +import javax.swing.*; + +/** + * Base class for testing overlapping of Swing and AWT component put into one frame. + * Validates drawing and event delivery at the components intersection. + *

    See base class for usage + * + * @author Sergey Grinev +*/ +public abstract class SimpleOverlappingTestBase extends OverlappingTestBase { + + { + testEmbeddedFrame = true; + } + + /** + * Event delivery validation. If set to true (default) tested lightweight component will be provided + * with mouse listener which should be called in order for test to pass. + */ + protected final boolean useDefaultClickValidation; + + /** + * Constructor which sets {@link SimpleOverlappingTestBase#useDefaultClickValidation } + * @param defaultClickValidation + */ + protected SimpleOverlappingTestBase(boolean defaultClickValidation) { + super(); + this.useDefaultClickValidation = defaultClickValidation; + } + + public SimpleOverlappingTestBase() { + this(true); + } + + //overridables + /** + * Successors override this method providing swing component for testing + * @return swing component to test + */ + protected abstract JComponent getSwingComponent(); + + /** + * For tests debugging. Please, ignore. + */ + protected static final boolean debug = false; + + /** + * Should be set to true if test isn't using {@link SimpleOverlappingTestBase#useDefaultClickValidation } + */ + protected volatile boolean wasLWClicked = false; + + /** + * Current tested lightweight component + * @see SimpleOverlappingTestBase#getSwingComponent() + */ + protected JComponent testedComponent; + + /** + * Setups simple frame with lightweight component returned by {@link SimpleOverlappingTestBase#getSwingComponent() } + * Called by base class. + */ + protected void prepareControls() { + wasLWClicked = false; + + final JFrame f = new JFrame("Mixing : Simple Overlapping test"); + f.setLayout(new SpringLayout()); + f.setSize(200, 200); + + testedComponent = getSwingComponent(); + + if (useDefaultClickValidation) { + testedComponent.addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + wasLWClicked = true; + f.setVisible(false); + } + }); + } + + if (!debug) { + f.add(testedComponent); + } else { + System.err.println("Warning: DEBUG MODE"); + } + + propagateAWTControls(f); + + f.setVisible(true); + } + + /** + * AWT Robot instance. Shouldn't be used in most cases. + */ + protected Robot robot; + + /** + * Run test by {@link OverlappingTestBase#clickAndBlink(java.awt.Robot, java.awt.Point) } validation for current lightweight component. + *

    Called by base class. + * @return true if test passed + */ + protected boolean performTest() { + testedComponent.requestFocus(); + + // run robot + robot = Util.createRobot(); + robot.setAutoDelay(20); + + // get coord + Point lLoc = !debug ? testedComponent.getLocationOnScreen() : new Point(70, 30); + Util.waitForIdle(null); + /* this is a workaround for certain jtreg(?) focus issue: + tests fail starting after failing mixing tests but always pass alone. + */ + JFrame ancestor = (JFrame)(testedComponent.getTopLevelAncestor()); + if( ancestor != null ) { + Point ancestorLoc = ancestor.getLocationOnScreen(); + ancestorLoc.translate(ancestor.getWidth()/2-15, 2); + robot.mouseMove(ancestorLoc.x, ancestorLoc.y); + Util.waitForIdle(robot); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.delay(50); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + Util.waitForIdle(robot); + } + + clickAndBlink(robot, lLoc); + Util.waitForIdle(null); + + return wasLWClicked; + } + +} + diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/Util.java b/jdk/test/java/awt/Mixing/AWT_Mixing/Util.java new file mode 100644 index 00000000000..6bebdc881dc --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/Util.java @@ -0,0 +1,601 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Component; +import java.awt.Frame; +import java.awt.Dialog; +import java.awt.Window; +import java.awt.Button; +import java.awt.Point; +import java.awt.Dimension; +import java.awt.Rectangle; +import java.awt.Robot; +import java.awt.Toolkit; +import java.awt.IllegalComponentStateException; +import java.awt.AWTException; +import java.awt.AWTEvent; + +import java.awt.event.InputEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.event.ActionEvent; +import java.awt.event.FocusEvent; +import java.awt.event.WindowListener; +import java.awt.event.WindowFocusListener; +import java.awt.event.FocusListener; +import java.awt.event.ActionListener; + +import java.awt.peer.FramePeer; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import java.security.PrivilegedAction; +import java.security.AccessController; + +import java.util.concurrent.atomic.AtomicBoolean; + +/** + *

    This class contains utilities useful for regression testing. + *

    When using jtreg you would include this class into the build + * list via something like: + * 

    +     &library ../../../../share/lib/AWT_Mixing/src/regtesthelpers/
+     &build Util
+     &run main YourTest
+
    + * Note that if you are about to create a test based on + * Applet-template, then put those lines into html-file, not in java-file. + *

    And put an + * import regtesthelpers.Util; + * into the java source of test. +*/ +public final class Util { + private Util() {} // this is a helper class with static methods :) + + /* + * @throws RuntimeException when creation failed + */ + public static Robot createRobot() { + try { + return new Robot(); + } catch (AWTException e) { + throw new RuntimeException("Error: unable to create robot", e); + } + } + + public static Frame createEmbeddedFrame(final Frame embedder) + throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException, NoSuchMethodException, + InstantiationException, InvocationTargetException + { + Toolkit tk = Toolkit.getDefaultToolkit(); + FramePeer frame_peer = (FramePeer) embedder.getPeer(); + System.out.println("frame's peer = " + frame_peer); + if ("sun.awt.windows.WToolkit".equals(tk.getClass().getName())) { + Class comp_peer_class = + Class.forName("sun.awt.windows.WComponentPeer"); + System.out.println("comp peer class = " + comp_peer_class); + Field hwnd_field = comp_peer_class.getDeclaredField("hwnd"); + hwnd_field.setAccessible(true); + System.out.println("hwnd_field =" + hwnd_field); + long hwnd = hwnd_field.getLong(frame_peer); + System.out.println("hwnd = " + hwnd); + + Class clazz = Class.forName("sun.awt.windows.WEmbeddedFrame"); + Constructor constructor = clazz.getConstructor (new Class [] {Long.TYPE}); + return (Frame) constructor.newInstance (new Object[] {hwnd}); + } else if ("sun.awt.X11.XToolkit".equals(tk.getClass().getName())) { + Class x_base_window_class = Class.forName("sun.awt.X11.XBaseWindow"); + System.out.println("x_base_window_class = " + x_base_window_class); + Method get_window = x_base_window_class.getMethod("getWindow", new Class[0]); + System.out.println("get_window = " + get_window); + long window = (Long) get_window.invoke(frame_peer, new Object[0]); + System.out.println("window = " + window); + Class clazz = Class.forName("sun.awt.X11.XEmbeddedFrame"); + Constructor constructor = clazz.getConstructor (new Class [] {Long.TYPE, Boolean.TYPE}); + return (Frame) constructor.newInstance (new Object[] {window, true}); + } + + throw new RuntimeException("Unexpected toolkit - " + tk); + } + + /** + * Makes the window visible and waits until it's shown. + */ + public static void showWindowWait(Window win) { + win.setVisible(true); + waitTillShown(win); + } + + /** + * Moves mouse pointer in the center of given {@code comp} component + * using {@code robot} parameter. + */ + public static void pointOnComp(final Component comp, final Robot robot) { + Rectangle bounds = new Rectangle(comp.getLocationOnScreen(), comp.getSize()); + robot.mouseMove(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2); + } + + /** + * Moves mouse pointer in the center of a given {@code comp} component + * and performs a left mouse button click using the {@code robot} parameter + * with the {@code delay} delay between press and release. + */ + public static void clickOnComp(final Component comp, final Robot robot, int delay) { + pointOnComp(comp, robot); + robot.delay(delay); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.delay(delay); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + } + + /** + * Moves mouse pointer in the center of a given {@code comp} component + * and performs a left mouse button click using the {@code robot} parameter + * with the default delay between press and release. + */ + public static void clickOnComp(final Component comp, final Robot robot) { + clickOnComp(comp, robot, 50); + } + + /* + * Clicks on a title of Frame/Dialog. + * WARNING: it may fail on some platforms when the window is not wide enough. + */ + public static void clickOnTitle(final Window decoratedWindow, final Robot robot) { + Point p = decoratedWindow.getLocationOnScreen(); + Dimension d = decoratedWindow.getSize(); + + if (decoratedWindow instanceof Frame || decoratedWindow instanceof Dialog) { + robot.mouseMove(p.x + (int)(d.getWidth()/2), p.y + (int)decoratedWindow.getInsets().top/2); + robot.delay(50); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.delay(50); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + } + } + + public static void waitForIdle(final Robot robot) { + // we do not use robot for now, use SunToolkit.realSync() instead + ((sun.awt.SunToolkit)Toolkit.getDefaultToolkit()).realSync(); + } + + public static Field getField(final Class klass, final String fieldName) { + return AccessController.doPrivileged(new PrivilegedAction() { + public Field run() { + try { + Field field = klass.getDeclaredField(fieldName); + assert (field != null); + field.setAccessible(true); + return field; + } catch (SecurityException se) { + throw new RuntimeException("Error: unexpected exception caught!", se); + } catch (NoSuchFieldException nsfe) { + throw new RuntimeException("Error: unexpected exception caught!", nsfe); + } + } + }); + } + + /* + * Waits for a notification and for a boolean condition to become true. + * The method returns when the above conditions are fullfilled or when the timeout + * occurs. + * + * @param condition the object to be notified and the booelan condition to wait for + * @param timeout the maximum time to wait in milliseconds + * @param catchExceptions if {@code true} the method catches InterruptedException + * @return the final boolean value of the {@code condition} + * @throws InterruptedException if the awaiting proccess has been interrupted + */ + public static boolean waitForConditionEx(final AtomicBoolean condition, long timeout) + throws InterruptedException + { + synchronized (condition) { + long startTime = System.currentTimeMillis(); + while (!condition.get()) { + condition.wait(timeout); + if (System.currentTimeMillis() - startTime >= timeout ) { + break; + } + } + } + return condition.get(); + } + + /* + * The same as {@code waitForConditionEx(AtomicBoolean, long)} except that it + * doesn't throw InterruptedException. + */ + public static boolean waitForCondition(final AtomicBoolean condition, long timeout) { + try { + return waitForConditionEx(condition, timeout); + } catch (InterruptedException e) { + throw new RuntimeException("Error: unexpected exception caught!", e); + } + } + + /* + * The same as {@code waitForConditionEx(AtomicBoolean, long)} but without a timeout. + */ + public static void waitForConditionEx(final AtomicBoolean condition) + throws InterruptedException + { + synchronized (condition) { + while (!condition.get()) { + condition.wait(); + } + } + } + + /* + * The same as {@code waitForConditionEx(AtomicBoolean)} except that it + * doesn't throw InterruptedException. + */ + public static void waitForCondition(final AtomicBoolean condition) { + try { + waitForConditionEx(condition); + } catch (InterruptedException e) { + throw new RuntimeException("Error: unexpected exception caught!", e); + } + } + + public static void waitTillShownEx(final Component comp) throws InterruptedException { + while (true) { + try { + Thread.sleep(100); + comp.getLocationOnScreen(); + break; + } catch (IllegalComponentStateException e) {} + } + } + public static void waitTillShown(final Component comp) { + try { + waitTillShownEx(comp); + } catch (InterruptedException e) { + throw new RuntimeException("Error: unexpected exception caught!", e); + } + } + + /** + * Drags from one point to another with the specified mouse button pressed. + * + * @param robot a robot to use for moving the mouse, etc. + * @param startPoint a start point of the drag + * @param endPoint an end point of the drag + * @param button one of {@code InputEvent.BUTTON1_MASK}, + * {@code InputEvent.BUTTON2_MASK}, {@code InputEvent.BUTTON3_MASK} + * + * @throws IllegalArgumentException if {@code button} is not one of + * {@code InputEvent.BUTTON1_MASK}, {@code InputEvent.BUTTON2_MASK}, + * {@code InputEvent.BUTTON3_MASK} + */ + public static void drag(Robot robot, Point startPoint, Point endPoint, int button) { + if (!(button == InputEvent.BUTTON1_MASK || button == InputEvent.BUTTON2_MASK + || button == InputEvent.BUTTON3_MASK)) + { + throw new IllegalArgumentException("invalid mouse button"); + } + + robot.mouseMove(startPoint.x, startPoint.y); + robot.mousePress(button); + try { + mouseMove(robot, startPoint, endPoint); + } finally { + robot.mouseRelease(button); + } + } + + /** + * Moves the mouse pointer from one point to another. + * Uses Bresenham's algorithm. + * + * @param robot a robot to use for moving the mouse + * @param startPoint a start point of the drag + * @param endPoint an end point of the drag + */ + public static void mouseMove(Robot robot, Point startPoint, Point endPoint) { + int dx = endPoint.x - startPoint.x; + int dy = endPoint.y - startPoint.y; + + int ax = Math.abs(dx) * 2; + int ay = Math.abs(dy) * 2; + + int sx = signWOZero(dx); + int sy = signWOZero(dy); + + int x = startPoint.x; + int y = startPoint.y; + + int d = 0; + + if (ax > ay) { + d = ay - ax/2; + while (true){ + robot.mouseMove(x, y); + robot.delay(50); + + if (x == endPoint.x){ + return; + } + if (d >= 0){ + y = y + sy; + d = d - ax; + } + x = x + sx; + d = d + ay; + } + } else { + d = ax - ay/2; + while (true){ + robot.mouseMove(x, y); + robot.delay(50); + + if (y == endPoint.y){ + return; + } + if (d >= 0){ + x = x + sx; + d = d - ay; + } + y = y + sy; + d = d + ax; + } + } + } + + private static int signWOZero(int i){ + return (i > 0)? 1: -1; + } + + private static int sign(int n) { + return n < 0 ? -1 : n == 0 ? 0 : 1; + } + + /** Returns {@code WindowListener} instance that diposes {@code Window} on + * "window closing" event. + * + * @return the {@code WindowListener} instance that could be set + * on a {@code Window}. After that + * the {@code Window} is disposed when "window closed" + * event is sent to the {@code Window} + */ + public static WindowListener getClosingWindowAdapter() { + return new WindowAdapter () { + public void windowClosing(WindowEvent e) { + e.getWindow().dispose(); + } + }; + } + + /* + * The values directly map to the ones of + * sun.awt.X11.XWM & sun.awt.motif.MToolkit classes. + */ + public final static int + UNDETERMINED_WM = 1, + NO_WM = 2, + OTHER_WM = 3, + OPENLOOK_WM = 4, + MOTIF_WM = 5, + CDE_WM = 6, + ENLIGHTEN_WM = 7, + KDE2_WM = 8, + SAWFISH_WM = 9, + ICE_WM = 10, + METACITY_WM = 11, + COMPIZ_WM = 12, + LG3D_WM = 13; + + /* + * Returns -1 in case of not X Window or any problems. + */ + public static int getWMID() { + Class clazz = null; + try { + if ("sun.awt.X11.XToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName())) { + clazz = Class.forName("sun.awt.X11.XWM"); + } else if ("sun.awt.motif.MToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName())) { + clazz = Class.forName("sun.awt.motif.MToolkit"); + } + } catch (ClassNotFoundException cnfe) { + cnfe.printStackTrace(); + } + if (clazz == null) { + return -1; + } + + try { + final Class _clazz = clazz; + Method m_getWMID = (Method)AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + try { + Method method = _clazz.getDeclaredMethod("getWMID", new Class[] {}); + if (method != null) { + method.setAccessible(true); + } + return method; + } catch (NoSuchMethodException e) { + assert false; + } catch (SecurityException e) { + assert false; + } + return null; + } + }); + return ((Integer)m_getWMID.invoke(null, new Object[] {})).intValue(); + } catch (IllegalAccessException iae) { + iae.printStackTrace(); + } catch (InvocationTargetException ite) { + ite.printStackTrace(); + } + return -1; + } + + + //////////////////////////// + // Some stuff to test focus. + //////////////////////////// + + private static WindowGainedFocusListener wgfListener = new WindowGainedFocusListener(); + private static FocusGainedListener fgListener = new FocusGainedListener(); + private static ActionPerformedListener apListener = new ActionPerformedListener(); + + private abstract static class EventListener { + AtomicBoolean notifier = new AtomicBoolean(false); + Component comp; + boolean printEvent; + + public void listen(Component comp, boolean printEvent) { + this.comp = comp; + this.printEvent = printEvent; + notifier.set(false); + setListener(comp); + } + + public AtomicBoolean getNotifier() { + return notifier; + } + + abstract void setListener(Component comp); + + void printAndNotify(AWTEvent e) { + if (printEvent) { + System.err.println(e); + } + synchronized (notifier) { + notifier.set(true); + notifier.notifyAll(); + } + } + } + + private static class WindowGainedFocusListener extends EventListener implements WindowFocusListener { + + void setListener(Component comp) { + ((Window)comp).addWindowFocusListener(this); + } + + public void windowGainedFocus(WindowEvent e) { + + ((Window)comp).removeWindowFocusListener(this); + printAndNotify(e); + } + + public void windowLostFocus(WindowEvent e) {} + } + + private static class FocusGainedListener extends EventListener implements FocusListener { + + void setListener(Component comp) { + comp.addFocusListener(this); + } + + public void focusGained(FocusEvent e) { + comp.removeFocusListener(this); + printAndNotify(e); + } + + public void focusLost(FocusEvent e) {} + } + + private static class ActionPerformedListener extends EventListener implements ActionListener { + + void setListener(Component comp) { + ((Button)comp).addActionListener(this); + } + + public void actionPerformed(ActionEvent e) { + ((Button)comp).removeActionListener(this); + printAndNotify(e); + } + } + + private static boolean trackEvent(int eventID, Component comp, Runnable action, int time, boolean printEvent) { + EventListener listener = null; + + switch (eventID) { + case WindowEvent.WINDOW_GAINED_FOCUS: + listener = wgfListener; + break; + case FocusEvent.FOCUS_GAINED: + listener = fgListener; + break; + case ActionEvent.ACTION_PERFORMED: + listener = apListener; + break; + } + + listener.listen(comp, printEvent); + action.run(); + return Util.waitForCondition(listener.getNotifier(), time); + } + + /* + * Tracks WINDOW_GAINED_FOCUS event for a window caused by an action. + * @param window the window to track the event for + * @param action the action to perform + * @param time the max time to wait for the event + * @param printEvent should the event received be printed or doesn't + * @return true if the event has been received, otherwise false + */ + public static boolean trackWindowGainedFocus(Window window, Runnable action, int time, boolean printEvent) { + return trackEvent(WindowEvent.WINDOW_GAINED_FOCUS, window, action, time, printEvent); + } + + /* + * Tracks FOCUS_GAINED event for a component caused by an action. + * @see #trackWindowGainedFocus + */ + public static boolean trackFocusGained(Component comp, Runnable action, int time, boolean printEvent) { + return trackEvent(FocusEvent.FOCUS_GAINED, comp, action, time, printEvent); + } + + /* + * Tracks ACTION_PERFORMED event for a button caused by an action. + * @see #trackWindowGainedFocus + */ + public static boolean trackActionPerformed(Button button, Runnable action, int time, boolean printEvent) { + return trackEvent(ActionEvent.ACTION_PERFORMED, button, action, time, printEvent); + } + + /* + * Requests focus on the component provided and waits for the result. + * @return true if the component has been focused, false otherwise. + */ + public static boolean focusComponent(Component comp, int time) { + return focusComponent(comp, time, false); + } + public static boolean focusComponent(final Component comp, int time, boolean printEvent) { + return trackFocusGained(comp, + new Runnable() { + public void run() { + comp.requestFocus(); + } + }, + time, printEvent); + + } +} diff --git a/jdk/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java b/jdk/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java new file mode 100644 index 00000000000..22e1e7730cd --- /dev/null +++ b/jdk/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.GridLayout; +import java.awt.Point; +import java.awt.Robot; +import java.awt.event.InputEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.SwingUtilities; + +/** + * AWT/Swing overlapping test for viewport + *

    This test verify if AWT components are drawn correctly being partially shown through viewport + *

    See CR6778882 for details + *

    See base class for test info. + */ +/* +@test +@bug 6778882 +@summary Viewport overlapping test for each AWT component +@author sergey.grinev@oracle.com: area=awt.mixing +@run main ViewportOverlapping + */ +public class ViewportOverlapping extends OverlappingTestBase { + + private volatile int frameClicked; + private Point hLoc; + private Point vLoc; + private Point testLoc; + private Point resizeLoc; + + private JFrame f; + private JPanel p; + private JButton b; + private JScrollPane scrollPane; + + protected void prepareControls() { + p = new JPanel(new GridLayout(0, 1)); + propagateAWTControls(p); + b = new JButton("Space extender"); + p.add(b); + p.setPreferredSize(new Dimension(500, 500)); + scrollPane = new JScrollPane(p); + + f = new JFrame(); + f.addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + frameClicked++; + } + }); + f.getContentPane().add(scrollPane, BorderLayout.CENTER); + ((JComponent) f.getContentPane()).setBorder( + BorderFactory.createEmptyBorder(50, 50, 50, 50)); + f.setSize(400, 400); + f.setLocationRelativeTo(null); + f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + f.setVisible(true); + } + + @Override + protected boolean performTest() { + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + // prepare test data + frameClicked = 0; + + b.requestFocus(); + + scrollPane.getHorizontalScrollBar().setUnitIncrement(40); + scrollPane.getVerticalScrollBar().setUnitIncrement(40); + + hLoc = scrollPane.getHorizontalScrollBar().getLocationOnScreen(); + hLoc.translate(scrollPane.getHorizontalScrollBar().getWidth() - 3, 3); + vLoc = scrollPane.getVerticalScrollBar().getLocationOnScreen(); + vLoc.translate(3, scrollPane.getVerticalScrollBar().getHeight() - 3); + + testLoc = p.getLocationOnScreen(); + testLoc.translate(-3, -3); + + resizeLoc = f.getLocationOnScreen(); + resizeLoc.translate(f.getWidth() - 1, f.getHeight() - 1); + } + }); + } catch (Exception e) { + e.printStackTrace(); + System.exit(1); + } + // run robot + Robot robot = Util.createRobot(); + robot.setAutoDelay(ROBOT_DELAY); + + robot.mouseMove(hLoc.x, hLoc.y); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + Util.waitForIdle(robot); + + robot.mouseMove(vLoc.x, vLoc.y); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + Util.waitForIdle(robot); + + clickAndBlink(robot, testLoc, false); + robot.mouseMove(resizeLoc.x, resizeLoc.y); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.mouseMove(resizeLoc.x + 5, resizeLoc.y + 5); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + Util.waitForIdle(robot); + + clickAndBlink(robot, testLoc, false); + return frameClicked == 2; + } + + // this strange plumbing stuff is required due to "Standard Test Machinery" in base class + public static void main(String args[]) throws InterruptedException { + instance = new ViewportOverlapping(); + OverlappingTestBase.doMain(args); + } +} From 536ad9409e3bd922738d629c9608400aec5da041 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 29 Apr 2014 15:46:16 -0400 Subject: [PATCH 21/50] 8042159: Allow using a system-installed lcms2 Reviewed-by: andrew, ihse, prr --- jdk/make/lib/Awt2dLibraries.gmk | 29 +++++++++++++++---- .../share/native/sun/java2d/cmm/lcms/LCMS.c | 2 +- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk index de86e3f86a4..6d1cf628c65 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -657,17 +657,34 @@ endif ########################################################################################## +LIBLCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms + +ifeq ($(USE_EXTERNAL_LCMS), true) + # If we're using an external library, we'll just need the wrapper part. + # By including it explicitely, all other files will be excluded. + BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c + BUILD_LIBLCMS_HEADERS := +else + BUILD_LIBLCMS_INCLUDE_FILES := + # If we're using the bundled library, we'll need to include it in the + # include path explicitly. Otherwise the system headers will be used. + BUILD_LIBLCMS_HEADERS := -I$(LIBLCMS_DIR) +endif + # TODO: Update awt lib path when awt is converted $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \ LIBRARY := lcms, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \ + SRC := $(LIBLCMS_DIR), \ + INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \ LANG := C, \ OPTIMIZATION := HIGHEST, \ CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \ $(SHARED_LIBRARY_FLAGS) \ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \ + -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ + $(BUILD_LIBLCMS_HEADERS) \ + $(LCMS_CFLAGS), \ CFLAGS_solaris := -xc99=no_lib, \ CFLAGS_windows := -DCMS_IS_WINDOWS_, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \ @@ -675,10 +692,10 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \ LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \ - LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \ - LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \ - LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \ - LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\ + LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \ + LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \ + LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \ + LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=lcms.dll" \ diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c b/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c index 8e687de0cdf..0939b00a761 100644 --- a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c +++ b/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c @@ -30,7 +30,7 @@ #include "jni_util.h" #include "Trace.h" #include "Disposer.h" -#include "lcms2.h" +#include #include "jlong.h" From bb2698cfa6f2bdc92c197f17a7d2f90003db05fa Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Wed, 30 Apr 2014 12:41:38 +0400 Subject: [PATCH 22/50] 8042087: [macosx] LWCToolkit.inokeAndWait is calling EventQueue.invokeLater Reviewed-by: anthony, serb --- .../classes/sun/lwawt/macosx/LWCToolkit.java | 69 ++++++++----------- 1 file changed, 29 insertions(+), 40 deletions(-) diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java index 4a153fc94d4..d0b6882b9a3 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java @@ -611,19 +611,20 @@ public final class LWCToolkit extends LWToolkit { } /** - * Kicks an event over to the appropriate eventqueue and waits for it to + * Kicks an event over to the appropriate event queue and waits for it to * finish To avoid deadlocking, we manually run the NSRunLoop while waiting * Any selector invoked using ThreadUtilities performOnMainThread will be * processed in doAWTRunLoop The InvocationEvent will call * LWCToolkit.stopAWTRunLoop() when finished, which will stop our manual - * runloop Does not dispatch native events while in the loop + * run loop. Does not dispatch native events while in the loop */ public static void invokeAndWait(Runnable runnable, Component component) throws InvocationTargetException { - final long mediator = createAWTRunLoopMediator(); + Objects.requireNonNull(component, "Null component provided to invokeAndWait"); + long mediator = createAWTRunLoopMediator(); InvocationEvent invocationEvent = - new InvocationEvent(component != null ? component : Toolkit.getDefaultToolkit(), + new InvocationEvent(component, runnable, () -> { if (mediator != 0) { @@ -632,49 +633,42 @@ public final class LWCToolkit extends LWToolkit { }, true); - if (component != null) { - AppContext appContext = SunToolkit.targetToAppContext(component); - SunToolkit.postEvent(appContext, invocationEvent); - - // 3746956 - flush events from PostEventQueue to prevent them from getting stuck and causing a deadlock - SunToolkit.flushPendingEvents(appContext); - } else { - // This should be the equivalent to EventQueue.invokeAndWait - ((LWCToolkit)Toolkit.getDefaultToolkit()).getSystemEventQueueForInvokeAndWait().postEvent(invocationEvent); - } - + AppContext appContext = SunToolkit.targetToAppContext(component); + SunToolkit.postEvent(appContext, invocationEvent); + // 3746956 - flush events from PostEventQueue to prevent them from getting stuck and causing a deadlock + SunToolkit.flushPendingEvents(appContext); doAWTRunLoop(mediator, false); - Throwable eventException = invocationEvent.getException(); - if (eventException != null) { - if (eventException instanceof UndeclaredThrowableException) { - eventException = ((UndeclaredThrowableException)eventException).getUndeclaredThrowable(); - } - throw new InvocationTargetException(eventException); - } + checkException(invocationEvent); } public static void invokeLater(Runnable event, Component component) throws InvocationTargetException { - final InvocationEvent invocationEvent = - new InvocationEvent(component != null ? component : Toolkit.getDefaultToolkit(), event); + Objects.requireNonNull(component, "Null component provided to invokeLater"); - if (component != null) { - final AppContext appContext = SunToolkit.targetToAppContext(component); - SunToolkit.postEvent(appContext, invocationEvent); + InvocationEvent invocationEvent = new InvocationEvent(component, event); - // 3746956 - flush events from PostEventQueue to prevent them from getting stuck and causing a deadlock - SunToolkit.flushPendingEvents(appContext); - } else { - // This should be the equivalent to EventQueue.invokeAndWait - ((LWCToolkit)Toolkit.getDefaultToolkit()).getSystemEventQueueForInvokeAndWait().postEvent(invocationEvent); - } + AppContext appContext = SunToolkit.targetToAppContext(component); + SunToolkit.postEvent(SunToolkit.targetToAppContext(component), invocationEvent); + // 3746956 - flush events from PostEventQueue to prevent them from getting stuck and causing a deadlock + SunToolkit.flushPendingEvents(appContext); - final Throwable eventException = invocationEvent.getException(); + checkException(invocationEvent); + } + + /** + * Checks if exception occurred while {@code InvocationEvent} was processed and rethrows it as + * an {@code InvocationTargetException} + * + * @param event the event to check for an exception + * @throws InvocationTargetException if exception occurred when event was processed + */ + private static void checkException(InvocationEvent event) throws InvocationTargetException { + Throwable eventException = event.getException(); if (eventException == null) return; if (eventException instanceof UndeclaredThrowableException) { - throw new InvocationTargetException(((UndeclaredThrowableException)eventException).getUndeclaredThrowable()); + eventException = ((UndeclaredThrowableException)eventException).getUndeclaredThrowable(); } throw new InvocationTargetException(eventException); } @@ -686,11 +680,6 @@ public final class LWCToolkit extends LWToolkit { */ native static void performOnMainThreadAfterDelay(Runnable r, long delay); - // This exists purely to get around permissions issues with getSystemEventQueueImpl - EventQueue getSystemEventQueueForInvokeAndWait() { - return getSystemEventQueueImpl(); - } - // DnD support @Override From b8cc933de8e73c5737be9cbc7d71a3cd386d671f Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Wed, 30 Apr 2014 11:29:29 +0200 Subject: [PATCH 23/50] 8042090: Fix invalid variable names sun/java2d/loops/ProcessPath.c Reviewed-by: prr --- .../native/sun/java2d/loops/ProcessPath.c | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/jdk/src/share/native/sun/java2d/loops/ProcessPath.c b/jdk/src/share/native/sun/java2d/loops/ProcessPath.c index 52d8dddb3d3..07eb3468926 100644 --- a/jdk/src/share/native/sun/java2d/loops/ProcessPath.c +++ b/jdk/src/share/native/sun/java2d/loops/ProcessPath.c @@ -189,34 +189,34 @@ #define PROCESS_POINT(hnd, fX, fY, checkBounds, pixelInfo) \ do { \ - jint _X = (fX)>> MDP_PREC; \ - jint _Y = (fY)>> MDP_PREC; \ + jint X_ = (fX)>> MDP_PREC; \ + jint Y_ = (fY)>> MDP_PREC; \ if (checkBounds && \ - (hnd->dhnd->yMin > _Y || \ - hnd->dhnd->yMax <= _Y || \ - hnd->dhnd->xMin > _X || \ - hnd->dhnd->xMax <= _X)) break; \ + (hnd->dhnd->yMin > Y_ || \ + hnd->dhnd->yMax <= Y_ || \ + hnd->dhnd->xMin > X_ || \ + hnd->dhnd->xMax <= X_)) break; \ /* \ - * (_X,_Y) should be inside boundaries \ + * (X_,Y_) should be inside boundaries \ * \ - * assert(hnd->dhnd->yMin <= _Y && \ - * hnd->dhnd->yMax > _Y && \ - * hnd->dhnd->xMin <= _X && \ - * hnd->dhnd->xMax > _X); \ + * assert(hnd->dhnd->yMin <= Y_ && \ + * hnd->dhnd->yMax > Y_ && \ + * hnd->dhnd->xMin <= X_ && \ + * hnd->dhnd->xMax > X_); \ * \ */ \ if (pixelInfo[0] == 0) { \ pixelInfo[0] = 1; \ - pixelInfo[1] = _X; \ - pixelInfo[2] = _Y; \ - pixelInfo[3] = _X; \ - pixelInfo[4] = _Y; \ - hnd->dhnd->pDrawPixel(hnd->dhnd, _X, _Y); \ - } else if ((_X != pixelInfo[3] || _Y != pixelInfo[4]) && \ - (_X != pixelInfo[1] || _Y != pixelInfo[2])) { \ - hnd->dhnd->pDrawPixel(hnd->dhnd, _X, _Y); \ - pixelInfo[3] = _X; \ - pixelInfo[4] = _Y; \ + pixelInfo[1] = X_; \ + pixelInfo[2] = Y_; \ + pixelInfo[3] = X_; \ + pixelInfo[4] = Y_; \ + hnd->dhnd->pDrawPixel(hnd->dhnd, X_, Y_); \ + } else if ((X_ != pixelInfo[3] || Y_ != pixelInfo[4]) && \ + (X_ != pixelInfo[1] || Y_ != pixelInfo[2])) { \ + hnd->dhnd->pDrawPixel(hnd->dhnd, X_, Y_); \ + pixelInfo[3] = X_; \ + pixelInfo[4] = Y_; \ } \ } while(0) From e787680bf15e351d63cd8a3453f6e618f4980abf Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Wed, 30 Apr 2014 19:28:05 +0400 Subject: [PATCH 24/50] 8041917: unexcepted behavior of LineBorder while using Boolean variable true Reviewed-by: alexsch, serb --- jdk/src/share/classes/javax/swing/border/LineBorder.java | 4 ++-- jdk/test/javax/swing/border/Test4252164.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jdk/src/share/classes/javax/swing/border/LineBorder.java b/jdk/src/share/classes/javax/swing/border/LineBorder.java index 1e083c1164f..f29a244d2e8 100644 --- a/jdk/src/share/classes/javax/swing/border/LineBorder.java +++ b/jdk/src/share/classes/javax/swing/border/LineBorder.java @@ -134,8 +134,8 @@ public class LineBorder extends AbstractBorder int offs = this.thickness; int size = offs + offs; if (this.roundedCorners) { - int arc = offs + size; - outer = new RoundRectangle2D.Float(x, y, width, height, arc, arc); + float arc = .2f * offs; + outer = new RoundRectangle2D.Float(x, y, width, height, offs, offs); inner = new RoundRectangle2D.Float(x + offs, y + offs, width - size, height - size, arc, arc); } else { diff --git a/jdk/test/javax/swing/border/Test4252164.java b/jdk/test/javax/swing/border/Test4252164.java index 007e732cf2a..923df715054 100644 --- a/jdk/test/javax/swing/border/Test4252164.java +++ b/jdk/test/javax/swing/border/Test4252164.java @@ -23,7 +23,7 @@ /* * @test - * @bug 4252164 + * @bug 4252164 8041917 * @summary Tests rounded LineBorder for components * @author Sergey Malenkov * @run applet/manual=yesno Test4252164.html From 6289e6c7e82943fdf88071f41422e79b0353416e Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Mon, 5 May 2014 19:42:11 +0400 Subject: [PATCH 25/50] 8042212: [macosx] Toolkit.getScreenResolution() can return incorrect resolution Reviewed-by: anthony, pchelko --- jdk/src/macosx/native/sun/awt/CGraphicsDevice.m | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m b/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m index e20792a231d..a1813b6154d 100644 --- a/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m +++ b/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -156,14 +156,12 @@ JNIEXPORT jdouble JNICALL Java_sun_awt_CGraphicsDevice_nativeGetXResolution (JNIEnv *env, jclass class, jint displayID) { - // TODO: this is the physically correct answer, but we probably want - // to use NSScreen API instead... + // CGDisplayScreenSize can return 0 if displayID is invalid CGSize size = CGDisplayScreenSize(displayID); CGRect rect = CGDisplayBounds(displayID); // 1 inch == 25.4 mm jfloat inches = size.width / 25.4f; - jfloat dpi = rect.size.width / inches; - return dpi; + return inches > 0 ? rect.size.width / inches : 72; } /* @@ -175,14 +173,12 @@ JNIEXPORT jdouble JNICALL Java_sun_awt_CGraphicsDevice_nativeGetYResolution (JNIEnv *env, jclass class, jint displayID) { - // TODO: this is the physically correct answer, but we probably want - // to use NSScreen API instead... + // CGDisplayScreenSize can return 0 if displayID is invalid CGSize size = CGDisplayScreenSize(displayID); CGRect rect = CGDisplayBounds(displayID); // 1 inch == 25.4 mm jfloat inches = size.height / 25.4f; - jfloat dpi = rect.size.height / inches; - return dpi; + return inches > 0 ? rect.size.height / inches : 72; } /* From ac82d17097982c45994c6ac3bf6c631669844bf6 Mon Sep 17 00:00:00 2001 From: Phil Race Date: Mon, 5 May 2014 09:41:41 -0700 Subject: [PATCH 26/50] 8038838: Totally remove all vestiges of com.sun.image.codec.jpeg from JDK 9 Reviewed-by: bae, vadim --- jdk/make/mapfiles/libjpeg/mapfile-vers-closed | 4 ---- 1 file changed, 4 deletions(-) diff --git a/jdk/make/mapfiles/libjpeg/mapfile-vers-closed b/jdk/make/mapfiles/libjpeg/mapfile-vers-closed index 9b3724c4994..6f84d2da352 100644 --- a/jdk/make/mapfiles/libjpeg/mapfile-vers-closed +++ b/jdk/make/mapfiles/libjpeg/mapfile-vers-closed @@ -31,10 +31,6 @@ SUNWprivate_1.1 { Java_sun_awt_image_JPEGImageDecoder_initIDs; Java_sun_awt_image_JPEGImageDecoder_readImage; - Java_sun_awt_image_codec_JPEGImageDecoderImpl_initDecoder; - Java_sun_awt_image_codec_JPEGImageDecoderImpl_readJPEGStream; - Java_sun_awt_image_codec_JPEGImageEncoderImpl_initEncoder; - Java_sun_awt_image_codec_JPEGImageEncoderImpl_writeJPEGStream; Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initReaderIDs; Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initJPEGImageReader; From 1a24f81c1bd5da50fe5b96aa7b052da4387664dd Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Mon, 5 May 2014 23:19:00 -0700 Subject: [PATCH 27/50] 8042256: Fix raw and unchecked lint warnings in com.sun.media.sound Reviewed-by: prr --- .../com/sun/media/sound/AbstractLine.java | 2 +- .../sun/media/sound/AbstractMidiDevice.java | 8 ++++--- .../com/sun/media/sound/AbstractMixer.java | 22 ++++++++++--------- .../com/sun/media/sound/AlawCodec.java | 4 ++-- .../sound/AudioSynthesizerPropertyInfo.java | 2 +- .../sun/media/sound/DirectAudioDevice.java | 10 ++++----- .../com/sun/media/sound/EventDispatcher.java | 8 +++---- .../com/sun/media/sound/JDK13Services.java | 6 ++--- .../sun/media/sound/MidiInDeviceProvider.java | 4 ++-- .../media/sound/MidiOutDeviceProvider.java | 4 ++-- .../com/sun/media/sound/MidiUtils.java | 6 ++--- .../com/sun/media/sound/PCMtoPCMCodec.java | 8 +++---- .../com/sun/media/sound/PortMixer.java | 5 +++-- .../sun/media/sound/RealTimeSequencer.java | 22 +++++++++---------- .../com/sun/media/sound/SoftSynthesizer.java | 2 +- .../com/sun/media/sound/UlawCodec.java | 4 ++-- 16 files changed, 61 insertions(+), 56 deletions(-) diff --git a/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java b/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java index e6a7ba2d9cb..1d0393d35eb 100644 --- a/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java +++ b/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java @@ -48,7 +48,7 @@ abstract class AbstractLine implements Line { protected Control[] controls; AbstractMixer mixer; private boolean open = false; - private final Vector listeners = new Vector(); + private final Vector listeners = new Vector<>(); /** * Contains event dispatcher per thread group. diff --git a/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java b/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java index 4323970cafa..93c3926aaed 100644 --- a/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java +++ b/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java @@ -70,7 +70,7 @@ abstract class AbstractMidiDevice implements MidiDevice, ReferenceCountingDevice /** List of Receivers and Transmitters that opened the device implicitely. */ - private List openKeepingObjects; + private List openKeepingObjects; /** * This is the device handle returned from native code @@ -284,6 +284,7 @@ abstract class AbstractMidiDevice implements MidiDevice, ReferenceCountingDevice } + @SuppressWarnings("unchecked") // Cast of result of clone public final List getReceivers() { List recs; synchronized (traRecLock) { @@ -313,6 +314,7 @@ abstract class AbstractMidiDevice implements MidiDevice, ReferenceCountingDevice } + @SuppressWarnings("unchecked") // Cast of result of clone public final List getTransmitters() { List tras; synchronized (traRecLock) { @@ -372,9 +374,9 @@ abstract class AbstractMidiDevice implements MidiDevice, ReferenceCountingDevice /** Return the list of objects that have opened the device implicitely. */ - private synchronized List getOpenKeepingObjects() { + private synchronized List getOpenKeepingObjects() { if (openKeepingObjects == null) { - openKeepingObjects = new ArrayList(); + openKeepingObjects = new ArrayList<>(); } return openKeepingObjects; } diff --git a/jdk/src/share/classes/com/sun/media/sound/AbstractMixer.java b/jdk/src/share/classes/com/sun/media/sound/AbstractMixer.java index 1055fc6859e..83378615b77 100644 --- a/jdk/src/share/classes/com/sun/media/sound/AbstractMixer.java +++ b/jdk/src/share/classes/com/sun/media/sound/AbstractMixer.java @@ -90,13 +90,13 @@ abstract class AbstractMixer extends AbstractLine implements Mixer { /** * Source lines (ports) currently open */ - private final Vector sourceLines = new Vector(); + private final Vector sourceLines = new Vector<>(); /** * Target lines currently open. */ - private final Vector targetLines = new Vector(); + private final Vector targetLines = new Vector<>(); /** @@ -151,7 +151,7 @@ abstract class AbstractMixer extends AbstractLine implements Mixer { public final Line.Info[] getSourceLineInfo(Line.Info info) { int i; - Vector vec = new Vector(); + Vector vec = new Vector<>(); for (i = 0; i < sourceLineInfo.length; i++) { @@ -162,7 +162,7 @@ abstract class AbstractMixer extends AbstractLine implements Mixer { Line.Info[] returnedArray = new Line.Info[vec.size()]; for (i = 0; i < returnedArray.length; i++) { - returnedArray[i] = (Line.Info)vec.elementAt(i); + returnedArray[i] = vec.elementAt(i); } return returnedArray; @@ -172,7 +172,7 @@ abstract class AbstractMixer extends AbstractLine implements Mixer { public final Line.Info[] getTargetLineInfo(Line.Info info) { int i; - Vector vec = new Vector(); + Vector vec = new Vector<>(); for (i = 0; i < targetLineInfo.length; i++) { @@ -183,7 +183,7 @@ abstract class AbstractMixer extends AbstractLine implements Mixer { Line.Info[] returnedArray = new Line.Info[vec.size()]; for (i = 0; i < returnedArray.length; i++) { - returnedArray[i] = (Line.Info)vec.elementAt(i); + returnedArray[i] = vec.elementAt(i); } return returnedArray; @@ -231,7 +231,7 @@ abstract class AbstractMixer extends AbstractLine implements Mixer { localLines = new Line[sourceLines.size()]; for (int i = 0; i < localLines.length; i++) { - localLines[i] = (Line)sourceLines.elementAt(i); + localLines[i] = sourceLines.elementAt(i); } } @@ -248,7 +248,7 @@ abstract class AbstractMixer extends AbstractLine implements Mixer { localLines = new Line[targetLines.size()]; for (int i = 0; i < localLines.length; i++) { - localLines[i] = (Line)targetLines.elementAt(i); + localLines[i] = targetLines.elementAt(i); } } @@ -453,7 +453,8 @@ abstract class AbstractMixer extends AbstractLine implements Mixer { return; } - Vector localSourceLines = (Vector)sourceLines.clone(); + @SuppressWarnings("unchecked") + Vector localSourceLines = (Vector)sourceLines.clone(); for (int i = 0; i < localSourceLines.size(); i++) { // if any other open line is running, return @@ -468,7 +469,8 @@ abstract class AbstractMixer extends AbstractLine implements Mixer { } } - Vector localTargetLines = (Vector)targetLines.clone(); + @SuppressWarnings("unchecked") + Vector localTargetLines = (Vector)targetLines.clone(); for (int i = 0; i < localTargetLines.size(); i++) { // if any other open line is running, return diff --git a/jdk/src/share/classes/com/sun/media/sound/AlawCodec.java b/jdk/src/share/classes/com/sun/media/sound/AlawCodec.java index 367f318b06a..fbe63f6ff16 100644 --- a/jdk/src/share/classes/com/sun/media/sound/AlawCodec.java +++ b/jdk/src/share/classes/com/sun/media/sound/AlawCodec.java @@ -213,7 +213,7 @@ public final class AlawCodec extends SunCodec { private AudioFormat[] getOutputFormats(AudioFormat inputFormat) { - Vector formats = new Vector(); + Vector formats = new Vector<>(); AudioFormat format; if ( AudioFormat.Encoding.PCM_SIGNED.equals(inputFormat.getEncoding())) { @@ -248,7 +248,7 @@ public final class AlawCodec extends SunCodec { AudioFormat[] formatArray = new AudioFormat[formats.size()]; for (int i = 0; i < formatArray.length; i++) { - formatArray[i] = (AudioFormat)(formats.elementAt(i)); + formatArray[i] = formats.elementAt(i); } return formatArray; } diff --git a/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java b/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java index d4305523526..16bfaa20790 100644 --- a/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java +++ b/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java @@ -68,7 +68,7 @@ public final class AudioSynthesizerPropertyInfo { * The valueClass field specifies class * used in value field. */ - public Class valueClass = null; + public Class valueClass = null; /** * An array of possible values if the value for the field * AudioSynthesizerPropertyInfo.value may be selected diff --git a/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java b/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java index 7c938bbb1c4..becf4981ba7 100644 --- a/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java +++ b/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java @@ -94,7 +94,7 @@ final class DirectAudioDevice extends AbstractMixer { } private DirectDLI createDataLineInfo(boolean isSource) { - Vector formats = new Vector(); + Vector formats = new Vector<>(); AudioFormat[] hardwareFormatArray = null; AudioFormat[] formatArray = null; @@ -107,7 +107,7 @@ final class DirectAudioDevice extends AbstractMixer { int formatArraySize = size; hardwareFormatArray = new AudioFormat[size]; for (int i = 0; i < size; i++) { - AudioFormat format = (AudioFormat)formats.elementAt(i); + AudioFormat format = formats.elementAt(i); hardwareFormatArray[i] = format; int bits = format.getSampleSizeInBits(); boolean isSigned = format.getEncoding().equals(AudioFormat.Encoding.PCM_SIGNED); @@ -265,7 +265,7 @@ final class DirectAudioDevice extends AbstractMixer { return ((DirectAudioDeviceProvider.DirectAudioDeviceInfo) getMixerInfo()).getMaxSimulLines(); } - private static void addFormat(Vector v, int bits, int frameSizeInBytes, int channels, float sampleRate, + private static void addFormat(Vector v, int bits, int frameSizeInBytes, int channels, float sampleRate, int encoding, boolean signed, boolean bigEndian) { AudioFormat.Encoding enc = null; switch (encoding) { @@ -338,7 +338,7 @@ final class DirectAudioDevice extends AbstractMixer { private static final class DirectDLI extends DataLine.Info { final AudioFormat[] hardwareFormats; - private DirectDLI(Class clazz, AudioFormat[] formatArray, + private DirectDLI(Class clazz, AudioFormat[] formatArray, AudioFormat[] hardwareFormatArray, int minBuffer, int maxBuffer) { super(clazz, formatArray, minBuffer, maxBuffer); @@ -1457,7 +1457,7 @@ final class DirectAudioDevice extends AbstractMixer { } // class DirectBAOS - + @SuppressWarnings("rawtypes") private static native void nGetFormats(int mixerIndex, int deviceID, boolean isSource, Vector formats); diff --git a/jdk/src/share/classes/com/sun/media/sound/EventDispatcher.java b/jdk/src/share/classes/com/sun/media/sound/EventDispatcher.java index 54b948af168..49709891bd0 100644 --- a/jdk/src/share/classes/com/sun/media/sound/EventDispatcher.java +++ b/jdk/src/share/classes/com/sun/media/sound/EventDispatcher.java @@ -57,7 +57,7 @@ final class EventDispatcher implements Runnable { /** * List of events */ - private final ArrayList eventQueue = new ArrayList(); + private final ArrayList eventQueue = new ArrayList<>(); /** @@ -186,7 +186,7 @@ final class EventDispatcher implements Runnable { } if (eventQueue.size() > 0) { // Remove the event from the queue and dispatch it to the listeners. - eventInfo = (EventInfo) eventQueue.remove(0); + eventInfo = eventQueue.remove(0); } } // end of synchronized @@ -230,7 +230,7 @@ final class EventDispatcher implements Runnable { /** * Send audio and MIDI events. */ - void sendAudioEvents(Object event, List listeners) { + void sendAudioEvents(Object event, List listeners) { if ((listeners == null) || (listeners.size() == 0)) { // nothing to do @@ -392,7 +392,7 @@ final class EventDispatcher implements Runnable { * @param event the event to be dispatched * @param listeners listener list; will be copied */ - EventInfo(Object event, List listeners) { + EventInfo(Object event, List listeners) { this.event = event; this.listeners = listeners.toArray(); } diff --git a/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java b/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java index 9f19a8734e3..9c93d06dc23 100644 --- a/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java +++ b/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java @@ -118,7 +118,7 @@ public final class JDK13Services { (the part before the hash sign), if available. If the property is not set or the value has no provider class name part, null is returned. */ - public static synchronized String getDefaultProviderClassName(Class typeClass) { + public static synchronized String getDefaultProviderClassName(Class typeClass) { String value = null; String defaultProviderSpec = getDefaultProvider(typeClass); if (defaultProviderSpec != null) { @@ -144,7 +144,7 @@ public final class JDK13Services { part after the hash sign), if available. If the property is not set or the value has no instance name part, null is returned. */ - public static synchronized String getDefaultInstanceName(Class typeClass) { + public static synchronized String getDefaultInstanceName(Class typeClass) { String value = null; String defaultProviderSpec = getDefaultProvider(typeClass); if (defaultProviderSpec != null) { @@ -165,7 +165,7 @@ public final class JDK13Services { @return The complete value of the property, if available. If the property is not set, null is returned. */ - private static synchronized String getDefaultProvider(Class typeClass) { + private static synchronized String getDefaultProvider(Class typeClass) { if (!SourceDataLine.class.equals(typeClass) && !TargetDataLine.class.equals(typeClass) && !Clip.class.equals(typeClass) diff --git a/jdk/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java b/jdk/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java index 1f397724e3f..5044dfeaa17 100644 --- a/jdk/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java +++ b/jdk/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java @@ -106,9 +106,9 @@ public final class MidiInDeviceProvider extends AbstractMidiDeviceProvider { * the new instance will not reflect that state... */ static final class MidiInDeviceInfo extends AbstractMidiDeviceProvider.Info { - private final Class providerClass; + private final Class providerClass; - private MidiInDeviceInfo(int index, Class providerClass) { + private MidiInDeviceInfo(int index, Class providerClass) { super(nGetName(index), nGetVendor(index), nGetDescription(index), nGetVersion(index), index); this.providerClass = providerClass; } diff --git a/jdk/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java b/jdk/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java index 75583ab1e65..eaacf0991be 100644 --- a/jdk/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java +++ b/jdk/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java @@ -104,9 +104,9 @@ public final class MidiOutDeviceProvider extends AbstractMidiDeviceProvider { * the new instance will not reflect that state... */ static final class MidiOutDeviceInfo extends AbstractMidiDeviceProvider.Info { - private final Class providerClass; + private final Class providerClass; - private MidiOutDeviceInfo(int index, Class providerClass) { + private MidiOutDeviceInfo(int index, Class providerClass) { super(nGetName(index), nGetVendor(index), nGetDescription(index), nGetVersion(index), index); this.providerClass = providerClass; } diff --git a/jdk/src/share/classes/com/sun/media/sound/MidiUtils.java b/jdk/src/share/classes/com/sun/media/sound/MidiUtils.java index a3f62efd29e..eecd33fe0b5 100644 --- a/jdk/src/share/classes/com/sun/media/sound/MidiUtils.java +++ b/jdk/src/share/classes/com/sun/media/sound/MidiUtils.java @@ -295,7 +295,7 @@ public final class MidiUtils { public synchronized void refresh(Sequence seq) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); Track[] tracks = seq.getTracks(); if (tracks.length > 0) { // tempo events only occur in track 0 @@ -313,7 +313,7 @@ public final class MidiUtils { int size = list.size() + 1; firstTempoIsFake = true; if ((size > 1) - && (((MidiEvent) list.get(0)).getTick() == 0)) { + && (list.get(0).getTick() == 0)) { // do not need to add an initial tempo event at the beginning size--; firstTempoIsFake = false; @@ -328,7 +328,7 @@ public final class MidiUtils { e++; } for (int i = 0; i < list.size(); i++, e++) { - MidiEvent evt = (MidiEvent) list.get(i); + MidiEvent evt = list.get(i); ticks[e] = evt.getTick(); tempos[e] = getTempoMPQ(evt.getMessage()); } diff --git a/jdk/src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java b/jdk/src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java index 9a4f1a874b3..dbed920e6fa 100644 --- a/jdk/src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java +++ b/jdk/src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java @@ -91,7 +91,7 @@ public final class PCMtoPCMCodec extends SunCodec { // filter out targetEncoding from the old getOutputFormats( sourceFormat ) method AudioFormat[] formats = getOutputFormats( sourceFormat ); - Vector newFormats = new Vector(); + Vector newFormats = new Vector<>(); for(int i=0; i formats = new Vector<>(); AudioFormat format; int sampleSize = inputFormat.getSampleSizeInBits(); @@ -335,7 +335,7 @@ public final class PCMtoPCMCodec extends SunCodec { for (int i = 0; i < formatArray.length; i++) { - formatArray[i] = (AudioFormat)(formats.elementAt(i)); + formatArray[i] = formats.elementAt(i); } } diff --git a/jdk/src/share/classes/com/sun/media/sound/PortMixer.java b/jdk/src/share/classes/com/sun/media/sound/PortMixer.java index 705648004ff..ee0fbd064ae 100644 --- a/jdk/src/share/classes/com/sun/media/sound/PortMixer.java +++ b/jdk/src/share/classes/com/sun/media/sound/PortMixer.java @@ -253,12 +253,12 @@ final class PortMixer extends AbstractMixer { long newID = ((PortMixer) mixer).getID(); if ((id == 0) || (newID != id) || (controls.length == 0)) { id = newID; - Vector vector = new Vector(); + Vector vector = new Vector<>(); synchronized (vector) { nGetControls(id, portIndex, vector); controls = new Control[vector.size()]; for (int i = 0; i < controls.length; i++) { - controls[i] = (Control) vector.elementAt(i); + controls[i] = vector.elementAt(i); } } } else { @@ -494,6 +494,7 @@ final class PortMixer extends AbstractMixer { private static native String nGetPortName(long id, int portIndex); // fills the vector with the controls for this port + @SuppressWarnings("rawtypes") private static native void nGetControls(long id, int portIndex, Vector vector); // getters/setters for controls diff --git a/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java b/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java index 6ea2ec4b3c6..7252723e776 100644 --- a/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java +++ b/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java @@ -122,7 +122,7 @@ final class RealTimeSequencer extends AbstractMidiDevice /** * List of tracks to which we're recording */ - private final List recordingTracks = new ArrayList(); + private final List recordingTracks = new ArrayList<>(); private long loopStart = 0; @@ -133,13 +133,13 @@ final class RealTimeSequencer extends AbstractMidiDevice /** * Meta event listeners */ - private final ArrayList metaEventListeners = new ArrayList(); + private final ArrayList metaEventListeners = new ArrayList<>(); /** * Control change listeners */ - private final ArrayList controllerEventListeners = new ArrayList(); + private final ArrayList controllerEventListeners = new ArrayList<>(); /** automatic connection support */ @@ -645,7 +645,7 @@ final class RealTimeSequencer extends AbstractMidiDevice boolean flag = false; for(int i=0; i < controllerEventListeners.size(); i++) { - cve = (ControllerListElement) controllerEventListeners.get(i); + cve = controllerEventListeners.get(i); if (cve.listener.equals(listener)) { cve.addControllers(controllers); @@ -669,7 +669,7 @@ final class RealTimeSequencer extends AbstractMidiDevice ControllerListElement cve = null; boolean flag = false; for (int i=0; i < controllerEventListeners.size(); i++) { - cve = (ControllerListElement) controllerEventListeners.get(i); + cve = controllerEventListeners.get(i); if (cve.listener.equals(listener)) { cve.removeControllers(controllers); flag = true; @@ -940,9 +940,9 @@ final class RealTimeSequencer extends AbstractMidiDevice } ShortMessage msg = (ShortMessage) message; int controller = msg.getData1(); - List sendToListeners = new ArrayList(); + List sendToListeners = new ArrayList<>(); for (int i = 0; i < size; i++) { - ControllerListElement cve = (ControllerListElement) controllerEventListeners.get(i); + ControllerListElement cve = controllerEventListeners.get(i); for(int j = 0; j < cve.controllers.length; j++) { if (cve.controllers[j] == controller) { sendToListeners.add(cve.listener); @@ -1213,13 +1213,13 @@ final class RealTimeSequencer extends AbstractMidiDevice this.channel = channel; } - static RecordingTrack get(List recordingTracks, Track track) { + static RecordingTrack get(List recordingTracks, Track track) { synchronized(recordingTracks) { int size = recordingTracks.size(); for (int i = 0; i < size; i++) { - RecordingTrack current = (RecordingTrack)recordingTracks.get(i); + RecordingTrack current = recordingTracks.get(i); if (current.track == track) { return current; } @@ -1228,12 +1228,12 @@ final class RealTimeSequencer extends AbstractMidiDevice return null; } - static Track get(List recordingTracks, int channel) { + static Track get(List recordingTracks, int channel) { synchronized(recordingTracks) { int size = recordingTracks.size(); for (int i = 0; i < size; i++) { - RecordingTrack current = (RecordingTrack)recordingTracks.get(i); + RecordingTrack current = recordingTracks.get(i); if ((current.channel == channel) || (current.channel == -1)) { return current.track; } diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java b/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java index 01a64c2dddf..2c6dff99fea 100644 --- a/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java +++ b/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java @@ -949,7 +949,7 @@ public final class SoftSynthesizer implements AudioSynthesizer, Object v = (info == null) ? null : info.get(item2.name); v = (v != null) ? v : storedProperties.getProperty(item2.name); if (v != null) { - Class c = (item2.valueClass); + Class c = (item2.valueClass); if (c.isInstance(v)) item2.value = v; else if (v instanceof String) { diff --git a/jdk/src/share/classes/com/sun/media/sound/UlawCodec.java b/jdk/src/share/classes/com/sun/media/sound/UlawCodec.java index 7dda283a0da..337fe199788 100644 --- a/jdk/src/share/classes/com/sun/media/sound/UlawCodec.java +++ b/jdk/src/share/classes/com/sun/media/sound/UlawCodec.java @@ -198,7 +198,7 @@ public final class UlawCodec extends SunCodec { /* public AudioFormat[] getOutputFormats(AudioFormat inputFormat) { */ private AudioFormat[] getOutputFormats(AudioFormat inputFormat) { - Vector formats = new Vector(); + Vector formats = new Vector<>(); AudioFormat format; if ((inputFormat.getSampleSizeInBits() == 16) @@ -235,7 +235,7 @@ public final class UlawCodec extends SunCodec { AudioFormat[] formatArray = new AudioFormat[formats.size()]; for (int i = 0; i < formatArray.length; i++) { - formatArray[i] = (AudioFormat)(formats.elementAt(i)); + formatArray[i] = formats.elementAt(i); } return formatArray; } From 860e8d8ac711723a2c48893a3719144466532ec9 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Mon, 5 May 2014 23:38:30 -0700 Subject: [PATCH 28/50] 8039109: Fix unchecked and raw lint warnings in java.awt Reviewed-by: pchelko, forax, flar, prr --- .../share/classes/java/awt/AWTKeyStroke.java | 15 ++++--- .../share/classes/java/awt/CardLayout.java | 1 + jdk/src/share/classes/java/awt/Component.java | 2 +- .../classes/java/awt/GraphicsEnvironment.java | 10 ++--- .../java/awt/KeyboardFocusManager.java | 14 ++++--- .../share/classes/java/awt/SystemTray.java | 6 ++- .../datatransfer/MimeTypeParameterList.java | 4 +- .../java/awt/dnd/DragGestureEvent.java | 3 +- jdk/src/share/classes/java/awt/geom/Area.java | 42 +++++++++---------- .../classes/java/awt/image/BufferedImage.java | 6 +-- .../java/awt/image/CropImageFilter.java | 3 +- .../java/awt/image/FilteredImageSource.java | 14 +++---- .../classes/java/awt/image/ImageFilter.java | 3 +- .../java/awt/image/MemoryImageSource.java | 22 +++++----- .../java/awt/image/ReplicateScaleFilter.java | 3 +- .../awt/image/renderable/ParameterBlock.java | 13 +++--- .../image/renderable/RenderableImageOp.java | 14 +++---- .../renderable/RenderableImageProducer.java | 12 +++--- .../share/classes/java/awt/print/Book.java | 8 ++-- .../classes/java/awt/print/PrinterJob.java | 8 ++-- 20 files changed, 109 insertions(+), 94 deletions(-) diff --git a/jdk/src/share/classes/java/awt/AWTKeyStroke.java b/jdk/src/share/classes/java/awt/AWTKeyStroke.java index c4e07b45530..4be729b8c89 100644 --- a/jdk/src/share/classes/java/awt/AWTKeyStroke.java +++ b/jdk/src/share/classes/java/awt/AWTKeyStroke.java @@ -86,7 +86,8 @@ public class AWTKeyStroke implements Serializable { * Must be called under locked AWTKeyStro */ private static Class getAWTKeyStrokeClass() { - Class clazz = (Class)AppContext.getAppContext().get(AWTKeyStroke.class); + @SuppressWarnings("unchecked") + Class clazz = (Class)AppContext.getAppContext().get(AWTKeyStroke.class); if (clazz == null) { clazz = AWTKeyStroke.class; AppContext.getAppContext().put(AWTKeyStroke.class, AWTKeyStroke.class); @@ -182,6 +183,7 @@ public class AWTKeyStroke implements Serializable { throw new IllegalArgumentException("subclass cannot be null"); } synchronized (AWTKeyStroke.class) { + @SuppressWarnings("unchecked") Class keyStrokeClass = (Class)AppContext.getAppContext().get(AWTKeyStroke.class); if (keyStrokeClass != null && keyStrokeClass.equals(subclass)){ // Already registered @@ -192,7 +194,7 @@ public class AWTKeyStroke implements Serializable { throw new ClassCastException("subclass is not derived from AWTKeyStroke"); } - Constructor ctor = getCtor(subclass); + Constructor ctor = getCtor(subclass); String couldNotInstantiate = "subclass could not be instantiated"; @@ -227,12 +229,12 @@ public class AWTKeyStroke implements Serializable { threat as accessible flag is set only for this Constructor object, not for Class constructor. */ - private static Constructor getCtor(final Class clazz) + private static Constructor getCtor(final Class clazz) { - Constructor ctor = AccessController.doPrivileged(new PrivilegedAction() { - public Constructor run() { + Constructor ctor = AccessController.doPrivileged(new PrivilegedAction>() { + public Constructor run() { try { - Constructor ctor = clazz.getDeclaredConstructor((Class[]) null); + Constructor ctor = clazz.getDeclaredConstructor((Class[]) null); if (ctor != null) { ctor.setAccessible(true); } @@ -249,6 +251,7 @@ public class AWTKeyStroke implements Serializable { private static synchronized AWTKeyStroke getCachedStroke (char keyChar, int keyCode, int modifiers, boolean onKeyRelease) { + @SuppressWarnings("unchecked") Map cache = (Map)AppContext.getAppContext().get(APP_CONTEXT_CACHE_KEY); AWTKeyStroke cacheKey = (AWTKeyStroke)AppContext.getAppContext().get(APP_CONTEXT_KEYSTROKE_KEY); diff --git a/jdk/src/share/classes/java/awt/CardLayout.java b/jdk/src/share/classes/java/awt/CardLayout.java index 3ffb19fbee7..5e813fffbe9 100644 --- a/jdk/src/share/classes/java/awt/CardLayout.java +++ b/jdk/src/share/classes/java/awt/CardLayout.java @@ -560,6 +560,7 @@ public class CardLayout implements LayoutManager2, /** * Reads serializable fields from stream. */ + @SuppressWarnings("unchecked") private void readObject(ObjectInputStream s) throws ClassNotFoundException, IOException { diff --git a/jdk/src/share/classes/java/awt/Component.java b/jdk/src/share/classes/java/awt/Component.java index a7573c09a3c..cd6ae69de1d 100644 --- a/jdk/src/share/classes/java/awt/Component.java +++ b/jdk/src/share/classes/java/awt/Component.java @@ -6184,7 +6184,7 @@ public abstract class Component implements ImageObserver, MenuContainer, /** * Parameter types of coalesceEvents(AWTEvent,AWTEVent). */ - private static final Class[] coalesceEventsParams = { + private static final Class[] coalesceEventsParams = { AWTEvent.class, AWTEvent.class }; diff --git a/jdk/src/share/classes/java/awt/GraphicsEnvironment.java b/jdk/src/share/classes/java/awt/GraphicsEnvironment.java index 66ab39a45b1..e9e9080dba6 100644 --- a/jdk/src/share/classes/java/awt/GraphicsEnvironment.java +++ b/jdk/src/share/classes/java/awt/GraphicsEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -95,18 +95,18 @@ public abstract class GraphicsEnvironment { String nm = AccessController.doPrivileged(new GetPropertyAction("java.awt.graphicsenv", null)); try { // long t0 = System.currentTimeMillis(); - Class geCls; + Class geCls; try { // First we try if the bootclassloader finds the requested // class. This way we can avoid to run in a privileged block. - geCls = (Class)Class.forName(nm); + geCls = Class.forName(nm); } catch (ClassNotFoundException ex) { // If the bootclassloader fails, we try again with the // application classloader. ClassLoader cl = ClassLoader.getSystemClassLoader(); - geCls = (Class)Class.forName(nm, true, cl); + geCls = Class.forName(nm, true, cl); } - ge = geCls.newInstance(); + ge = (GraphicsEnvironment)geCls.newInstance(); // long t1 = System.currentTimeMillis(); // System.out.println("GE creation took " + (t1-t0)+ "ms."); if (isHeadless()) { diff --git a/jdk/src/share/classes/java/awt/KeyboardFocusManager.java b/jdk/src/share/classes/java/awt/KeyboardFocusManager.java index b02bb5b0dba..8758a2b50e3 100644 --- a/jdk/src/share/classes/java/awt/KeyboardFocusManager.java +++ b/jdk/src/share/classes/java/awt/KeyboardFocusManager.java @@ -348,6 +348,7 @@ public abstract class KeyboardFocusManager * Component of those Windows that has no such array of its own explicitly * set. */ + @SuppressWarnings({"unchecked", "rawtypes"}) private Set[] defaultFocusTraversalKeys = new Set[4]; /** @@ -422,7 +423,7 @@ public abstract class KeyboardFocusManager targetSet.add(AWTKeyStroke.getAWTKeyStroke(tokens.nextToken())); } return (targetSet.isEmpty()) - ? Collections.EMPTY_SET + ? Collections.emptySet() : Collections.unmodifiableSet(targetSet); } @@ -436,7 +437,7 @@ public abstract class KeyboardFocusManager work_set.add(defaultFocusTraversalKeyStrokes[i][j]); } defaultFocusTraversalKeys[i] = (work_set.isEmpty()) - ? Collections.EMPTY_SET + ? Collections.emptySet() : Collections.unmodifiableSet(work_set); } initPeer(); @@ -1750,11 +1751,12 @@ public abstract class KeyboardFocusManager * @see #addKeyEventDispatcher * @see #removeKeyEventDispatcher */ + @SuppressWarnings("unchecked") // Cast of result of clone protected synchronized java.util.List getKeyEventDispatchers() { return (keyEventDispatchers != null) - ? (java.util.List)keyEventDispatchers.clone() + ? (java.util.List)keyEventDispatchers.clone() : null; } @@ -1841,11 +1843,12 @@ public abstract class KeyboardFocusManager * @see #addKeyEventPostProcessor * @see #removeKeyEventPostProcessor */ + @SuppressWarnings("unchecked") // Cast of result of clone protected java.util.List getKeyEventPostProcessors() { return (keyEventPostProcessors != null) - ? (java.util.List)keyEventPostProcessors.clone() + ? (java.util.List)keyEventPostProcessors.clone() : null; } @@ -1907,8 +1910,7 @@ public abstract class KeyboardFocusManager * javax.swing.JComponent.runInputVerifier() using reflection. */ static synchronized Component getMostRecentFocusOwner(Window window) { - WeakReference weakValue = - (WeakReference)mostRecentFocusOwners.get(window); + WeakReference weakValue = mostRecentFocusOwners.get(window); return weakValue == null ? null : weakValue.get(); } diff --git a/jdk/src/share/classes/java/awt/SystemTray.java b/jdk/src/share/classes/java/awt/SystemTray.java index 7f3a5c31893..e542dfc1712 100644 --- a/jdk/src/share/classes/java/awt/SystemTray.java +++ b/jdk/src/share/classes/java/awt/SystemTray.java @@ -259,7 +259,9 @@ public class SystemTray { Vector icons = null; synchronized (this) { oldArray = systemTray.getTrayIcons(); - icons = (Vector)AppContext.getAppContext().get(TrayIcon.class); + @SuppressWarnings("unchecked") + Vector tmp = (Vector)AppContext.getAppContext().get(TrayIcon.class); + icons = tmp; if (icons == null) { icons = new Vector(3); AppContext.getAppContext().put(TrayIcon.class, icons); @@ -304,6 +306,7 @@ public class SystemTray { TrayIcon[] oldArray = null, newArray = null; synchronized (this) { oldArray = systemTray.getTrayIcons(); + @SuppressWarnings("unchecked") Vector icons = (Vector)AppContext.getAppContext().get(TrayIcon.class); // TrayIcon with no peer is not contained in the array. if (icons == null || !icons.remove(trayIcon)) { @@ -335,6 +338,7 @@ public class SystemTray { * @see TrayIcon */ public TrayIcon[] getTrayIcons() { + @SuppressWarnings("unchecked") Vector icons = (Vector)AppContext.getAppContext().get(TrayIcon.class); if (icons != null) { return icons.toArray(new TrayIcon[icons.size()]); diff --git a/jdk/src/share/classes/java/awt/datatransfer/MimeTypeParameterList.java b/jdk/src/share/classes/java/awt/datatransfer/MimeTypeParameterList.java index f4816b65d87..3a79886c2b4 100644 --- a/jdk/src/share/classes/java/awt/datatransfer/MimeTypeParameterList.java +++ b/jdk/src/share/classes/java/awt/datatransfer/MimeTypeParameterList.java @@ -296,14 +296,14 @@ class MimeTypeParameterList implements Cloneable { /** * @return a clone of this object */ - + @SuppressWarnings("unchecked") // Cast from clone public Object clone() { MimeTypeParameterList newObj = null; try { newObj = (MimeTypeParameterList)super.clone(); } catch (CloneNotSupportedException cannotHappen) { } - newObj.parameters = (Hashtable)parameters.clone(); + newObj.parameters = (Hashtable)parameters.clone(); return newObj; } diff --git a/jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java b/jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java index e8827f44358..3dff336a794 100644 --- a/jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java +++ b/jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -357,6 +357,7 @@ public class DragGestureEvent extends EventObject { action = newAction; // Pre-1.4 support. 'events' was previously non-transient + @SuppressWarnings("rawtypes") List newEvents; try { newEvents = (List)f.get("events", null); diff --git a/jdk/src/share/classes/java/awt/geom/Area.java b/jdk/src/share/classes/java/awt/geom/Area.java index 507f212b4ea..ae5ab2f683b 100644 --- a/jdk/src/share/classes/java/awt/geom/Area.java +++ b/jdk/src/share/classes/java/awt/geom/Area.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -97,9 +97,9 @@ import sun.awt.geom.AreaOp; * @since 1.2 */ public class Area implements Shape, Cloneable { - private static Vector EmptyCurves = new Vector(); + private static Vector EmptyCurves = new Vector<>(); - private Vector curves; + private Vector curves; /** * Default constructor which creates an empty area. @@ -127,8 +127,8 @@ public class Area implements Shape, Cloneable { } } - private static Vector pathToCurves(PathIterator pi) { - Vector curves = new Vector(); + private static Vector pathToCurves(PathIterator pi) { + Vector curves = new Vector<>(); int windingRule = pi.getWindingRule(); // coords array is big enough for holding: // coordinates returned from currentSegment (6) @@ -334,7 +334,7 @@ public class Area implements Shape, Cloneable { * @since 1.2 */ public void reset() { - curves = new Vector(); + curves = new Vector<>(); invalidateBounds(); } @@ -357,9 +357,9 @@ public class Area implements Shape, Cloneable { * @since 1.2 */ public boolean isPolygonal() { - Enumeration enum_ = curves.elements(); + Enumeration enum_ = curves.elements(); while (enum_.hasMoreElements()) { - if (((Curve) enum_.nextElement()).getOrder() > 1) { + if (enum_.nextElement().getOrder() > 1) { return false; } } @@ -381,8 +381,8 @@ public class Area implements Shape, Cloneable { if (size > 3) { return false; } - Curve c1 = (Curve) curves.get(1); - Curve c2 = (Curve) curves.get(2); + Curve c1 = curves.get(1); + Curve c2 = curves.get(2); if (c1.getOrder() != 1 || c2.getOrder() != 1) { return false; } @@ -411,10 +411,10 @@ public class Area implements Shape, Cloneable { if (curves.size() < 3) { return true; } - Enumeration enum_ = curves.elements(); + Enumeration enum_ = curves.elements(); enum_.nextElement(); // First Order0 "moveto" while (enum_.hasMoreElements()) { - if (((Curve) enum_.nextElement()).getOrder() == 0) { + if (enum_.nextElement().getOrder() == 0) { return false; } } @@ -431,11 +431,11 @@ public class Area implements Shape, Cloneable { } Rectangle2D r = new Rectangle2D.Double(); if (curves.size() > 0) { - Curve c = (Curve) curves.get(0); + Curve c = curves.get(0); // First point is always an order 0 curve (moveto) r.setRect(c.getX0(), c.getY0(), 0, 0); for (int i = 1; i < curves.size(); i++) { - ((Curve) curves.get(i)).enlarge(r); + curves.get(i).enlarge(r); } } return (cachedBounds = r); @@ -507,7 +507,7 @@ public class Area implements Shape, Cloneable { if (other == null) { return false; } - Vector c = new AreaOp.XorOp().calculate(this.curves, other.curves); + Vector c = new AreaOp.XorOp().calculate(this.curves, other.curves); return c.isEmpty(); } @@ -555,10 +555,10 @@ public class Area implements Shape, Cloneable { if (!getCachedBounds().contains(x, y)) { return false; } - Enumeration enum_ = curves.elements(); + Enumeration enum_ = curves.elements(); int crossings = 0; while (enum_.hasMoreElements()) { - Curve c = (Curve) enum_.nextElement(); + Curve c = enum_.nextElement(); crossings += c.crossingsFor(x, y); } return ((crossings & 1) == 1); @@ -658,16 +658,16 @@ public class Area implements Shape, Cloneable { class AreaIterator implements PathIterator { private AffineTransform transform; - private Vector curves; + private Vector curves; private int index; private Curve prevcurve; private Curve thiscurve; - public AreaIterator(Vector curves, AffineTransform at) { + public AreaIterator(Vector curves, AffineTransform at) { this.curves = curves; this.transform = at; if (curves.size() >= 1) { - thiscurve = (Curve) curves.get(0); + thiscurve = curves.get(0); } } @@ -689,7 +689,7 @@ class AreaIterator implements PathIterator { prevcurve = thiscurve; index++; if (index < curves.size()) { - thiscurve = (Curve) curves.get(index); + thiscurve = curves.get(index); if (thiscurve.getOrder() != 0 && prevcurve.getX1() == thiscurve.getX0() && prevcurve.getY1() == thiscurve.getY0()) diff --git a/jdk/src/share/classes/java/awt/image/BufferedImage.java b/jdk/src/share/classes/java/awt/image/BufferedImage.java index bb272aacf69..0c819349135 100644 --- a/jdk/src/share/classes/java/awt/image/BufferedImage.java +++ b/jdk/src/share/classes/java/awt/image/BufferedImage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -76,7 +76,7 @@ public class BufferedImage extends java.awt.Image ColorModel colorModel; WritableRaster raster; OffScreenImageSource osis; - Hashtable properties; + Hashtable properties; boolean isAlphaPremultiplied;// If true, alpha has been premultiplied in // color channels @@ -1106,7 +1106,7 @@ public class BufferedImage extends java.awt.Image public ImageProducer getSource() { if (osis == null) { if (properties == null) { - properties = new Hashtable(); + properties = new Hashtable<>(); } osis = new OffScreenImageSource(this, properties); } diff --git a/jdk/src/share/classes/java/awt/image/CropImageFilter.java b/jdk/src/share/classes/java/awt/image/CropImageFilter.java index 4d75c9e0427..a1d241d33ed 100644 --- a/jdk/src/share/classes/java/awt/image/CropImageFilter.java +++ b/jdk/src/share/classes/java/awt/image/CropImageFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -79,6 +79,7 @@ public class CropImageFilter extends ImageFilter { * with the filtering operation. */ public void setProperties(Hashtable props) { + @SuppressWarnings("unchecked") Hashtable p = (Hashtable)props.clone(); p.put("croprect", new Rectangle(cropX, cropY, cropW, cropH)); super.setProperties(p); diff --git a/jdk/src/share/classes/java/awt/image/FilteredImageSource.java b/jdk/src/share/classes/java/awt/image/FilteredImageSource.java index 2f58c096474..a7013159008 100644 --- a/jdk/src/share/classes/java/awt/image/FilteredImageSource.java +++ b/jdk/src/share/classes/java/awt/image/FilteredImageSource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -68,7 +68,7 @@ public class FilteredImageSource implements ImageProducer { filter = imgf; } - private Hashtable proxies; + private Hashtable proxies; /** * Adds the specified ImageConsumer @@ -94,7 +94,7 @@ public class FilteredImageSource implements ImageProducer { */ public synchronized void addConsumer(ImageConsumer ic) { if (proxies == null) { - proxies = new Hashtable(); + proxies = new Hashtable<>(); } if (!proxies.containsKey(ic)) { ImageFilter imgf = filter.getFilterInstance(ic); @@ -137,7 +137,7 @@ public class FilteredImageSource implements ImageProducer { */ public synchronized void removeConsumer(ImageConsumer ic) { if (proxies != null) { - ImageFilter imgf = (ImageFilter) proxies.get(ic); + ImageFilter imgf = proxies.get(ic); if (imgf != null) { src.removeConsumer(imgf); proxies.remove(ic); @@ -173,9 +173,9 @@ public class FilteredImageSource implements ImageProducer { */ public void startProduction(ImageConsumer ic) { if (proxies == null) { - proxies = new Hashtable(); + proxies = new Hashtable<>(); } - ImageFilter imgf = (ImageFilter) proxies.get(ic); + ImageFilter imgf = proxies.get(ic); if (imgf == null) { imgf = filter.getFilterInstance(ic); proxies.put(ic, imgf); @@ -200,7 +200,7 @@ public class FilteredImageSource implements ImageProducer { */ public void requestTopDownLeftRightResend(ImageConsumer ic) { if (proxies != null) { - ImageFilter imgf = (ImageFilter) proxies.get(ic); + ImageFilter imgf = proxies.get(ic); if (imgf != null) { imgf.resendTopDownLeftRight(src); } diff --git a/jdk/src/share/classes/java/awt/image/ImageFilter.java b/jdk/src/share/classes/java/awt/image/ImageFilter.java index 0b64d726b8e..33198346e03 100644 --- a/jdk/src/share/classes/java/awt/image/ImageFilter.java +++ b/jdk/src/share/classes/java/awt/image/ImageFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -104,6 +104,7 @@ public class ImageFilter implements ImageConsumer, Cloneable { * @exception NullPointerException if props is null */ public void setProperties(Hashtable props) { + @SuppressWarnings("unchecked") Hashtable p = (Hashtable)props.clone(); Object o = p.get("filters"); if (o == null) { diff --git a/jdk/src/share/classes/java/awt/image/MemoryImageSource.java b/jdk/src/share/classes/java/awt/image/MemoryImageSource.java index 7046f5e4667..501714fda1f 100644 --- a/jdk/src/share/classes/java/awt/image/MemoryImageSource.java +++ b/jdk/src/share/classes/java/awt/image/MemoryImageSource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -111,8 +111,8 @@ public class MemoryImageSource implements ImageProducer { Object pixels; int pixeloffset; int pixelscan; - Hashtable properties; - Vector theConsumers = new Vector(); + Hashtable properties; + Vector theConsumers = new Vector<>(); boolean animating; boolean fullbuffers; @@ -197,7 +197,7 @@ public class MemoryImageSource implements ImageProducer { } private void initialize(int w, int h, ColorModel cm, - Object pix, int off, int scan, Hashtable props) { + Object pix, int off, int scan, Hashtable props) { width = w; height = h; model = cm; @@ -205,7 +205,7 @@ public class MemoryImageSource implements ImageProducer { pixeloffset = off; pixelscan = scan; if (props == null) { - props = new Hashtable(); + props = new Hashtable<>(); } properties = props; } @@ -343,9 +343,9 @@ public class MemoryImageSource implements ImageProducer { public synchronized void setAnimated(boolean animated) { this.animating = animated; if (!animating) { - Enumeration enum_ = theConsumers.elements(); + Enumeration enum_ = theConsumers.elements(); while (enum_.hasMoreElements()) { - ImageConsumer ic = (ImageConsumer) enum_.nextElement(); + ImageConsumer ic = enum_.nextElement(); ic.imageComplete(ImageConsumer.STATICIMAGEDONE); if (isConsumer(ic)) { ic.imageComplete(ImageConsumer.IMAGEERROR); @@ -376,9 +376,9 @@ public class MemoryImageSource implements ImageProducer { } this.fullbuffers = fullbuffers; if (animating) { - Enumeration enum_ = theConsumers.elements(); + Enumeration enum_ = theConsumers.elements(); while (enum_.hasMoreElements()) { - ImageConsumer ic = (ImageConsumer) enum_.nextElement(); + ImageConsumer ic = enum_.nextElement(); ic.setHints(fullbuffers ? (ImageConsumer.TOPDOWNLEFTRIGHT | ImageConsumer.COMPLETESCANLINES) @@ -474,9 +474,9 @@ public class MemoryImageSource implements ImageProducer { if ((w <= 0 || h <= 0) && !framenotify) { return; } - Enumeration enum_ = theConsumers.elements(); + Enumeration enum_ = theConsumers.elements(); while (enum_.hasMoreElements()) { - ImageConsumer ic = (ImageConsumer) enum_.nextElement(); + ImageConsumer ic = enum_.nextElement(); if (w > 0 && h > 0) { sendPixels(ic, x, y, w, h); } diff --git a/jdk/src/share/classes/java/awt/image/ReplicateScaleFilter.java b/jdk/src/share/classes/java/awt/image/ReplicateScaleFilter.java index 04a6fdfe52a..7330439f2c5 100644 --- a/jdk/src/share/classes/java/awt/image/ReplicateScaleFilter.java +++ b/jdk/src/share/classes/java/awt/image/ReplicateScaleFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -121,6 +121,7 @@ public class ReplicateScaleFilter extends ImageFilter { * with the filtering operation. */ public void setProperties(Hashtable props) { + @SuppressWarnings("unchecked") Hashtable p = (Hashtable)props.clone(); String key = "rescale"; String val = destWidth + "x" + destHeight; diff --git a/jdk/src/share/classes/java/awt/image/renderable/ParameterBlock.java b/jdk/src/share/classes/java/awt/image/renderable/ParameterBlock.java index ca12bfc4c4b..bf14e8ce2d3 100644 --- a/jdk/src/share/classes/java/awt/image/renderable/ParameterBlock.java +++ b/jdk/src/share/classes/java/awt/image/renderable/ParameterBlock.java @@ -153,6 +153,7 @@ public class ParameterBlock implements Cloneable, Serializable { * * @return an Object clone of the ParameterBlock. */ + @SuppressWarnings("unchecked") // casts from clone public Object clone() { ParameterBlock theClone; @@ -164,10 +165,10 @@ public class ParameterBlock implements Cloneable, Serializable { } if (sources != null) { - theClone.setSources((Vector)sources.clone()); + theClone.setSources((Vector)sources.clone()); } if (parameters != null) { - theClone.setParameters((Vector)parameters.clone()); + theClone.setParameters((Vector)parameters.clone()); } return (Object) theClone; } @@ -280,7 +281,7 @@ public class ParameterBlock implements Cloneable, Serializable { /** Clears the list of source images. */ public void removeSources() { - sources = new Vector(); + sources = new Vector<>(); } /** @@ -313,7 +314,7 @@ public class ParameterBlock implements Cloneable, Serializable { /** Clears the list of parameters. */ public void removeParameters() { - parameters = new Vector(); + parameters = new Vector<>(); } /** @@ -696,9 +697,9 @@ public class ParameterBlock implements Cloneable, Serializable { * of the parameters. * @return an array of Class objects. */ - public Class [] getParamClasses() { + public Class[] getParamClasses() { int numParams = getNumParameters(); - Class [] classes = new Class[numParams]; + Class[] classes = new Class[numParams]; int i; for (i = 0; i < numParams; i++) { diff --git a/jdk/src/share/classes/java/awt/image/renderable/RenderableImageOp.java b/jdk/src/share/classes/java/awt/image/renderable/RenderableImageOp.java index 6c51f65a8bf..9d5aaa954a8 100644 --- a/jdk/src/share/classes/java/awt/image/renderable/RenderableImageOp.java +++ b/jdk/src/share/classes/java/awt/image/renderable/RenderableImageOp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -87,11 +87,11 @@ public class RenderableImageOp implements RenderableImage { return getRenderableSources(); } - private Vector getRenderableSources() { - Vector sources = null; + private Vector getRenderableSources() { + Vector sources = null; if (paramBlock.getNumSources() > 0) { - sources = new Vector(); + sources = new Vector<>(); int i = 0; while (i < paramBlock.getNumSources()) { Object o = paramBlock.getSource(i); @@ -314,19 +314,19 @@ public class RenderableImageOp implements RenderableImage { // contains RenderableImage sources, they will be replaced by // RenderedImages. ParameterBlock renderedParamBlock = (ParameterBlock)paramBlock.clone(); - Vector sources = getRenderableSources(); + Vector sources = getRenderableSources(); try { // This assumes that if there is no renderable source, that there // is a rendered source in paramBlock if (sources != null) { - Vector renderedSources = new Vector(); + Vector renderedSources = new Vector<>(); for (int i = 0; i < sources.size(); i++) { rcOut = myCRIF.mapRenderContext(i, renderContext, paramBlock, this); RenderedImage rdrdImage = - ((RenderableImage)sources.elementAt(i)).createRendering(rcOut); + ((RenderableImage)sources.elementAt(i)).createRendering(rcOut); if (rdrdImage == null) { return null; } diff --git a/jdk/src/share/classes/java/awt/image/renderable/RenderableImageProducer.java b/jdk/src/share/classes/java/awt/image/renderable/RenderableImageProducer.java index c5e357a28c2..206869ae1bf 100644 --- a/jdk/src/share/classes/java/awt/image/renderable/RenderableImageProducer.java +++ b/jdk/src/share/classes/java/awt/image/renderable/RenderableImageProducer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -68,7 +68,7 @@ public class RenderableImageProducer implements ImageProducer, Runnable { RenderContext rc; /** A Vector of image consumers. */ - Vector ics = new Vector(); + Vector ics = new Vector<>(); /** * Constructs a new RenderableImageProducer from a RenderableImage @@ -177,12 +177,12 @@ public class RenderableImageProducer implements ImageProducer, Runnable { int width = raster.getWidth(); int height = raster.getHeight(); - Enumeration icList; + Enumeration icList; ImageConsumer ic; // Set up the ImageConsumers icList = ics.elements(); while (icList.hasMoreElements()) { - ic = (ImageConsumer)icList.nextElement(); + ic = icList.nextElement(); ic.setDimensions(width,height); ic.setHints(ImageConsumer.TOPDOWNLEFTRIGHT | ImageConsumer.COMPLETESCANLINES | @@ -204,7 +204,7 @@ public class RenderableImageProducer implements ImageProducer, Runnable { // Now send the scanline to the Consumers icList = ics.elements(); while (icList.hasMoreElements()) { - ic = (ImageConsumer)icList.nextElement(); + ic = icList.nextElement(); ic.setPixels(0, j, width, 1, colorModel, pix, 0, width); } } @@ -212,7 +212,7 @@ public class RenderableImageProducer implements ImageProducer, Runnable { // Now tell the consumers we're done. icList = ics.elements(); while (icList.hasMoreElements()) { - ic = (ImageConsumer)icList.nextElement(); + ic = icList.nextElement(); ic.imageComplete(ImageConsumer.STATICIMAGEDONE); } } diff --git a/jdk/src/share/classes/java/awt/print/Book.java b/jdk/src/share/classes/java/awt/print/Book.java index 672b842e8e7..eaab083789c 100644 --- a/jdk/src/share/classes/java/awt/print/Book.java +++ b/jdk/src/share/classes/java/awt/print/Book.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,7 +47,7 @@ public class Book implements Pageable { /** * The set of pages that make up the Book. */ - private Vector mPages; + private Vector mPages; /* Instance Methods */ @@ -55,7 +55,7 @@ public class Book implements Pageable { * Creates a new, empty Book. */ public Book() { - mPages = new Vector(); + mPages = new Vector<>(); } /** @@ -167,7 +167,7 @@ public class Book implements Pageable { private BookPage getPage(int pageIndex) throws ArrayIndexOutOfBoundsException { - return (BookPage) mPages.elementAt(pageIndex); + return mPages.elementAt(pageIndex); } /** diff --git a/jdk/src/share/classes/java/awt/print/PrinterJob.java b/jdk/src/share/classes/java/awt/print/PrinterJob.java index b9b0d134d64..0c80d1490d4 100644 --- a/jdk/src/share/classes/java/awt/print/PrinterJob.java +++ b/jdk/src/share/classes/java/awt/print/PrinterJob.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -74,9 +74,9 @@ public abstract class PrinterJob { if (security != null) { security.checkPrintJobAccess(); } - return (PrinterJob) java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public Object run() { + return java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public PrinterJob run() { String nm = System.getProperty("java.awt.printerjob", null); try { return (PrinterJob)Class.forName(nm).newInstance(); From 0bb0984a41a1c37fc30e14d61b451ae51c6560c2 Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Wed, 7 May 2014 19:40:30 +0400 Subject: [PATCH 29/50] 8042585: [macosx] Unused code in LWCToolkit.m Reviewed-by: serb, azvegint --- jdk/src/macosx/native/sun/awt/LWCToolkit.m | 57 +--------------------- 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/jdk/src/macosx/native/sun/awt/LWCToolkit.m b/jdk/src/macosx/native/sun/awt/LWCToolkit.m index c78834547c3..7347ecdd251 100644 --- a/jdk/src/macosx/native/sun/awt/LWCToolkit.m +++ b/jdk/src/macosx/native/sun/awt/LWCToolkit.m @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -157,61 +157,6 @@ JNF_COCOA_ENTER(env); JNF_COCOA_EXIT(env); } -static JNF_CLASS_CACHE(jc_Component, "java/awt/Component"); -static JNF_MEMBER_CACHE(jf_Component_appContext, jc_Component, "appContext", "Lsun/awt/AppContext;"); -static JNF_CLASS_CACHE(jc_MenuComponent, "java/awt/MenuComponent"); -static JNF_MEMBER_CACHE(jf_MenuComponent_appContext, jc_MenuComponent, "appContext", "Lsun/awt/AppContext;"); - -/* - * Class: sun_awt_SunToolkit - * Method: getAppContext - * Signature: (Ljava/awt/Object;)Lsun/awt/AppContext; - */ -JNIEXPORT jobject JNICALL -Java_sun_awt_SunToolkit_getAppContext -(JNIEnv *env, jclass cls, jobject obj) -{ - jobject appContext = NULL; - -JNF_COCOA_ENTER(env); - - if (JNFIsInstanceOf(env, obj, &jc_Component)) { - appContext = JNFGetObjectField(env, obj, jf_Component_appContext); - } else if (JNFIsInstanceOf(env, obj, &jc_MenuComponent)) { - appContext = JNFGetObjectField(env, obj, jf_MenuComponent_appContext); - } - -JNF_COCOA_EXIT(env); - - return appContext; -} - -/* - * Class: sun_awt_SunToolkit - * Method: setAppContext - * Signature: (Ljava/lang/Object;Lsun/awt/AppContext;)Z - */ -JNIEXPORT jboolean JNICALL -Java_sun_awt_SunToolkit_setAppContext -(JNIEnv *env, jclass cls, jobject obj, jobject appContext) -{ - jboolean isComponent; - -JNF_COCOA_ENTER(env); - - if (JNFIsInstanceOf(env, obj, &jc_Component)) { - JNFSetObjectField(env, obj, jf_Component_appContext, appContext); - isComponent = JNI_TRUE; - } else if (JNFIsInstanceOf(env, obj, &jc_MenuComponent)) { - JNFSetObjectField(env, obj, jf_MenuComponent_appContext, appContext); - isComponent = JNI_FALSE; - } - -JNF_COCOA_EXIT(env); - - return isComponent; -} - /* * Class: sun_lwawt_macosx_LWCToolkit * Method: beep From ceed2af62067267e6607d69707748b87d14058d2 Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Wed, 7 May 2014 19:47:26 +0400 Subject: [PATCH 30/50] 8042219: [macosx] LWComponentPeer should not reference classes from sun.lwawt.macosx Reviewed-by: serb, azvegint --- .../classes/sun/lwawt/LWComponentPeer.java | 12 +++-- .../macosx/classes/sun/lwawt/LWToolkit.java | 5 +++ .../classes/sun/lwawt/PlatformDropTarget.java | 34 ++++++++++++++ .../classes/sun/lwawt/macosx/CDropTarget.java | 45 ++++++------------- .../classes/sun/lwawt/macosx/LWCToolkit.java | 9 +++- jdk/src/macosx/native/sun/awt/CDropTarget.h | 2 +- jdk/src/macosx/native/sun/awt/CDropTarget.m | 6 +-- 7 files changed, 70 insertions(+), 43 deletions(-) create mode 100644 jdk/src/macosx/classes/sun/lwawt/PlatformDropTarget.java diff --git a/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java b/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java index 5880d06be4d..354f2538012 100644 --- a/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java +++ b/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java @@ -63,8 +63,6 @@ import javax.swing.JComponent; import javax.swing.SwingUtilities; import javax.swing.RepaintManager; -import sun.lwawt.macosx.CDropTarget; - import com.sun.java.swing.SwingUtilities3; public abstract class LWComponentPeer @@ -137,7 +135,7 @@ public abstract class LWComponentPeer private final Object dropTargetLock = new Object(); private int fNumDropTargets = 0; - private CDropTarget fDropTarget = null; + private PlatformDropTarget fDropTarget = null; private final PlatformComponent platformComponent; @@ -1063,11 +1061,11 @@ public abstract class LWComponentPeer // if it's the first (or last) one for the component. Otherwise this call is a no-op. if (++fNumDropTargets == 1) { // Having a non-null drop target would be an error but let's check just in case: - if (fDropTarget != null) - System.err.println("CComponent.addDropTarget(): current drop target is non-null."); - + if (fDropTarget != null) { + throw new IllegalStateException("Current drop target is not null"); + } // Create a new drop target: - fDropTarget = CDropTarget.createDropTarget(dt, target, this); + fDropTarget = LWToolkit.getLWToolkit().createDropTarget(dt, target, this); } } } diff --git a/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java b/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java index b18fdb004f1..315a19a7ff3 100644 --- a/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java +++ b/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java @@ -28,6 +28,7 @@ package sun.lwawt; import java.awt.*; import java.awt.List; import java.awt.datatransfer.*; +import java.awt.dnd.DropTarget; import java.awt.image.*; import java.awt.peer.*; import java.security.*; @@ -440,6 +441,10 @@ public abstract class LWToolkit extends SunToolkit implements Runnable { protected abstract FileDialogPeer createFileDialogPeer(FileDialog target); + protected abstract PlatformDropTarget createDropTarget(DropTarget dropTarget, + Component component, + LWComponentPeer peer); + // ---- UTILITY METHODS ---- // /* diff --git a/jdk/src/macosx/classes/sun/lwawt/PlatformDropTarget.java b/jdk/src/macosx/classes/sun/lwawt/PlatformDropTarget.java new file mode 100644 index 00000000000..e2a9a70e70f --- /dev/null +++ b/jdk/src/macosx/classes/sun/lwawt/PlatformDropTarget.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package sun.lwawt; + +public interface PlatformDropTarget { + + /** + * Release native dragging destination, if any + */ + void dispose(); +} diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTarget.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTarget.java index 910e1407a36..d4f4353d9ec 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTarget.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTarget.java @@ -25,54 +25,37 @@ package sun.lwawt.macosx; -import java.awt.Component; -import java.awt.peer.ComponentPeer; +import sun.lwawt.LWComponentPeer; +import sun.lwawt.PlatformDropTarget; + +import java.awt.*; import java.awt.dnd.DropTarget; -import sun.lwawt.LWComponentPeer; -import sun.lwawt.PlatformWindow; +final class CDropTarget implements PlatformDropTarget { + private long fNativeDropTarget; -public final class CDropTarget { - - Component fComponent; - ComponentPeer fPeer; - DropTarget fDropTarget; - private long fNativeDropTarget; - - public static CDropTarget createDropTarget(DropTarget dropTarget, Component component, ComponentPeer peer) { - return new CDropTarget(dropTarget, component, peer); - } - - private CDropTarget(DropTarget dropTarget, Component component, ComponentPeer peer) { - super(); - - fDropTarget = dropTarget; - fComponent = component; - fPeer = peer; - - long nativePeer = CPlatformWindow.getNativeViewPtr(((LWComponentPeer) peer).getPlatformWindow()); + CDropTarget(DropTarget dropTarget, Component component, LWComponentPeer peer) { + long nativePeer = CPlatformWindow.getNativeViewPtr(peer.getPlatformWindow()); if (nativePeer == 0L) return; // Unsupported for a window without a native view (plugin) // Create native dragging destination: - fNativeDropTarget = this.createNativeDropTarget(dropTarget, component, peer, nativePeer); + fNativeDropTarget = createNativeDropTarget(dropTarget, component, nativePeer); if (fNativeDropTarget == 0) { throw new IllegalStateException("CDropTarget.createNativeDropTarget() failed."); } } - public DropTarget getDropTarget() { - return fDropTarget; - } - + @Override public void dispose() { - // Release native dragging destination, if any: if (fNativeDropTarget != 0) { - this.releaseNativeDropTarget(fNativeDropTarget); + releaseNativeDropTarget(fNativeDropTarget); fNativeDropTarget = 0; } } - protected native long createNativeDropTarget(DropTarget dropTarget, Component component, ComponentPeer peer, long nativePeer); + protected native long createNativeDropTarget(DropTarget dropTarget, + Component component, + long nativePeer); protected native void releaseNativeDropTarget(long nativeDropTarget); } diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java index d0b6882b9a3..2bb5d4ac508 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java @@ -701,7 +701,14 @@ public final class LWCToolkit extends LWToolkit { return (T)dgr; } -// InputMethodSupport Method + @Override + protected PlatformDropTarget createDropTarget(DropTarget dropTarget, + Component component, + LWComponentPeer peer) { + return new CDropTarget(dropTarget, component, peer); + } + + // InputMethodSupport Method /** * Returns the default keyboard locale of the underlying operating system */ diff --git a/jdk/src/macosx/native/sun/awt/CDropTarget.h b/jdk/src/macosx/native/sun/awt/CDropTarget.h index b6cd156562b..3b87485add7 100644 --- a/jdk/src/macosx/native/sun/awt/CDropTarget.h +++ b/jdk/src/macosx/native/sun/awt/CDropTarget.h @@ -48,7 +48,7 @@ + (CDropTarget *) currentDropTarget; // Common methods: -- (id)init:(jobject)dropTarget component:(jobject)jcomponent peer:(jobject)jpeer control:(id)control; +- (id)init:(jobject)dropTarget component:(jobject)jcomponent control:(id)control; - (void)controlModelControlValid; - (void)removeFromView:(JNIEnv *)env; diff --git a/jdk/src/macosx/native/sun/awt/CDropTarget.m b/jdk/src/macosx/native/sun/awt/CDropTarget.m index 41b0a192c61..7e038ab7715 100644 --- a/jdk/src/macosx/native/sun/awt/CDropTarget.m +++ b/jdk/src/macosx/native/sun/awt/CDropTarget.m @@ -65,7 +65,7 @@ extern JNFClassInfo jc_CDropTargetContextPeer; return sCurrentDropTarget; } -- (id)init:(jobject)jdropTarget component:(jobject)jcomponent peer:(jobject)jpeer control:(id)control +- (id)init:(jobject)jdropTarget component:(jobject)jcomponent control:(id)control { self = [super init]; DLog2(@"[CDropTarget init]: %@\n", self); @@ -714,13 +714,13 @@ extern JNFClassInfo jc_CDropTargetContextPeer; * Signature: (Ljava/awt/dnd/DropTarget;Ljava/awt/Component;Ljava/awt/peer/ComponentPeer;J)J */ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CDropTarget_createNativeDropTarget - (JNIEnv *env, jobject jthis, jobject jdroptarget, jobject jcomponent, jobject jpeer, jlong jnativepeer) + (JNIEnv *env, jobject jthis, jobject jdroptarget, jobject jcomponent, jlong jnativepeer) { CDropTarget* dropTarget = nil; JNF_COCOA_ENTER(env); id controlObj = (id) jlong_to_ptr(jnativepeer); - dropTarget = [[CDropTarget alloc] init:jdroptarget component:jcomponent peer:jpeer control:controlObj]; + dropTarget = [[CDropTarget alloc] init:jdroptarget component:jcomponent control:controlObj]; JNF_COCOA_EXIT(env); return ptr_to_jlong(dropTarget); From b9113e4f414c37306bc07ccbf09abf4801d4c13b Mon Sep 17 00:00:00 2001 From: David DeHaven Date: Mon, 5 May 2014 23:21:27 -0700 Subject: [PATCH 31/50] 8042440: awt_Plugin no longer needed Reviewed-by: serb, pchelko --- jdk/make/lib/Awt2dLibraries.gmk | 1 - jdk/make/mapfiles/libawt/mapfile-mawt-vers | 7 +- jdk/make/mapfiles/libawt/mapfile-vers | 9 +- jdk/make/mapfiles/libawt/mapfile-vers-linux | 14 +- jdk/make/mapfiles/libawt_xawt/mapfile-vers | 8 +- .../solaris/native/sun/awt/awt_LoadLibrary.c | 54 ------- jdk/src/solaris/native/sun/awt/awt_Plugin.c | 149 ------------------ jdk/src/solaris/native/sun/awt/awt_Plugin.h | 54 ------- 8 files changed, 4 insertions(+), 292 deletions(-) delete mode 100644 jdk/src/solaris/native/sun/awt/awt_Plugin.c delete mode 100644 jdk/src/solaris/native/sun/awt/awt_Plugin.h diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk index 00fa15c59ec..880a52ff096 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -606,7 +606,6 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) debug_mem.c \ debug_trace.c \ debug_util.c \ - awt_Plugin.c \ gnome_interface.c \ gtk2_interface.c \ swing_GTKEngine.c \ diff --git a/jdk/make/mapfiles/libawt/mapfile-mawt-vers b/jdk/make/mapfiles/libawt/mapfile-mawt-vers index a50c13a62e5..b8ea1636c88 100644 --- a/jdk/make/mapfiles/libawt/mapfile-mawt-vers +++ b/jdk/make/mapfiles/libawt/mapfile-mawt-vers @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -249,11 +249,6 @@ SUNWprivate_1.1 { Java_sun_awt_motif_XsessionWMcommand; Java_sun_awt_motif_XsessionWMcommand_New; - # Java Plugin - getAwtLockFunctions; - getAwtData; - getAwtDisplay; - # libfontmanager entry points AWTIsHeadless; AWTCountFonts; diff --git a/jdk/make/mapfiles/libawt/mapfile-vers b/jdk/make/mapfiles/libawt/mapfile-vers index 05ca7d538dd..b1c6a39ec1e 100644 --- a/jdk/make/mapfiles/libawt/mapfile-vers +++ b/jdk/make/mapfiles/libawt/mapfile-vers @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -173,13 +173,6 @@ SUNWprivate_1.1 { Java_sun_awt_motif_XsessionWMcommand; Java_sun_awt_motif_XsessionWMcommand_New; - # Java Plugin - # This is in awt_LoadLibrary.c and falls through to libmawt. - # Evidently plugin needs this for backward compatability. - getAwtLockFunctions; - getAwtData; - getAwtDisplay; - # libfontmanager entry points AWTIsHeadless; GrPrim_Sg2dGetCompInfo; diff --git a/jdk/make/mapfiles/libawt/mapfile-vers-linux b/jdk/make/mapfiles/libawt/mapfile-vers-linux index f8967e09462..922b015c68c 100644 --- a/jdk/make/mapfiles/libawt/mapfile-vers-linux +++ b/jdk/make/mapfiles/libawt/mapfile-vers-linux @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -152,13 +152,6 @@ SUNWprivate_1.1 { # Evidently CDE needs this for backward compatability. Java_sun_awt_motif_XsessionWMcommand; - # Java Plugin - # This is in awt_LoadLibrary.c and falls through to libmawt. - # Evidently plugin needs this for backward compatability. - getAwtLockFunctions; - getAwtData; - getAwtDisplay; - # libfontmanager entry points AWTIsHeadless; GrPrim_Sg2dGetCompInfo; @@ -283,11 +276,6 @@ SUNWprivate_1.1 { # CDE private entry point Java_sun_awt_motif_XsessionWMcommand; - # Java Plugin - getAwtLockFunctions; - getAwtData; - getAwtDisplay; - # libfontmanager entry points AWTIsHeadless; AWTCountFonts; diff --git a/jdk/make/mapfiles/libawt_xawt/mapfile-vers b/jdk/make/mapfiles/libawt_xawt/mapfile-vers index 15089a114ca..3ae8af3ddbf 100644 --- a/jdk/make/mapfiles/libawt_xawt/mapfile-vers +++ b/jdk/make/mapfiles/libawt_xawt/mapfile-vers @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -449,12 +449,6 @@ SUNWprivate_1.1 { awt_Lock; awt_GetComponent; - # Java Plugin - # This is in awt_LoadLibrary.c and falls through to libmawt. - # Evidently plugin needs this for backward compatability. - getAwtLockFunctions; - getAwtData; - getAwtDisplay; #XAWT entry point for CDE Java_sun_awt_motif_XsessionWMcommand; Java_sun_awt_motif_XsessionWMcommand_New; diff --git a/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c b/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c index 362d9d70dfb..59483027131 100644 --- a/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c +++ b/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c @@ -35,8 +35,6 @@ #include #include -#include "awt_Plugin.h" - #ifdef AIX #include "porting_aix.h" /* For the 'dladdr' function. */ #endif @@ -236,55 +234,3 @@ Java_sun_awt_motif_XsessionWMcommand_New(JNIEnv *env, jobjectArray jargv) (*XsessionWMcommand)(env, jargv); } - - -#define REFLECT_VOID_FUNCTION(name, arglist, paramlist) \ -typedef void name##_type arglist; \ -void name arglist \ -{ \ - static name##_type *name##_ptr = NULL; \ - if (name##_ptr == NULL && awtHandle == NULL) { \ - return; \ - } \ - name##_ptr = (name##_type *) \ - dlsym(awtHandle, #name); \ - if (name##_ptr == NULL) { \ - return; \ - } \ - (*name##_ptr)paramlist; \ -} - -#define REFLECT_FUNCTION(return_type, name, arglist, paramlist) \ -typedef return_type name##_type arglist; \ -return_type name arglist \ -{ \ - static name##_type *name##_ptr = NULL; \ - if (name##_ptr == NULL && awtHandle == NULL) { \ - return NULL; \ - } \ - name##_ptr = (name##_type *) \ - dlsym(awtHandle, #name); \ - if (name##_ptr == NULL) { \ - return NULL; \ - } \ - return (*name##_ptr)paramlist; \ -} - - -/* - * These entry point must remain in libawt.so ***for Java Plugin ONLY*** - * Reflect this call over to the correct libawt_.so. - */ - -REFLECT_VOID_FUNCTION(getAwtLockFunctions, - (void (**AwtLock)(JNIEnv *), void (**AwtUnlock)(JNIEnv *), - void (**AwtNoFlushUnlock)(JNIEnv *), void *reserved), - (AwtLock, AwtUnlock, AwtNoFlushUnlock, reserved)) - -REFLECT_VOID_FUNCTION(getAwtData, - (int32_t *awt_depth, Colormap *awt_cmap, Visual **awt_visual, - int32_t *awt_num_colors, void *pReserved), - (awt_depth, awt_cmap, awt_visual, - awt_num_colors, pReserved)) - -REFLECT_FUNCTION(Display *, getAwtDisplay, (void), ()) diff --git a/jdk/src/solaris/native/sun/awt/awt_Plugin.c b/jdk/src/solaris/native/sun/awt/awt_Plugin.c deleted file mode 100644 index 0b33ac2b23b..00000000000 --- a/jdk/src/solaris/native/sun/awt/awt_Plugin.c +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -#ifdef HEADLESS - #error This file should not be included in headless library -#endif - -#include -#include -#include -#include -#include - -/* - * Fix 4221246: Provide utility function for Netscape to use to - * get AWT display, depth, colormap, and number of colors. - * - */ - -Display *getAwtDisplay(void) -{ - return awt_display; -} - -void getExtAwtData(Display *display, - int32_t screen, - int32_t *awt_depth, - Colormap *awt_cmap, - Visual **awt_visual, - int32_t *awt_num_colors, - void *pReserved) -{ - AwtGraphicsConfigDataPtr defaultConfig = NULL; - -#ifdef DEBUG - if (pReserved != NULL) { - jio_fprintf(stderr, - "getExtAwtData: warning: reserved pointer is not null\n"); - } -#endif - - if (screen >= 0) { - defaultConfig = getDefaultConfig(screen); - } - - if (defaultConfig) { - if (awt_depth != NULL) { - *awt_depth = defaultConfig->awt_depth; - } - - if (awt_cmap != NULL) { - *awt_cmap = defaultConfig->awt_cmap; - } - - if (awt_visual != NULL) { - *awt_visual = defaultConfig->awt_visInfo.visual; - } - - if (awt_num_colors != NULL) { - *awt_num_colors = defaultConfig->awt_num_colors; - } - } -} - -/* - * getAwtData provided for compatibility with Solaris 1.2 Java Plug-in - * - */ -void getAwtData(int32_t *awt_depth, - Colormap *awt_cmap, - Visual **awt_visual, - int32_t *awt_num_colors, - void *pReserved) -{ - Display *display = getAwtDisplay(); - - getExtAwtData(display, - DefaultScreen(display), - awt_depth, - awt_cmap, - awt_visual, - awt_num_colors, - pReserved); -} - -/* - * Fix 4221246: Provide utility funtion for Netscape to get - * function pointers to AWT lock functions. - * - */ - -static void awt_lock_wrapper(JNIEnv *env) { - AWT_LOCK(); -} - -static void awt_unlock_wrapper(JNIEnv *env) { - AWT_UNLOCK(); -} - -static void awt_noflush_unlock_wrapper(JNIEnv *env) { - AWT_NOFLUSH_UNLOCK(); -} - -void getAwtLockFunctions(void (**AwtLock)(JNIEnv *), - void (**AwtUnlock)(JNIEnv *), - void (**AwtNoFlushUnlock)(JNIEnv *), - void *pReserved) -{ -#ifdef DEBUG - if (pReserved != NULL) { - jio_fprintf(stderr, - "getAwtLockFunctions: warning: reserved pointer is not null\n"); - } -#endif - - if (AwtLock != NULL) { - *AwtLock = awt_lock_wrapper; - } - - if (AwtUnlock != NULL) { - *AwtUnlock = awt_unlock_wrapper; - } - - if (AwtNoFlushUnlock != NULL) { - *AwtNoFlushUnlock = awt_noflush_unlock_wrapper; - } -} diff --git a/jdk/src/solaris/native/sun/awt/awt_Plugin.h b/jdk/src/solaris/native/sun/awt/awt_Plugin.h deleted file mode 100644 index 434fabb7216..00000000000 --- a/jdk/src/solaris/native/sun/awt/awt_Plugin.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * Fix 4221246: Export functions for Netscape to use to get AWT info - */ - -#ifndef _AWT_PLUGIN_H_ -#define _AWT_PLUGIN_H_ - -#include -#include -#include - -void getAwtLockFunctions(void (**AwtLock)(JNIEnv *), - void (**AwtUnlock)(JNIEnv *), - void (**AwtNoFlushUnlock)(JNIEnv *), - void *); - -void getExtAwtData(Display *, - int32_t, - int32_t *, /* awt_depth */ - Colormap *, /* awt_cmap */ - Visual **, /* awt_visInfo.visual */ - int32_t *, /* awt_num_colors */ - void *); - -void getAwtData(int32_t *, Colormap *, Visual **, int32_t *, void *); - -Display *getAwtDisplay(void); - -#endif /* _AWT_PLUGIN_H_ */ From 535c74a38e4e5b6f46e0749cc7926c313f713ca0 Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Thu, 8 May 2014 11:46:03 +0200 Subject: [PATCH 32/50] 8042416: X11GraphicsEnvironment.isDisplayLocal() throws NoSuchElementException if DISPLAY host has more IP addresses than a local interface Reviewed-by: anthony, azvegint --- jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java b/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java index 02f491d6707..cfa6e516dfe 100644 --- a/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java +++ b/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java @@ -277,8 +277,9 @@ public class X11GraphicsEnvironment for (; interfaces.hasMoreElements();) { locals = interfaces.nextElement().getInetAddresses(); for (; locals.hasMoreElements();) { + final InetAddress localAddr = locals.nextElement(); for (int i = 0; i < remAddr.length; i++) { - if (locals.nextElement().equals(remAddr[i])) { + if (localAddr.equals(remAddr[i])) { return Boolean.TRUE; } } From 1ec8e7aa8a6ee79c58d5c9fb5e28579cbff2a1cd Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Thu, 8 May 2014 16:50:42 +0400 Subject: [PATCH 33/50] 8036917: [macosx] Native memory leaks Reviewed-by: serb, azvegint --- jdk/src/macosx/native/sun/awt/CImage.m | 33 +++++++++++++------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/jdk/src/macosx/native/sun/awt/CImage.m b/jdk/src/macosx/native/sun/awt/CImage.m index b6db3458047..e4ef6306031 100644 --- a/jdk/src/macosx/native/sun/awt/CImage.m +++ b/jdk/src/macosx/native/sun/awt/CImage.m @@ -76,17 +76,17 @@ static void CImage_CopyNSImageIntoArray static NSBitmapImageRep* CImage_CreateImageRep(JNIEnv *env, jintArray buffer, jint width, jint height) { - NSBitmapImageRep* imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL - pixelsWide:width - pixelsHigh:height - bitsPerSample:8 - samplesPerPixel:4 - hasAlpha:YES - isPlanar:NO - colorSpaceName:NSDeviceRGBColorSpace - bitmapFormat:NSAlphaFirstBitmapFormat - bytesPerRow:width*4 // TODO: use explicit scanStride - bitsPerPixel:32]; + NSBitmapImageRep* imageRep = [[[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL + pixelsWide:width + pixelsHigh:height + bitsPerSample:8 + samplesPerPixel:4 + hasAlpha:YES + isPlanar:NO + colorSpaceName:NSDeviceRGBColorSpace + bitmapFormat:NSAlphaFirstBitmapFormat + bytesPerRow:width*4 // TODO: use explicit scanStride + bitsPerPixel:32] autorelease]; jint *imgData = (jint *)[imageRep bitmapData]; if (imgData == NULL) return 0L; @@ -115,9 +115,8 @@ JNF_COCOA_ENTER(env); NSBitmapImageRep* imageRep = CImage_CreateImageRep(env, buffer, width, height); if (imageRep) { - NSImage *nsImage = [[[NSImage alloc] initWithSize:NSMakeSize(width, height)] retain]; + NSImage *nsImage = [[NSImage alloc] initWithSize:NSMakeSize(width, height)]; [nsImage addRepresentation:imageRep]; - [imageRep release]; result = ptr_to_jlong(nsImage); } @@ -160,7 +159,7 @@ JNF_COCOA_ENTER(env); (*env)->ReleaseIntArrayElements(env, widths, ws, JNI_ABORT); } if ([reps count]) { - NSImage *nsImage = [[[NSImage alloc] initWithSize:NSMakeSize(0, 0)] retain]; + NSImage *nsImage = [[NSImage alloc] initWithSize:NSMakeSize(0, 0)]; [nsImage addRepresentations: reps]; result = ptr_to_jlong(nsImage); } @@ -184,7 +183,7 @@ JNF_COCOA_ENTER(env); IconRef iconRef; if (noErr == GetIconRef(kOnSystemDisk, kSystemIconsCreator, selector, &iconRef)) { - image = [[[NSImage alloc] initWithIconRef:iconRef] retain]; + image = [[NSImage alloc] initWithIconRef:iconRef]; ReleaseIconRef(iconRef); } @@ -206,7 +205,7 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CImage_nativeCreateNSImageFromFile JNF_COCOA_ENTER(env); NSString *path = JNFNormalizedNSStringForPath(env, file); - image = [[[NSImage alloc] initByReferencingFile:path] retain]; + image = [[NSImage alloc] initByReferencingFile:path]; JNF_COCOA_EXIT(env); @@ -435,7 +434,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_lwawt_macosx_CImage_nativeGetPlatformImage JNF_COCOA_ENTER(env); - NSBitmapImageRep* imageRep = [CImage_CreateImageRep(env, buffer, width, height) autorelease]; + NSBitmapImageRep* imageRep = CImage_CreateImageRep(env, buffer, width, height); if (imageRep) { NSData *tiffImage = [imageRep TIFFRepresentation]; jsize tiffSize = (jsize)[tiffImage length]; From 358e8a04ee83ac9aec3c9a743e8bf6619df98173 Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Thu, 8 May 2014 18:37:34 +0400 Subject: [PATCH 34/50] 8042752: [macosx] NSEvent instances leak throw JNI local references Reviewed-by: serb, azvegint --- jdk/src/macosx/native/sun/awt/AWTView.m | 13 +++++++------ jdk/src/macosx/native/sun/awt/CTrayIcon.m | 7 +++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jdk/src/macosx/native/sun/awt/AWTView.m b/jdk/src/macosx/native/sun/awt/AWTView.m index bcc832190f4..830fb77e82b 100644 --- a/jdk/src/macosx/native/sun/awt/AWTView.m +++ b/jdk/src/macosx/native/sun/awt/AWTView.m @@ -27,6 +27,7 @@ #import #import +#import "jni_util.h" #import "ThreadUtilities.h" #import "AWTView.h" @@ -391,14 +392,12 @@ AWT_ASSERT_APPKIT_THREAD; (jint)absP.x, (jint)absP.y, [event deltaY], [event deltaX]); - if (jEvent == nil) { - // Unable to create event by some reason. - return; - } + CHECK_NULL(jEvent); static JNF_CLASS_CACHE(jc_PlatformView, "sun/lwawt/macosx/CPlatformView"); static JNF_MEMBER_CACHE(jm_deliverMouseEvent, jc_PlatformView, "deliverMouseEvent", "(Lsun/lwawt/macosx/NSEvent;)V"); JNFCallVoidMethod(env, m_cPlatformView, jm_deliverMouseEvent, jEvent); + (*env)->DeleteLocalRef(env, jEvent); } - (void) resetTrackingArea { @@ -447,20 +446,22 @@ AWT_ASSERT_APPKIT_THREAD; static JNF_CLASS_CACHE(jc_NSEvent, "sun/lwawt/macosx/NSEvent"); static JNF_CTOR_CACHE(jctor_NSEvent, jc_NSEvent, "(IISLjava/lang/String;)V"); - jobject jevent = JNFNewObject(env, jctor_NSEvent, + jobject jEvent = JNFNewObject(env, jctor_NSEvent, [event type], [event modifierFlags], [event keyCode], characters); + CHECK_NULL(jEvent); static JNF_CLASS_CACHE(jc_PlatformView, "sun/lwawt/macosx/CPlatformView"); static JNF_MEMBER_CACHE(jm_deliverKeyEvent, jc_PlatformView, "deliverKeyEvent", "(Lsun/lwawt/macosx/NSEvent;)V"); - JNFCallVoidMethod(env, m_cPlatformView, jm_deliverKeyEvent, jevent); + JNFCallVoidMethod(env, m_cPlatformView, jm_deliverKeyEvent, jEvent); if (characters != NULL) { (*env)->DeleteLocalRef(env, characters); } + (*env)->DeleteLocalRef(env, jEvent); } -(void) deliverResize: (NSRect) rect { diff --git a/jdk/src/macosx/native/sun/awt/CTrayIcon.m b/jdk/src/macosx/native/sun/awt/CTrayIcon.m index 79ae024f76f..35adf3b866d 100644 --- a/jdk/src/macosx/native/sun/awt/CTrayIcon.m +++ b/jdk/src/macosx/native/sun/awt/CTrayIcon.m @@ -25,6 +25,7 @@ #import #import +#import "jni_util.h" #import "CTrayIcon.h" #import "ThreadUtilities.h" @@ -146,14 +147,12 @@ static NSSize ScaledImageSizeForStatusBar(NSSize imageSize) { (jint)absP.x, (jint)absP.y, [event deltaY], [event deltaX]); - if (jEvent == nil) { - // Unable to create event by some reason. - return; - } + CHECK_NULL(jEvent); static JNF_CLASS_CACHE(jc_TrayIcon, "sun/lwawt/macosx/CTrayIcon"); static JNF_MEMBER_CACHE(jm_handleMouseEvent, jc_TrayIcon, "handleMouseEvent", "(Lsun/lwawt/macosx/NSEvent;)V"); JNFCallVoidMethod(env, peer, jm_handleMouseEvent, jEvent); + (*env)->DeleteLocalRef(env, jEvent); } @end //AWTTrayIcon From 4c217914c2965a26f38a85379b007f16061e7aad Mon Sep 17 00:00:00 2001 From: Phil Race Date: Thu, 8 May 2014 15:17:02 -0700 Subject: [PATCH 35/50] 8038875: Remove use of ServiceLoader in finding class implementing sun.java2d.pipe. RenderingEngine Reviewed-by: flar, mchung --- jdk/make/CopyIntoClasses.gmk | 2 - jdk/make/profile-rtjar-includes.txt | 3 +- .../services/sun.java2d.pipe.RenderingEngine | 2 - .../sun/java2d/pipe/RenderingEngine.java | 60 +++++++------------ .../services/sun.java2d.pipe.RenderingEngine | 2 - .../services/sun.java2d.pipe.RenderingEngine | 5 -- 6 files changed, 23 insertions(+), 51 deletions(-) delete mode 100644 jdk/src/share/classes/sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine delete mode 100644 jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine delete mode 100644 jdk/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine diff --git a/jdk/make/CopyIntoClasses.gmk b/jdk/make/CopyIntoClasses.gmk index 36b0919fa2f..322901603a3 100644 --- a/jdk/make/CopyIntoClasses.gmk +++ b/jdk/make/CopyIntoClasses.gmk @@ -118,10 +118,8 @@ endif SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS))) ifdef OPENJDK - SRC_SERVICES_FILES := $(filter-out %sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine, $(SRC_SERVICES_FILES)) SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/kcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES)) else - SRC_SERVICES_FILES := $(filter-out %sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine, $(SRC_SERVICES_FILES)) SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES)) endif diff --git a/jdk/make/profile-rtjar-includes.txt b/jdk/make/profile-rtjar-includes.txt index 231b1583ae0..6cce159e400 100644 --- a/jdk/make/profile-rtjar-includes.txt +++ b/jdk/make/profile-rtjar-includes.txt @@ -242,5 +242,4 @@ FULL_JRE_INCLUDE_METAINF_SERVICES := \ META-INF/services/javax.sound.sampled.spi.AudioFileWriter \ META-INF/services/javax.sound.sampled.spi.FormatConversionProvider \ META-INF/services/javax.sound.sampled.spi.MixerProvider \ - META-INF/services/sun.java2d.cmm.PCMM \ - META-INF/services/sun.java2d.pipe.RenderingEngine + META-INF/services/sun.java2d.cmm.PCMM diff --git a/jdk/src/share/classes/sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine b/jdk/src/share/classes/sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine deleted file mode 100644 index 45f0ddfa772..00000000000 --- a/jdk/src/share/classes/sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine +++ /dev/null @@ -1,2 +0,0 @@ -# Ductus Rendering Engine module -sun.dc.DuctusRenderingEngine diff --git a/jdk/src/share/classes/sun/java2d/pipe/RenderingEngine.java b/jdk/src/share/classes/sun/java2d/pipe/RenderingEngine.java index 3c2a77ca73b..034a6e8b218 100644 --- a/jdk/src/share/classes/sun/java2d/pipe/RenderingEngine.java +++ b/jdk/src/share/classes/sun/java2d/pipe/RenderingEngine.java @@ -32,7 +32,6 @@ import java.awt.geom.AffineTransform; import java.security.PrivilegedAction; import java.security.AccessController; -import java.util.ServiceLoader; import sun.security.action.GetPropertyAction; import sun.awt.geom.PathConsumer2D; @@ -97,12 +96,9 @@ public abstract class RenderingEngine { * * * If no specific {@code RenderingEngine} is specified on the command - * or Ductus renderer is specified, it will attempt loading the - * sun.dc.DuctusRenderingEngine class using Class.forName as a fastpath; - * if not found, use the ServiceLoader. - * If no specific {@code RenderingEngine} is specified on the command - * line then the last one returned by enumerating all subclasses of - * {@code RenderingEngine} known to the ServiceLoader is used. + * or Ductus renderer is specified, it will first attempt loading the + * sun.dc.DuctusRenderingEngine class using Class.forName, if that + * is not found, then it will look for Pisces. *

    * Runtime tracing of the actions of the {@code RenderingEngine} * can be enabled by specifying the runtime flag: @@ -117,42 +113,30 @@ public abstract class RenderingEngine { return reImpl; } - reImpl = - AccessController.doPrivileged(new PrivilegedAction() { - public RenderingEngine run() { - final String ductusREClass = "sun.dc.DuctusRenderingEngine"; - String reClass = - System.getProperty("sun.java2d.renderer", ductusREClass); - if (reClass.equals(ductusREClass)) { - try { - Class cls = Class.forName(ductusREClass); - return (RenderingEngine) cls.newInstance(); - } catch (ReflectiveOperationException ignored) { - // not found - } - } - - ServiceLoader reLoader = - ServiceLoader.loadInstalled(RenderingEngine.class); - - RenderingEngine service = null; - - for (RenderingEngine re : reLoader) { - service = re; - if (re.getClass().getName().equals(reClass)) { - break; - } - } - return service; - } - }); + /* Look first for ductus or an app-override renderer, + * if not specified or present, then look for pisces. + */ + final String ductusREClass = "sun.dc.DuctusRenderingEngine"; + final String piscesREClass = "sun.java2d.pisces.PiscesRenderingEngine"; + GetPropertyAction gpa = + new GetPropertyAction("sun.java2d.renderer", ductusREClass); + String reClass = AccessController.doPrivileged(gpa); + try { + Class cls = Class.forName(reClass); + reImpl = (RenderingEngine) cls.newInstance(); + } catch (ReflectiveOperationException ignored0) { + try { + Class cls = Class.forName(piscesREClass); + reImpl = (RenderingEngine) cls.newInstance(); + } catch (ReflectiveOperationException ignored1) { + } + } if (reImpl == null) { throw new InternalError("No RenderingEngine module found"); } - GetPropertyAction gpa = - new GetPropertyAction("sun.java2d.renderer.trace"); + gpa = new GetPropertyAction("sun.java2d.renderer.trace"); String reTrace = AccessController.doPrivileged(gpa); if (reTrace != null) { reImpl = new Tracer(reImpl); diff --git a/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine b/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine deleted file mode 100644 index 607ff59051a..00000000000 --- a/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine +++ /dev/null @@ -1,2 +0,0 @@ -# Pisces Rendering Engine module -sun.java2d.pisces.PiscesRenderingEngine diff --git a/jdk/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine b/jdk/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine deleted file mode 100644 index c79fdbde9c8..00000000000 --- a/jdk/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine +++ /dev/null @@ -1,5 +0,0 @@ -# Jules Rendering Engine module -sun.java2d.jules.JulesRenderingEngine - -# Pisces Rendering Engine module -sun.java2d.pisces.PiscesRenderingEngine From a9f93ddc32c6fc158b449c3bc4b4865a147762fd Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Thu, 8 May 2014 19:27:24 -0400 Subject: [PATCH 36/50] 8042806: Splashscreen uses libjpeg-internal macros Reviewed-by: anthony, prr --- .../share/native/sun/awt/splashscreen/splashscreen_jpeg.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c index f9cb8995c86..8d41c9207d8 100644 --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c @@ -25,7 +25,6 @@ #include "splashscreen_impl.h" -#include "jinclude.h" #include "jpeglib.h" #include "jerror.h" @@ -107,11 +106,11 @@ set_stream_src(j_decompress_ptr cinfo, SplashStream * stream) if (cinfo->src == NULL) { /* first time for this JPEG object? */ cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, - JPOOL_PERMANENT, SIZEOF(stream_source_mgr)); + JPOOL_PERMANENT, sizeof(stream_source_mgr)); src = (stream_src_ptr) cinfo->src; src->buffer = (JOCTET *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, - JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET)); + JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET)); } src = (stream_src_ptr) cinfo->src; From 6e71a0cb82a7690c33660d0d2267b60889566c7c Mon Sep 17 00:00:00 2001 From: Anton Nashatyrev Date: Mon, 12 May 2014 18:21:15 +0400 Subject: [PATCH 37/50] 8024932: [TEST_BUG] [macosx] javax/swing/text/StyledEditorKit/8016833/bug8016833.java failed Reviewed-by: serb, alexsch --- .../swing/text/StyledEditorKit/8016833/bug8016833.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java b/jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java index 601a31de688..1dec0972346 100644 --- a/jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java +++ b/jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -190,9 +190,9 @@ public class bug8016833 { // not too wide assertTrue(out3.getWidth() * 0.8 < out2.getWidth()); // not too low - assertTrue(out3.getY() - (out1.getY() + out2.getHeight()) < 3); + assertTrue(out3.getY() - (out1.getY() + out2.getHeight() - 1) < 4); // not too high - assertTrue(out3.getY() - (out1.getY() + out2.getHeight()) > 0); + assertTrue(out3.getY() - (out1.getY() + out2.getHeight() - 1) > 0); } void testStrikthrough() { @@ -217,7 +217,7 @@ public class bug8016833 { // not too wide assertTrue(out3.getWidth() * 0.8 < out2.getWidth()); // not too low - assertTrue(out3.getY() - (out1.getY() + out2.getHeight()) < 0); + assertTrue(out3.getY() - (out1.getY() + out2.getHeight() - 1) < 0); // not too high assertTrue(out3.getY() - out1.getY() > 1); } From a80118b3ae552c3306ffbe5399a79e4219bdf3f4 Mon Sep 17 00:00:00 2001 From: Phil Race Date: Mon, 12 May 2014 09:32:23 -0700 Subject: [PATCH 38/50] 8038876: Remove use of ServiceLoader in finding class implementing sun.java2d.cmm.CMMServiceProvider Reviewed-by: bae, mchung --- jdk/make/CopyIntoClasses.gmk | 10 ------ jdk/make/profile-rtjar-includes.txt | 3 +- .../classes/sun/java2d/cmm/CMSManager.java | 36 ++++++++----------- .../sun.java2d.cmm.CMMServiceProvider | 2 -- 4 files changed, 15 insertions(+), 36 deletions(-) delete mode 100644 jdk/src/share/classes/sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider diff --git a/jdk/make/CopyIntoClasses.gmk b/jdk/make/CopyIntoClasses.gmk index 322901603a3..b3a216fb90e 100644 --- a/jdk/make/CopyIntoClasses.gmk +++ b/jdk/make/CopyIntoClasses.gmk @@ -111,18 +111,8 @@ else ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_share) endif -ifndef OPENJDK - ALL_META-INF_DIRS += $(JDK_TOPDIR)/src/closed/share/classes/sun/java2d/cmm/kcms/META-INF -endif - SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS))) -ifdef OPENJDK - SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/kcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES)) -else - SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES)) -endif - # The number of services files are relatively few. If the increase in numbers, then # we have to use ListPathsSafelyNow here. # Change $(JDK_TOPDIR)/src/.../META-INF/services/yyyy into $(JDK_OUTPUTDIR)/classes/META-INF/services/yyyy diff --git a/jdk/make/profile-rtjar-includes.txt b/jdk/make/profile-rtjar-includes.txt index 6cce159e400..061a927e616 100644 --- a/jdk/make/profile-rtjar-includes.txt +++ b/jdk/make/profile-rtjar-includes.txt @@ -241,5 +241,4 @@ FULL_JRE_INCLUDE_METAINF_SERVICES := \ META-INF/services/javax.sound.sampled.spi.AudioFileReader \ META-INF/services/javax.sound.sampled.spi.AudioFileWriter \ META-INF/services/javax.sound.sampled.spi.FormatConversionProvider \ - META-INF/services/javax.sound.sampled.spi.MixerProvider \ - META-INF/services/sun.java2d.cmm.PCMM + META-INF/services/javax.sound.sampled.spi.MixerProvider diff --git a/jdk/src/share/classes/sun/java2d/cmm/CMSManager.java b/jdk/src/share/classes/sun/java2d/cmm/CMSManager.java index 6970c59a19c..6036a3c2636 100644 --- a/jdk/src/share/classes/sun/java2d/cmm/CMSManager.java +++ b/jdk/src/share/classes/sun/java2d/cmm/CMSManager.java @@ -34,7 +34,6 @@ import java.awt.image.WritableRaster; import java.security.AccessController; import java.security.PrivilegedAction; import sun.security.action.GetPropertyAction; -import java.util.ServiceLoader; public class CMSManager { public static ColorSpace GRAYspace; // These two fields allow access @@ -52,35 +51,28 @@ public class CMSManager { return cmmImpl; } - CMMServiceProvider spi = AccessController.doPrivileged( - new PrivilegedAction() { - public CMMServiceProvider run() { - String cmmClass = System.getProperty( - "sun.java2d.cmm", "sun.java2d.cmm.lcms.LcmsServiceProvider"); - - ServiceLoader cmmLoader - = ServiceLoader.loadInstalled(CMMServiceProvider.class); - - CMMServiceProvider spi = null; - - for (CMMServiceProvider cmm : cmmLoader) { - spi = cmm; - if (cmm.getClass().getName().equals(cmmClass)) { - break; - } - } - return spi; + GetPropertyAction gpa = new GetPropertyAction("sun.java2d.cmm"); + String cmmProviderClass = AccessController.doPrivileged(gpa); + CMMServiceProvider provider = null; + if (cmmProviderClass != null) { + try { + Class cls = Class.forName(cmmProviderClass); + provider = (CMMServiceProvider)cls.newInstance(); + } catch (ReflectiveOperationException e) { } - }); + } + if (provider == null) { + provider = new sun.java2d.cmm.lcms.LcmsServiceProvider(); + } - cmmImpl = spi.getColorManagementModule(); + cmmImpl = provider.getColorManagementModule(); if (cmmImpl == null) { throw new CMMException("Cannot initialize Color Management System."+ "No CM module found"); } - GetPropertyAction gpa = new GetPropertyAction("sun.java2d.cmm.trace"); + gpa = new GetPropertyAction("sun.java2d.cmm.trace"); String cmmTrace = AccessController.doPrivileged(gpa); if (cmmTrace != null) { cmmImpl = new CMMTracer(cmmImpl); diff --git a/jdk/src/share/classes/sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider b/jdk/src/share/classes/sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider deleted file mode 100644 index ce7ea564ffb..00000000000 --- a/jdk/src/share/classes/sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider +++ /dev/null @@ -1,2 +0,0 @@ -# Little CMS color management module -sun.java2d.cmm.lcms.LcmsServiceProvider From db84d6b169f3bf12b2d4c51881adfff8953c720a Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Tue, 13 May 2014 16:06:12 +0400 Subject: [PATCH 39/50] 8042007: Javadoc cleanup of javax.sound.sampled.spi package Reviewed-by: pchelko, bagiras --- .../sound/sampled/spi/AudioFileReader.java | 139 ++++++++------ .../sound/sampled/spi/AudioFileWriter.java | 106 +++++----- .../sampled/spi/FormatConversionProvider.java | 181 +++++++++--------- .../sound/sampled/spi/MixerProvider.java | 53 +++-- 4 files changed, 248 insertions(+), 231 deletions(-) diff --git a/jdk/src/share/classes/javax/sound/sampled/spi/AudioFileReader.java b/jdk/src/share/classes/javax/sound/sampled/spi/AudioFileReader.java index 7829a900bf2..cc476452126 100644 --- a/jdk/src/share/classes/javax/sound/sampled/spi/AudioFileReader.java +++ b/jdk/src/share/classes/javax/sound/sampled/spi/AudioFileReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,7 +35,7 @@ import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.UnsupportedAudioFileException; /** - * Provider for audio file reading services. Classes providing concrete + * Provider for audio file reading services. Classes providing concrete * implementations can parse the format information from one or more types of * audio file, and can produce audio input streams from files of these types. * @@ -45,93 +45,106 @@ import javax.sound.sampled.UnsupportedAudioFileException; public abstract class AudioFileReader { /** - * Obtains the audio file format of the input stream provided. The stream must - * point to valid audio file data. In general, audio file readers may + * Obtains the audio file format of the input stream provided. The stream + * must point to valid audio file data. In general, audio file readers may * need to read some data from the stream before determining whether they - * support it. These parsers must - * be able to mark the stream, read enough data to determine whether they - * support the stream, and, if not, reset the stream's read pointer to its original - * position. If the input stream does not support this, this method may fail - * with an IOException. - * @param stream the input stream from which file format information should be - * extracted - * @return an AudioFileFormat object describing the audio file format - * @throws UnsupportedAudioFileException if the stream does not point to valid audio - * file data recognized by the system + * support it. These parsers must be able to mark the stream, read enough + * data to determine whether they support the stream, and, if not, reset the + * stream's read pointer to its original position. If the input stream does + * not support this, this method may fail with an {@code IOException}. + * + * @param stream the input stream from which file format information should + * be extracted + * @return an {@code AudioFileFormat} object describing the audio file + * format + * @throws UnsupportedAudioFileException if the stream does not point to + * valid audio file data recognized by the system * @throws IOException if an I/O exception occurs * @see InputStream#markSupported * @see InputStream#mark */ - public abstract AudioFileFormat getAudioFileFormat(InputStream stream) throws UnsupportedAudioFileException, IOException; + public abstract AudioFileFormat getAudioFileFormat(InputStream stream) + throws UnsupportedAudioFileException, IOException; /** - * Obtains the audio file format of the URL provided. The URL must - * point to valid audio file data. - * @param url the URL from which file format information should be - * extracted - * @return an AudioFileFormat object describing the audio file format - * @throws UnsupportedAudioFileException if the URL does not point to valid audio - * file data recognized by the system + * Obtains the audio file format of the URL provided. The URL must point to + * valid audio file data. + * + * @param url the URL from which file format information should be + * extracted + * @return an {@code AudioFileFormat} object describing the audio file + * format + * @throws UnsupportedAudioFileException if the URL does not point to valid + * audio file data recognized by the system * @throws IOException if an I/O exception occurs */ - public abstract AudioFileFormat getAudioFileFormat(URL url) throws UnsupportedAudioFileException, IOException; + public abstract AudioFileFormat getAudioFileFormat(URL url) + throws UnsupportedAudioFileException, IOException; /** - * Obtains the audio file format of the File provided. The File must - * point to valid audio file data. - * @param file the File from which file format information should be - * extracted - * @return an AudioFileFormat object describing the audio file format - * @throws UnsupportedAudioFileException if the File does not point to valid audio - * file data recognized by the system + * Obtains the audio file format of the {@code File} provided. + * The {@code File} must point to valid audio file data. + * + * @param file the {@code File} from which file format information + * should be extracted + * @return an {@code AudioFileFormat} object describing the audio file + * format + * @throws UnsupportedAudioFileException if the {@code File} does not point + * to valid audio file data recognized by the system * @throws IOException if an I/O exception occurs */ - public abstract AudioFileFormat getAudioFileFormat(File file) throws UnsupportedAudioFileException, IOException; + public abstract AudioFileFormat getAudioFileFormat(File file) + throws UnsupportedAudioFileException, IOException; /** - * Obtains an audio input stream from the input stream provided. The stream must - * point to valid audio file data. In general, audio file readers may + * Obtains an audio input stream from the input stream provided. The stream + * must point to valid audio file data. In general, audio file readers may * need to read some data from the stream before determining whether they - * support it. These parsers must - * be able to mark the stream, read enough data to determine whether they - * support the stream, and, if not, reset the stream's read pointer to its original - * position. If the input stream does not support this, this method may fail - * with an IOException. - * @param stream the input stream from which the AudioInputStream should be - * constructed - * @return an AudioInputStream object based on the audio file data contained - * in the input stream. - * @throws UnsupportedAudioFileException if the stream does not point to valid audio - * file data recognized by the system + * support it. These parsers must be able to mark the stream, read enough + * data to determine whether they support the stream, and, if not, reset the + * stream's read pointer to its original position. If the input stream does + * not support this, this method may fail with an {@code IOException}. + * + * @param stream the input stream from which the {@code AudioInputStream} + * should be constructed + * @return an {@code AudioInputStream} object based on the audio file data + * contained in the input stream. + * @throws UnsupportedAudioFileException if the stream does not point to + * valid audio file data recognized by the system * @throws IOException if an I/O exception occurs * @see InputStream#markSupported * @see InputStream#mark */ - public abstract AudioInputStream getAudioInputStream(InputStream stream) throws UnsupportedAudioFileException, IOException; + public abstract AudioInputStream getAudioInputStream(InputStream stream) + throws UnsupportedAudioFileException, IOException; /** - * Obtains an audio input stream from the URL provided. The URL must - * point to valid audio file data. - * @param url the URL for which the AudioInputStream should be - * constructed - * @return an AudioInputStream object based on the audio file data pointed - * to by the URL - * @throws UnsupportedAudioFileException if the URL does not point to valid audio - * file data recognized by the system + * Obtains an audio input stream from the URL provided. The URL must point + * to valid audio file data. + * + * @param url the URL for which the {@code AudioInputStream} should be + * constructed + * @return an {@code AudioInputStream} object based on the audio file data + * pointed to by the URL + * @throws UnsupportedAudioFileException if the URL does not point to valid + * audio file data recognized by the system * @throws IOException if an I/O exception occurs */ - public abstract AudioInputStream getAudioInputStream(URL url) throws UnsupportedAudioFileException, IOException; + public abstract AudioInputStream getAudioInputStream(URL url) + throws UnsupportedAudioFileException, IOException; /** - * Obtains an audio input stream from the File provided. The File must - * point to valid audio file data. - * @param file the File for which the AudioInputStream should be - * constructed - * @return an AudioInputStream object based on the audio file data pointed - * to by the File - * @throws UnsupportedAudioFileException if the File does not point to valid audio - * file data recognized by the system + * Obtains an audio input stream from the {@code File} provided. + * The {@code File} must point to valid audio file data. + * + * @param file the {@code File} for which the {@code AudioInputStream} + * should be constructed + * @return an {@code AudioInputStream} object based on the audio file data + * pointed to by the File + * @throws UnsupportedAudioFileException if the {@code File} does not point + * to valid audio file data recognized by the system * @throws IOException if an I/O exception occurs */ - public abstract AudioInputStream getAudioInputStream(File file) throws UnsupportedAudioFileException, IOException; + public abstract AudioInputStream getAudioInputStream(File file) + throws UnsupportedAudioFileException, IOException; } diff --git a/jdk/src/share/classes/javax/sound/sampled/spi/AudioFileWriter.java b/jdk/src/share/classes/javax/sound/sampled/spi/AudioFileWriter.java index 0207a3b7124..a4cc31bdf18 100644 --- a/jdk/src/share/classes/javax/sound/sampled/spi/AudioFileWriter.java +++ b/jdk/src/share/classes/javax/sound/sampled/spi/AudioFileWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,16 +26,15 @@ package javax.sound.sampled.spi; import java.io.File; -import java.io.InputStream; import java.io.IOException; import java.io.OutputStream; -import javax.sound.sampled.AudioFileFormat; import javax.sound.sampled.AudioInputStream; +import static javax.sound.sampled.AudioFileFormat.Type; /** - * Provider for audio file writing services. Classes providing concrete + * Provider for audio file writing services. Classes providing concrete * implementations can write one or more types of audio file from an audio * stream. * @@ -47,22 +46,23 @@ public abstract class AudioFileWriter { /** * Obtains the file types for which file writing support is provided by this * audio file writer. - * @return array of file types. If no file types are supported, - * an array of length 0 is returned. + * + * @return array of file types. If no file types are supported, an array of + * length 0 is returned. */ - public abstract AudioFileFormat.Type[] getAudioFileTypes(); - + public abstract Type[] getAudioFileTypes(); /** - * Indicates whether file writing support for the specified file type is provided - * by this audio file writer. - * @param fileType the file type for which write capabilities are queried - * @return true if the file type is supported, - * otherwise false + * Indicates whether file writing support for the specified file type is + * provided by this audio file writer. + * + * @param fileType the file type for which write capabilities are queried + * @return {@code true} if the file type is supported, otherwise + * {@code false} */ - public boolean isFileTypeSupported(AudioFileFormat.Type fileType) { + public boolean isFileTypeSupported(Type fileType) { - AudioFileFormat.Type types[] = getAudioFileTypes(); + Type types[] = getAudioFileTypes(); for(int i=0; itrue if the file type is supported for this audio input stream, - * otherwise false + * Indicates whether an audio file of the type specified can be written from + * the audio input stream indicated. + * + * @param fileType file type for which write capabilities are queried + * @param stream for which file writing support is queried + * @return {@code true} if the file type is supported for this audio input + * stream, otherwise {@code false} */ - public boolean isFileTypeSupported(AudioFileFormat.Type fileType, AudioInputStream stream) { + public boolean isFileTypeSupported(Type fileType, AudioInputStream stream) { - AudioFileFormat.Type types[] = getAudioFileTypes( stream ); + Type types[] = getAudioFileTypes( stream ); for(int i=0; i - * The source format represents the format of the incoming - * audio data, which will be converted. + * The source format represents the format of the incoming audio data, which + * will be converted. *

    - * The target format represents the format of the processed, converted - * audio data. This is the format of the data that can be read from - * the stream returned by one of the getAudioInputStream methods. + * The target format represents the format of the processed, converted audio + * data. This is the format of the data that can be read from the stream + * returned by one of the {@code getAudioInputStream} methods. * * @author Kara Kytle * @since 1.3 */ public abstract class FormatConversionProvider { - - // NEW METHODS - /** - * Obtains the set of source format encodings from which format - * conversion services are provided by this provider. + * Obtains the set of source format encodings from which format conversion + * services are provided by this provider. + * * @return array of source format encodings. If for some reason provider - * does not provide any conversion services, an array of length 0 is - * returned. + * does not provide any conversion services, an array of length 0 is + * returned. */ - public abstract AudioFormat.Encoding[] getSourceEncodings(); - + public abstract Encoding[] getSourceEncodings(); /** - * Obtains the set of target format encodings to which format - * conversion services are provided by this provider. + * Obtains the set of target format encodings to which format conversion + * services are provided by this provider. + * * @return array of target format encodings. If for some reason provider - * does not provide any conversion services, an array of length 0 is - * returned. + * does not provide any conversion services, an array of length 0 is + * returned. */ - public abstract AudioFormat.Encoding[] getTargetEncodings(); - + public abstract Encoding[] getTargetEncodings(); /** * Indicates whether the format converter supports conversion from the * specified source format encoding. - * @param sourceEncoding the source format encoding for which support is queried - * @return true if the encoding is supported, otherwise false + * + * @param sourceEncoding the source format encoding for which support is + * queried + * @return {@code true} if the encoding is supported, otherwise + * {@code false} */ - public boolean isSourceEncodingSupported(AudioFormat.Encoding sourceEncoding){ + public boolean isSourceEncodingSupported(Encoding sourceEncoding) { - AudioFormat.Encoding sourceEncodings[] = getSourceEncodings(); + Encoding sourceEncodings[] = getSourceEncodings(); for(int i=0; itrue if the encoding is supported, otherwise false + * + * @param targetEncoding the target format encoding for which support is + * queried + * @return {@code true} if the encoding is supported, otherwise + * {@code false} */ - public boolean isTargetEncodingSupported(AudioFormat.Encoding targetEncoding){ + public boolean isTargetEncodingSupported(Encoding targetEncoding) { - AudioFormat.Encoding targetEncodings[] = getTargetEncodings(); + Encoding targetEncodings[] = getTargetEncodings(); for(int i=0; itrue if the conversion is supported, otherwise false + * Indicates whether the format converter supports conversion to a + * particular encoding from a particular format. + * + * @param targetEncoding desired encoding of the outgoing data + * @param sourceFormat format of the incoming data + * @return {@code true} if the conversion is supported, otherwise + * {@code false} */ - public boolean isConversionSupported(AudioFormat.Encoding targetEncoding, AudioFormat sourceFormat){ + public boolean isConversionSupported(Encoding targetEncoding, + AudioFormat sourceFormat) { - AudioFormat.Encoding targetEncodings[] = getTargetEncodings(sourceFormat); + Encoding targetEncodings[] = getTargetEncodings(sourceFormat); for(int i=0; itrue if the conversion is supported, otherwise false + * + * @param targetFormat desired format of outgoing data + * @param sourceFormat format of the incoming data + * @return {@code true} if the conversion is supported, otherwise + * {@code false} */ - public boolean isConversionSupported(AudioFormat targetFormat, AudioFormat sourceFormat){ + public boolean isConversionSupported(AudioFormat targetFormat, + AudioFormat sourceFormat) { AudioFormat targetFormats[] = getTargetFormats( targetFormat.getEncoding(), sourceFormat ); @@ -173,28 +177,33 @@ public abstract class FormatConversionProvider { return false; } + /** + * Obtains an audio input stream with the specified encoding from the given + * audio input stream. + * + * @param targetEncoding desired encoding of the stream after processing + * @param sourceStream stream from which data to be processed should be + * read + * @return stream from which processed data with the specified target + * encoding may be read + * @throws IllegalArgumentException if the format combination supplied is + * not supported. + */ + public abstract AudioInputStream getAudioInputStream( + Encoding targetEncoding, AudioInputStream sourceStream); /** - * Obtains an audio input stream with the specified encoding from the given audio - * input stream. - * @param targetEncoding desired encoding of the stream after processing - * @param sourceStream stream from which data to be processed should be read - * @return stream from which processed data with the specified target encoding may be read + * Obtains an audio input stream with the specified format from the given + * audio input stream. + * + * @param targetFormat desired data format of the stream after processing + * @param sourceStream stream from which data to be processed should be + * read + * @return stream from which processed data with the specified format may be + * read * @throws IllegalArgumentException if the format combination supplied is - * not supported. + * not supported. */ - public abstract AudioInputStream getAudioInputStream(AudioFormat.Encoding targetEncoding, AudioInputStream sourceStream); - - - /** - * Obtains an audio input stream with the specified format from the given audio - * input stream. - * @param targetFormat desired data format of the stream after processing - * @param sourceStream stream from which data to be processed should be read - * @return stream from which processed data with the specified format may be read - * @throws IllegalArgumentException if the format combination supplied is - * not supported. - */ - public abstract AudioInputStream getAudioInputStream(AudioFormat targetFormat, AudioInputStream sourceStream); - + public abstract AudioInputStream getAudioInputStream( + AudioFormat targetFormat, AudioInputStream sourceStream); } diff --git a/jdk/src/share/classes/javax/sound/sampled/spi/MixerProvider.java b/jdk/src/share/classes/javax/sound/sampled/spi/MixerProvider.java index d1167c0b8a6..638de86b320 100644 --- a/jdk/src/share/classes/javax/sound/sampled/spi/MixerProvider.java +++ b/jdk/src/share/classes/javax/sound/sampled/spi/MixerProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,28 +28,27 @@ package javax.sound.sampled.spi; import javax.sound.sampled.Mixer; /** - * A provider or factory for a particular mixer type. - * This mechanism allows the implementation to determine - * how resources are managed in creation / management of - * a mixer. + * A provider or factory for a particular mixer type. This mechanism allows the + * implementation to determine how resources are managed in creation / + * management of a mixer. * * @author Kara Kytle * @since 1.3 */ public abstract class MixerProvider { - /** * Indicates whether the mixer provider supports the mixer represented by * the specified mixer info object. *

    - * The full set of mixer info objects that represent the mixers supported - * by this {@code MixerProvider} may be obtained - * through the {@code getMixerInfo} method. + * The full set of mixer info objects that represent the mixers supported by + * this {@code MixerProvider} may be obtained through the + * {@code getMixerInfo} method. * - * @param info an info object that describes the mixer for which support is queried - * @return {@code true} if the specified mixer is supported, - * otherwise {@code false} + * @param info an info object that describes the mixer for which support is + * queried + * @return {@code true} if the specified mixer is supported, otherwise + * {@code false} * @see #getMixerInfo() */ public boolean isMixerSupported(Mixer.Info info) { @@ -64,38 +63,34 @@ public abstract class MixerProvider { return false; } - /** - * Obtains the set of info objects representing the mixer - * or mixers provided by this MixerProvider. + * Obtains the set of info objects representing the mixer or mixers provided + * by this MixerProvider. *

    - * The {@code isMixerSupported} method returns {@code true} - * for all the info objects returned by this method. - * The corresponding mixer instances for the info objects - * are returned by the {@code getMixer} method. + * The {@code isMixerSupported} method returns {@code true} for all the info + * objects returned by this method. The corresponding mixer instances for + * the info objects are returned by the {@code getMixer} method. * * @return a set of mixer info objects - * @see #getMixer(javax.sound.sampled.Mixer.Info) getMixer(Mixer.Info) - * @see #isMixerSupported(javax.sound.sampled.Mixer.Info) isMixerSupported(Mixer.Info) + * @see #getMixer(Mixer.Info) + * @see #isMixerSupported(Mixer.Info) */ public abstract Mixer.Info[] getMixerInfo(); - /** * Obtains an instance of the mixer represented by the info object. *

    * The full set of the mixer info objects that represent the mixers - * supported by this {@code MixerProvider} may be obtained - * through the {@code getMixerInfo} method. - * Use the {@code isMixerSupported} method to test whether - * this {@code MixerProvider} supports a particular mixer. + * supported by this {@code MixerProvider} may be obtained through the + * {@code getMixerInfo} method. Use the {@code isMixerSupported} method to + * test whether this {@code MixerProvider} supports a particular mixer. * - * @param info an info object that describes the desired mixer + * @param info an info object that describes the desired mixer * @return mixer instance * @throws IllegalArgumentException if the info object specified does not - * match the info object for a mixer supported by this MixerProvider. + * match the info object for a mixer supported by this MixerProvider * @see #getMixerInfo() - * @see #isMixerSupported(javax.sound.sampled.Mixer.Info) isMixerSupported(Mixer.Info) + * @see #isMixerSupported(Mixer.Info) */ public abstract Mixer getMixer(Mixer.Info info); } From a89eab1dc79148333e7a713f9f4c48b5188591c6 Mon Sep 17 00:00:00 2001 From: Andrew Brygin Date: Wed, 14 May 2014 18:19:14 +0400 Subject: [PATCH 40/50] 6945174: IndexOutOfBoundsException calling ImageIO.read() on malformed PNG Reviewed-by: prr, serb --- .../imageio/plugins/png/PNGImageReader.java | 8 +- .../plugins/png/ReadMalformedPngTest.java | 160 ++++++++++++++++++ 2 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 jdk/test/javax/imageio/plugins/png/ReadMalformedPngTest.java diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java b/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java index 13f2d9349d0..3b2a081d860 100644 --- a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java +++ b/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java @@ -664,6 +664,12 @@ public class PNGImageReader extends ImageReader { try { while (true) { int chunkLength = stream.readInt(); + + // verify the chunk length first + if (chunkLength < 0 || chunkLength + 4 < 0) { + throw new IIOException("Invalid chunk length " + chunkLength); + } + int chunkType = stream.readInt(); if (chunkType == IDAT_TYPE) { @@ -692,7 +698,7 @@ public class PNGImageReader extends ImageReader { // verify the chunk length if (chunkLength < 0) { - throw new IIOException("Invalid chunk lenght " + chunkLength); + throw new IIOException("Invalid chunk length " + chunkLength); }; try { diff --git a/jdk/test/javax/imageio/plugins/png/ReadMalformedPngTest.java b/jdk/test/javax/imageio/plugins/png/ReadMalformedPngTest.java new file mode 100644 index 00000000000..7aadebc627b --- /dev/null +++ b/jdk/test/javax/imageio/plugins/png/ReadMalformedPngTest.java @@ -0,0 +1,160 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 6945174 + * @summary Test verifies that PNG image readr throw correct exception + * if image contains a chunk with incorrect length. + * @run main ReadMalformedPngTest + */ + +import java.awt.Color; +import java.awt.GradientPaint; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import javax.imageio.IIOException; +import javax.imageio.IIOImage; +import javax.imageio.ImageIO; +import javax.imageio.ImageTypeSpecifier; +import javax.imageio.ImageWriteParam; +import javax.imageio.ImageWriter; +import javax.imageio.metadata.IIOMetadata; +import javax.imageio.metadata.IIOMetadataNode; +import javax.imageio.stream.ImageOutputStream; +import org.w3c.dom.Node; + +public class ReadMalformedPngTest { + + public static void main(String[] args) throws IOException { + ByteArrayInputStream bais = new ByteArrayInputStream(createTestPng()); + + IIOException expected = null; + try { + ImageIO.read(bais); + } catch (IIOException e) { + expected = e; + } catch (Throwable e) { + throw new RuntimeException("Test failed!", e); + } + + if (expected == null) { + throw new RuntimeException("Test failed."); + } + + System.out.println("Test passed."); + } + + private static byte[] createTestPng() throws IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + + BufferedImage img = createTestImage(); + + try { + ImageOutputStream ios = ImageIO.createImageOutputStream(baos); + + ImageWriter w = ImageIO.getImageWritersByFormatName("PNG").next(); + + w.setOutput(ios); + + ImageWriteParam p = w.getDefaultWriteParam(); + + ImageTypeSpecifier t = ImageTypeSpecifier.createFromRenderedImage(img); + + IIOMetadata m = w.getDefaultImageMetadata(t, p); + + String nativeMetadataFormat = m.getNativeMetadataFormatName(); + + Node root = m.getAsTree(nativeMetadataFormat); + + IIOMetadataNode textEntry = new IIOMetadataNode("tEXtEntry"); + textEntry.setAttribute("keyword", "comment"); + textEntry.setAttribute("value", "This is a test image for JDK-6945174"); + + IIOMetadataNode text = new IIOMetadataNode("tEXt"); + text.appendChild(textEntry); + + root.appendChild(text); + + m.mergeTree(nativeMetadataFormat, root); + + IIOImage iio_img = new IIOImage(img, null, m); + + w.write(iio_img); + + w.dispose(); + ios.flush(); + ios.close(); + } catch (IOException e) { + throw new RuntimeException("Test failed.", e); + } + + baos.flush(); + + byte[] data = baos.toByteArray(); + + adjustCommentLength(Integer.MAX_VALUE + 0x1000, data); + + return data; + } + + private static void adjustCommentLength(int v, byte[] data) { + final int pos = getCommentPos(data); + data[pos + 3] = (byte) (v & 0xFF); + v = v >> 8; + data[pos + 2] = (byte) (v & 0xFF); + v = v >> 8; + data[pos + 1] = (byte) (v & 0xFF); + v = v >> 8; + data[pos + 0] = (byte) (v & 0xFF); + } + + private static int getCommentPos(byte[] d) { + int p = 8; + while (p + 8 < d.length) { + if (d[p + 4] == (byte) 0x74 && d[p + 5] == (byte) 0x45 && + d[p + 6] == (byte) 0x58 && d[p + 7] == (byte) 0x74) + { + return p; + } + p++; + } + throw new RuntimeException("Test chunk was not found!"); + } + + private static BufferedImage createTestImage() { + final int w = 128; + final int h = 128; + + BufferedImage img = new BufferedImage(w, h, BufferedImage.TYPE_3BYTE_BGR); + Graphics2D g = img.createGraphics(); + g.setPaint(new GradientPaint(0, 0, Color.blue, + w, h, Color.red)); + g.fillRect(0, 0, w, h); + g.dispose(); + return img; + } +} From 9aa0cef64a155a41e673b1e6ed4c671b5e60eb53 Mon Sep 17 00:00:00 2001 From: Oleg Pekhovskiy Date: Thu, 15 May 2014 20:09:38 +0400 Subject: [PATCH 41/50] 8014755: [TEST_BUG] frames didn't closed after execution some awt/dnd/ tests Reviewed-by: serb, pchelko --- .../DragInterceptorAppletTest.html | 48 ++ .../DragInterceptorAppletTest.java | 154 ++++++ .../DragInterceptorFrame.java | 128 +++++ .../InterprocessMessages.java | 32 ++ .../SourceFrame.java | 68 +++ .../InterJVMGetDropSuccessTest.html | 43 ++ .../InterJVMGetDropSuccessTest.java | 499 ++++++++++++++++++ .../NoFormatsCrashTest.html | 45 ++ .../NoFormatsCrashTest.java | 488 +++++++++++++++++ .../process/ProcessCommunicator.java | 62 ++- 10 files changed, 1545 insertions(+), 22 deletions(-) create mode 100644 jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html create mode 100644 jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java create mode 100644 jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorFrame.java create mode 100644 jdk/test/java/awt/dnd/DragInterceptorAppletTest/InterprocessMessages.java create mode 100644 jdk/test/java/awt/dnd/DragInterceptorAppletTest/SourceFrame.java create mode 100644 jdk/test/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html create mode 100644 jdk/test/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.java create mode 100644 jdk/test/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html create mode 100644 jdk/test/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.java diff --git a/jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html b/jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html new file mode 100644 index 00000000000..7d4a3a5a774 --- /dev/null +++ b/jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html @@ -0,0 +1,48 @@ + + + + + + Unsigned applet can retrieve the dragged information before drop action occurs + + + +

    DragInterceptorAppletTest
    Bug ID: 6887703

    + +

    This is an AUTOMATIC test, simply wait for completion

    + + + + diff --git a/jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java b/jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java new file mode 100644 index 00000000000..5f70e2de35b --- /dev/null +++ b/jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java @@ -0,0 +1,154 @@ +/* + * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + test + @bug 6887703 + @summary Unsigned applet can retrieve the dragged information before drop action occurs + @author : area=dnd + @run applet DragInterceptorAppletTest.html +*/ + +/** + * DragInterceptorAppletTest.java + * + * summary: Unsigned applet can retrieve the dragged information before drop action occurs + */ + +import static java.lang.Thread.sleep; + +import test.java.awt.regtesthelpers.process.ProcessCommunicator; +import test.java.awt.regtesthelpers.process.ProcessResults; +import test.java.awt.regtesthelpers.Util; +import java.applet.Applet; +import java.awt.*; +import java.awt.event.InputEvent; + +public class DragInterceptorAppletTest extends Applet { + + public void init() { + setLayout(new BorderLayout()); + }//End init() + + public void start() { + + SourceFrame sourceFrame = new SourceFrame(); + + Util.waitForIdle(null); + + String [] args = new String [] { + String.valueOf(sourceFrame.getNextLocationX()), + String.valueOf(sourceFrame.getNextLocationY()), + String.valueOf(sourceFrame.getDragSourcePointX()), + String.valueOf(sourceFrame.getDragSourcePointY()), + }; + String classpath = System.getProperty("java.class.path"); + ProcessResults processResults = + ProcessCommunicator.executeChildProcess(this.getClass(),classpath,args); + + verifyTestResults(processResults); + + }// start() + + private static void verifyTestResults(ProcessResults processResults) { + + switch (processResults.getExitValue()) { + case InterprocessMessages.DATA_WAS_INTERCEPTED_AND_EXCEPTION_HANDLER_WAS_NOT_TRIGGERED: + processResults.printProcessErrorOutput(System.err); + throw new RuntimeException("TEST IS FAILED: Target applet can intercept data " + + "without a clipboard permission and an exception handler was not triggered."); + //Unreachable... + + case InterprocessMessages.DATA_WAS_INTERCEPTED: + processResults.printProcessErrorOutput(System.err); + throw new RuntimeException("TEST IS FAILED: Target applet can intercept data " + + "without a clipboard permission"); + //Unreachable... + + case InterprocessMessages.EXCEPTION_HANDLER_WAS_NOT_TRIGGERED: + processResults.printProcessErrorOutput(System.err); + throw new RuntimeException("TEST IS FAILED: An exception handler was not triggered."); + //Unreachable... + + } + + // The child process throws an exception. do not look at the stderr. + processResults.verifyStdErr(System.err); + processResults.verifyProcessExitValue(System.err); + processResults.printProcessStandartOutput(System.out); + } + + //We cannot make an instance of the applet without the default constructor + public DragInterceptorAppletTest() { + super(); + } + + //We need in this constructor to pass frame position between JVMs + public DragInterceptorAppletTest(Point targetFrameLocation, Point dragSourcePoint) + throws InterruptedException + { + DragInterceptorFrame targetFrame = new DragInterceptorFrame(targetFrameLocation); + + Util.waitForIdle(null); + + final Robot robot = Util.createRobot(); + + robot.mouseMove((int)dragSourcePoint.getX(),(int)dragSourcePoint.getY()); + sleep(100); + robot.mousePress(InputEvent.BUTTON1_MASK); + sleep(100); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + sleep(100); + + Util.drag(robot, dragSourcePoint, targetFrame.getDropTargetPoint(), + InputEvent.BUTTON1_MASK); + + sleep(2000); + ProcessCommunicator.destroyProcess(); + } + + enum InterprocessArguments { + TARGET_FRAME_X_POSITION_ARGUMENT, + TARGET_FRAME_Y_POSITION_ARGUMENT, + DRAG_SOURCE_POINT_X_ARGUMENT, + DRAG_SOURCE_POINT_Y_ARGUMENT; + + int extract (String [] args) { + return Integer.parseInt(args[this.ordinal()]); + } + } + + public static void main (String [] args) { + Point dragSourcePoint = new Point(InterprocessArguments.DRAG_SOURCE_POINT_X_ARGUMENT.extract(args), + InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extract(args)); + Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extract(args), + InterprocessArguments.TARGET_FRAME_Y_POSITION_ARGUMENT.extract(args)); + try { + new DragInterceptorAppletTest(targetFrameLocation, dragSourcePoint); + } catch (InterruptedException e) { + e.printStackTrace(); + throw new RuntimeException(e); + } + } + +}// class DragInterceptorAppletTest diff --git a/jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorFrame.java b/jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorFrame.java new file mode 100644 index 00000000000..69d4a014ba9 --- /dev/null +++ b/jdk/test/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorFrame.java @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.*; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.dnd.*; +import java.io.IOException; +import java.security.Permission; +import java.security.AccessControlException; + +class DragInterceptorFrame extends Frame implements DropTargetListener { + + private static int exitMessage = InterprocessMessages.TEST_PASSED; + private static boolean dataIsAccessible = false; + private static boolean exceptionHasBeenThrown = false; + + DragInterceptorFrame(Point location) { + System.setSecurityManager(new ClipboardDefender()); + initGUI(location); + setDropTarget(new DropTarget(this, DnDConstants.ACTION_COPY, + this)); + } + + private void initGUI(Point location) { + this.setLocation(location); + this.addWindowListener(new WindowAdapter() { + public void windowClosing(WindowEvent e) { + DragInterceptorFrame.this.dispose(); + } + }); + setSize (200, 200); + this.setVisible(true); + } + + public void dragEnter(DropTargetDragEvent dtde) { + // We want to set the exception handler on EDT + Thread.currentThread().setUncaughtExceptionHandler ( + new Thread.UncaughtExceptionHandler() { + public void uncaughtException(Thread t, Throwable e) { + exceptionHasBeenThrown = true; + } + } + ); + examineTransferable(dtde); + } + + public void dragOver(DropTargetDragEvent dtde) { + examineTransferable(dtde); + } + + public void dropActionChanged(DropTargetDragEvent dtde) { + examineTransferable(dtde); + } + + public void dragExit(DropTargetEvent dte) {} + + public void drop(DropTargetDropEvent dtde) { + + if (dataIsAccessible && !exceptionHasBeenThrown) { + exitMessage = InterprocessMessages.DATA_WAS_INTERCEPTED_AND_EXCEPTION_HANDLER_WAS_NOT_TRIGGERED; + } else if (dataIsAccessible) { + exitMessage = InterprocessMessages.DATA_WAS_INTERCEPTED; + } else if (!exceptionHasBeenThrown) { + exitMessage = InterprocessMessages.EXCEPTION_HANDLER_WAS_NOT_TRIGGERED; + } + + // This returns the diagnostic code from the child VM + System.exit(exitMessage); + } + + Point getDropTargetPoint() { + return new Point((int)getLocationOnScreen().getX()+(getWidth()/2), + (int)getLocationOnScreen().getY()+(getHeight()/2)); + } + + private void examineTransferable(DropTargetDragEvent dtde) { + if (dtde.getCurrentDataFlavorsAsList().contains(DataFlavor.stringFlavor)) { + dtde.acceptDrag(DnDConstants.ACTION_COPY); + try{ + if (null != dtde.getTransferable().getTransferData(DataFlavor.stringFlavor)) { + dataIsAccessible = true; + } + } catch (IOException e) { + e.printStackTrace(); + exitMessage = InterprocessMessages.UNEXPECTED_IO_EXCEPTION; + } catch (UnsupportedFlavorException e) { + e.printStackTrace(); + exitMessage = InterprocessMessages.UNEXPECTED_UNSUPPORTED_FLAVOR_EXCEPTION; + } + } + } + + static class ClipboardDefender extends SecurityManager { + public void checkPermission(Permission p) { + if (p instanceof java.awt.AWTPermission && + p.getName().equals("accessClipboard")) { + throw new AccessControlException("access denied "); + } + } + } + + public static void main(String[] args) { + new DragInterceptorFrame(new Point(200,200)); + } +} diff --git a/jdk/test/java/awt/dnd/DragInterceptorAppletTest/InterprocessMessages.java b/jdk/test/java/awt/dnd/DragInterceptorAppletTest/InterprocessMessages.java new file mode 100644 index 00000000000..6506565cd05 --- /dev/null +++ b/jdk/test/java/awt/dnd/DragInterceptorAppletTest/InterprocessMessages.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +public interface InterprocessMessages { + final static int TEST_PASSED = 0; + final static int DATA_WAS_INTERCEPTED = 212; + final static int EXCEPTION_HANDLER_WAS_NOT_TRIGGERED = 213; + final static int DATA_WAS_INTERCEPTED_AND_EXCEPTION_HANDLER_WAS_NOT_TRIGGERED = 214; + + final static int UNEXPECTED_IO_EXCEPTION = 400; + final static int UNEXPECTED_UNSUPPORTED_FLAVOR_EXCEPTION = 401; +} diff --git a/jdk/test/java/awt/dnd/DragInterceptorAppletTest/SourceFrame.java b/jdk/test/java/awt/dnd/DragInterceptorAppletTest/SourceFrame.java new file mode 100644 index 00000000000..7a7c833b91a --- /dev/null +++ b/jdk/test/java/awt/dnd/DragInterceptorAppletTest/SourceFrame.java @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import test.java.awt.regtesthelpers.Util; + +import java.awt.*; +import java.awt.datatransfer.StringSelection; +import java.awt.dnd.DragGestureListener; +import java.awt.dnd.DragSource; +import java.awt.dnd.DnDConstants; +import java.awt.dnd.DragGestureEvent; + +class SourceFrame extends Frame implements DragGestureListener { + + SourceFrame() { + super("Source File List Frame"); + initGUI(); + new DragSource().createDefaultDragGestureRecognizer(this, + DnDConstants.ACTION_COPY,this); + } + + private void initGUI() { + this.addWindowListener(Util.getClosingWindowAdapter()); + this.setLocation(300,250); + this.setSize(200,200); + this.setVisible(true); + } + + int getNextLocationX() { + return getX()+getWidth(); + } + + int getNextLocationY() { + return getY(); + } + + int getDragSourcePointX() { + return (int)getLocationOnScreen().getX()+(getWidth()/2); + } + + int getDragSourcePointY() { + return (int)getLocationOnScreen().getY()+ (getHeight()/2); + } + + public void dragGestureRecognized(DragGestureEvent dge) { + dge.startDrag(null, new StringSelection("A TEXT")); + } +} diff --git a/jdk/test/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html b/jdk/test/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html new file mode 100644 index 00000000000..2b3aa7aa60c --- /dev/null +++ b/jdk/test/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html @@ -0,0 +1,43 @@ + + + + + + + + + +

    InterJVMGetDropSuccessTest
    Bug ID: 4658741

    + +

    This is an AUTOMATIC test, simply wait for completion

    + + + + diff --git a/jdk/test/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.java b/jdk/test/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.java new file mode 100644 index 00000000000..9307fa26df5 --- /dev/null +++ b/jdk/test/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.java @@ -0,0 +1,499 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + test + @bug 4658741 + @summary verifies that getDropSuccess() returns correct value for inter-JVM DnD + @author das@sparc.spb.su area=dnd + @run applet InterJVMGetDropSuccessTest.html +*/ + +// Note there is no @ in front of test above. This is so that the +// harness will not mistake this file as a test file. It should +// only see the html file as a test file. (the harness runs all +// valid test files, so it would run this test twice if this file +// were valid as well as the html file.) +// Also, note the area= after Your Name in the author tag. Here, you +// should put which functional area the test falls in. See the +// AWT-core home page -> test areas and/or -> AWT team for a list of +// areas. +// Note also the 'InterJVMGetDropSuccessTest.html' in the run tag. This should +// be changed to the name of the test. + + +/** + * InterJVMGetDropSuccessTest.java + * + * summary: verifies that getDropSuccess() returns correct value for inter-JVM DnD + */ + +import java.applet.Applet; +import java.awt.*; +import java.awt.datatransfer.*; +import java.awt.dnd.*; +import java.awt.event.*; +import java.io.*; +import javax.swing.*; + + +//Automated tests should run as applet tests if possible because they +// get their environments cleaned up, including AWT threads, any +// test created threads, and any system resources used by the test +// such as file descriptors. (This is normally not a problem as +// main tests usually run in a separate VM, however on some platforms +// such as the Mac, separate VMs are not possible and non-applet +// tests will cause problems). Also, you don't have to worry about +// synchronisation stuff in Applet tests they way you do in main +// tests... + + +public class InterJVMGetDropSuccessTest extends Applet { + + private int returnCode = Util.CODE_NOT_RETURNED; + private boolean successCodes[] = { true, false }; + private int dropCount = 0; + + final Frame frame = new Frame("Target Frame"); + + final DropTargetListener dropTargetListener = new DropTargetAdapter() { + public void drop(DropTargetDropEvent dtde) { + dtde.acceptDrop(DnDConstants.ACTION_COPY); + dtde.dropComplete(successCodes[dropCount]); + dropCount++; + } + }; + final DropTarget dropTarget = new DropTarget(frame, dropTargetListener); + + public void init() { + //Create instructions for the user here, as well as set up + // the environment -- set the layout manager, add buttons, + // etc. + + String[] instructions = + { + "This is an AUTOMATIC test", + "simply wait until it is done" + }; + Sysout.createDialog( ); + Sysout.printInstructions( instructions ); + + frame.setTitle("Test frame"); + frame.setBounds(100, 100, 150, 150); + } // init() + + public void start() { + + frame.setVisible(true); + + try { + Thread.sleep(Util.FRAME_ACTIVATION_TIMEOUT); + + Point p = frame.getLocationOnScreen(); + Dimension d = frame.getSize(); + + String javaPath = System.getProperty("java.home", ""); + String command = javaPath + File.separator + "bin" + + File.separator + "java -cp " + System.getProperty("test.classes", ".") + + " Child " + + p.x + " " + p.y + " " + d.width + " " + d.height; + + Process process = Runtime.getRuntime().exec(command); + returnCode = process.waitFor(); + + InputStream errorStream = process.getErrorStream(); + int count = errorStream.available(); + if (count > 0) { + byte[] b = new byte[count]; + errorStream.read(b); + System.err.println("========= Child VM System.err ========"); + System.err.print(new String(b)); + System.err.println("======================================"); + } + + InputStream outputStream = process.getInputStream(); + count = outputStream.available(); + if (count > 0) { + byte[] b = new byte[count]; + outputStream.read(b); + System.err.println("========= Child VM System.out ========"); + System.err.print(new String(b)); + System.err.println("======================================"); + } + } catch (Throwable e) { + e.printStackTrace(); + throw new RuntimeException(e); + } + switch (returnCode) { + case Util.CODE_NOT_RETURNED: + throw new RuntimeException("Child VM: failed to start"); + case Util.CODE_FAILURE: + throw new RuntimeException("Child VM: abnormal termination"); + default: + if (dropCount == 2) { + int expectedRetCode = 0; + if (successCodes[0]) { + expectedRetCode |= Util.CODE_FIRST_SUCCESS; + } + if (successCodes[1]) { + expectedRetCode |= Util.CODE_SECOND_SUCCESS; + } + if (expectedRetCode != returnCode) { + throw new RuntimeException("The test failed. Expected:" + + expectedRetCode + ". Returned:" + + returnCode); + } + } + break; + } + } // start() +} // class InterJVMGetDropSuccessTest + +final class Util implements AWTEventListener { + public static final int CODE_NOT_RETURNED = -1; + public static final int CODE_FIRST_SUCCESS = 0x2; + public static final int CODE_SECOND_SUCCESS = 0x2; + public static final int CODE_FAILURE = 0x1; + + public static final int FRAME_ACTIVATION_TIMEOUT = 3000; + + static final Object SYNC_LOCK = new Object(); + static final int MOUSE_RELEASE_TIMEOUT = 1000; + + static final Util theInstance = new Util(); + + static { + Toolkit.getDefaultToolkit().addAWTEventListener(theInstance, AWTEvent.MOUSE_EVENT_MASK); + } + + public static Point getCenterLocationOnScreen(Component c) { + Point p = c.getLocationOnScreen(); + Dimension d = c.getSize(); + p.translate(d.width / 2, d.height / 2); + return p; + } + + public static int sign(int n) { + return n < 0 ? -1 : n == 0 ? 0 : 1; + } + + private Component clickedComponent = null; + + private void reset() { + clickedComponent = null; + } + + public void eventDispatched(AWTEvent e) { + if (e.getID() == MouseEvent.MOUSE_RELEASED) { + clickedComponent = (Component)e.getSource(); + synchronized (SYNC_LOCK) { + SYNC_LOCK.notifyAll(); + } + } + } + + public static boolean pointInComponent(Robot robot, Point p, Component comp) + throws InterruptedException { + return theInstance.pointInComponentImpl(robot, p, comp); + } + + private boolean pointInComponentImpl(Robot robot, Point p, Component comp) + throws InterruptedException { + robot.waitForIdle(); + reset(); + robot.mouseMove(p.x, p.y); + robot.mousePress(InputEvent.BUTTON1_MASK); + synchronized (SYNC_LOCK) { + robot.mouseRelease(InputEvent.BUTTON1_MASK); + SYNC_LOCK.wait(MOUSE_RELEASE_TIMEOUT); + } + + Component c = clickedComponent; + + while (c != null && c != comp) { + c = c.getParent(); + } + + return c == comp; + } +} + +class Child { + static class DragSourceDropListener extends DragSourceAdapter { + private boolean finished = false; + private boolean dropSuccess = false; + + public void reset() { + finished = false; + dropSuccess = false; + } + + public boolean isDropFinished() { + return finished; + } + + public boolean getDropSuccess() { + return dropSuccess; + } + + public void dragDropEnd(DragSourceDropEvent dsde) { + finished = true; + dropSuccess = dsde.getDropSuccess(); + synchronized (Util.SYNC_LOCK) { + Util.SYNC_LOCK.notifyAll(); + } + } + } + + final Frame frame = new Frame("Source Frame"); + final DragSource dragSource = DragSource.getDefaultDragSource(); + final DragSourceDropListener dragSourceListener = new DragSourceDropListener(); + final Transferable transferable = new StringSelection("TEXT"); + final DragGestureListener dragGestureListener = new DragGestureListener() { + public void dragGestureRecognized(DragGestureEvent dge) { + dge.startDrag(null, transferable, dragSourceListener); + } + }; + final DragGestureRecognizer dragGestureRecognizer = + dragSource.createDefaultDragGestureRecognizer(frame, DnDConstants.ACTION_COPY, + dragGestureListener); + + public static void main(String[] args) { + Child child = new Child(); + child.run(args); + } + + public void run(String[] args) { + try { + if (args.length != 4) { + throw new RuntimeException("Incorrect command line arguments."); + } + + int x = Integer.parseInt(args[0]); + int y = Integer.parseInt(args[1]); + int w = Integer.parseInt(args[2]); + int h = Integer.parseInt(args[3]); + + frame.setBounds(300, 200, 150, 150); + frame.setVisible(true); + + Thread.sleep(Util.FRAME_ACTIVATION_TIMEOUT); + + Point sourcePoint = Util.getCenterLocationOnScreen(frame); + + Point targetPoint = new Point(x + w / 2, y + h / 2); + + Robot robot = new Robot(); + robot.mouseMove(sourcePoint.x, sourcePoint.y); + robot.mousePress(InputEvent.BUTTON1_MASK); + for (Point p = new Point(sourcePoint); !p.equals(targetPoint); + p.translate(Util.sign(targetPoint.x - p.x), + Util.sign(targetPoint.y - p.y))) { + robot.mouseMove(p.x, p.y); + Thread.sleep(50); + } + + synchronized (Util.SYNC_LOCK) { + robot.mouseRelease(InputEvent.BUTTON1_MASK); + Util.SYNC_LOCK.wait(Util.FRAME_ACTIVATION_TIMEOUT); + } + + if (!dragSourceListener.isDropFinished()) { + throw new RuntimeException("Drop not finished"); + } + + boolean success1 = dragSourceListener.getDropSuccess(); + + dragSourceListener.reset(); + robot.mouseMove(sourcePoint.x, sourcePoint.y); + robot.mousePress(InputEvent.BUTTON1_MASK); + for (Point p = new Point(sourcePoint); !p.equals(targetPoint); + p.translate(Util.sign(targetPoint.x - p.x), + Util.sign(targetPoint.y - p.y))) { + robot.mouseMove(p.x, p.y); + Thread.sleep(50); + } + + synchronized (Util.SYNC_LOCK) { + robot.mouseRelease(InputEvent.BUTTON1_MASK); + Util.SYNC_LOCK.wait(Util.FRAME_ACTIVATION_TIMEOUT); + } + + if (!dragSourceListener.isDropFinished()) { + throw new RuntimeException("Drop not finished"); + } + + boolean success2 = dragSourceListener.getDropSuccess(); + int retCode = 0; + + if (success1) { + retCode |= Util.CODE_FIRST_SUCCESS; + } + if (success2) { + retCode |= Util.CODE_SECOND_SUCCESS; + } + // This returns the diagnostic code from the child VM + System.exit(retCode); + } catch (Throwable e) { + e.printStackTrace(); + // This returns the diagnostic code from the child VM + System.exit(Util.CODE_FAILURE); + } + } // run() +} // class child + +/**************************************************** + Standard Test Machinery + DO NOT modify anything below -- it's a standard + chunk of code whose purpose is to make user + interaction uniform, and thereby make it simpler + to read and understand someone else's test. + ****************************************************/ + +/** + This is part of the standard test machinery. + It creates a dialog (with the instructions), and is the interface + for sending text messages to the user. + To print the instructions, send an array of strings to Sysout.createDialog + WithInstructions method. Put one line of instructions per array entry. + To display a message for the tester to see, simply call Sysout.println + with the string to be displayed. + This mimics System.out.println but works within the test harness as well + as standalone. + */ + +class Sysout + { + private static TestDialog dialog; + + public static void createDialogWithInstructions( String[] instructions ) + { + dialog = new TestDialog( new Frame(), "Instructions" ); + dialog.printInstructions( instructions ); + dialog.show(); + println( "Any messages for the tester will display here." ); + } + + public static void createDialog( ) + { + dialog = new TestDialog( new Frame(), "Instructions" ); + String[] defInstr = { "Instructions will appear here. ", "" } ; + dialog.printInstructions( defInstr ); + dialog.show(); + println( "Any messages for the tester will display here." ); + } + + + public static void printInstructions( String[] instructions ) + { + dialog.printInstructions( instructions ); + } + + + public static void println( String messageIn ) + { + dialog.displayMessage( messageIn ); + } + + }// Sysout class + +/** + This is part of the standard test machinery. It provides a place for the + test instructions to be displayed, and a place for interactive messages + to the user to be displayed. + To have the test instructions displayed, see Sysout. + To have a message to the user be displayed, see Sysout. + Do not call anything in this dialog directly. + */ +class TestDialog extends Dialog + { + + TextArea instructionsText; + TextArea messageText; + int maxStringLength = 80; + + //DO NOT call this directly, go through Sysout + public TestDialog( Frame frame, String name ) + { + super( frame, name ); + int scrollBoth = TextArea.SCROLLBARS_BOTH; + instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth ); + add( "North", instructionsText ); + + messageText = new TextArea( "", 5, maxStringLength, scrollBoth ); + add("South", messageText); + + pack(); + + show(); + }// TestDialog() + + //DO NOT call this directly, go through Sysout + public void printInstructions( String[] instructions ) + { + //Clear out any current instructions + instructionsText.setText( "" ); + + //Go down array of instruction strings + + String printStr, remainingStr; + for( int i=0; i < instructions.length; i++ ) + { + //chop up each into pieces maxSringLength long + remainingStr = instructions[ i ]; + while( remainingStr.length() > 0 ) + { + //if longer than max then chop off first max chars to print + if( remainingStr.length() >= maxStringLength ) + { + //Try to chop on a word boundary + int posOfSpace = remainingStr. + lastIndexOf( ' ', maxStringLength - 1 ); + + if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1; + + printStr = remainingStr.substring( 0, posOfSpace + 1 ); + remainingStr = remainingStr.substring( posOfSpace + 1 ); + } + //else just print + else + { + printStr = remainingStr; + remainingStr = ""; + } + + instructionsText.append( printStr + "\n" ); + + }// while + + }// for + + }//printInstructions() + + //DO NOT call this directly, go through Sysout + public void displayMessage( String messageIn ) + { + messageText.append( messageIn + "\n" ); + } + + }// TestDialog class diff --git a/jdk/test/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html b/jdk/test/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html new file mode 100644 index 00000000000..c19a0a02354 --- /dev/null +++ b/jdk/test/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html @@ -0,0 +1,45 @@ + + + + + + + + + +

    NoFormatsCrashTest
    Bug ID: 4870762

    + +

    This is an AUTOMATIC test, simply wait for completion

    + + + + + diff --git a/jdk/test/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.java b/jdk/test/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.java new file mode 100644 index 00000000000..3be0adc666e --- /dev/null +++ b/jdk/test/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.java @@ -0,0 +1,488 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + test + @bug 4870762 + @summary tests that a drop target JVM doesn't crash if the source doesn't export + data in native formats. + @author das@sparc.spb.su area=dnd + @compile NoFormatsCrashTest.java + @run applet NoFormatsCrashTest.html +*/ + +// Note there is no @ in front of test above. This is so that the +// harness will not mistake this file as a test file. It should +// only see the html file as a test file. (the harness runs all +// valid test files, so it would run this test twice if this file +// were valid as well as the html file.) +// Also, note the area= after Your Name in the author tag. Here, you +// should put which functional area the test falls in. See the +// AWT-core home page -> test areas and/or -> AWT team for a list of +// areas. +// Note also the 'NoFormatsCrashTest.html' in the run tag. This should +// be changed to the name of the test. + + +/** + * NoFormatsCrashTest.java + * + * summary: tests that a drop target JVM doesn't crash if the source doesn't export + * data in native formats. + */ + +import java.applet.Applet; +import java.awt.*; +import java.awt.datatransfer.*; +import java.awt.dnd.*; +import java.awt.event.*; +import java.io.*; + + +//Automated tests should run as applet tests if possible because they +// get their environments cleaned up, including AWT threads, any +// test created threads, and any system resources used by the test +// such as file descriptors. (This is normally not a problem as +// main tests usually run in a separate VM, however on some platforms +// such as the Mac, separate VMs are not possible and non-applet +// tests will cause problems). Also, you don't have to worry about +// synchronisation stuff in Applet tests they way you do in main +// tests... + + +public class NoFormatsCrashTest extends Applet { + + final Frame frame = new Frame(); + private volatile Process process; + + static final int FRAME_ACTIVATION_TIMEOUT = 2000; + + public static void main(String[] args) { + NoFormatsCrashTest test = new NoFormatsCrashTest(); + test.run(args); + } + + public void run(String[] args) { + try { + if (args.length != 4) { + throw new RuntimeException("Incorrect command line arguments."); + } + + int x = Integer.parseInt(args[0]); + int y = Integer.parseInt(args[1]); + int w = Integer.parseInt(args[2]); + int h = Integer.parseInt(args[3]); + + Panel panel = new DragSourcePanel(); + + frame.setTitle("Drag source frame"); + frame.setLocation(500, 200); + frame.add(panel); + frame.pack(); + frame.setVisible(true); + + Thread.sleep(FRAME_ACTIVATION_TIMEOUT); + + Point sourcePoint = panel.getLocationOnScreen(); + Dimension d = panel.getSize(); + sourcePoint.translate(d.width / 2, d.height / 2); + + Point targetPoint = new Point(x + w / 2, y + h / 2); + + Robot robot = new Robot(); + robot.mouseMove(sourcePoint.x, sourcePoint.y); + robot.keyPress(KeyEvent.VK_CONTROL); + robot.mousePress(InputEvent.BUTTON1_MASK); + for (; !sourcePoint.equals(targetPoint); + sourcePoint.translate(sign(targetPoint.x - sourcePoint.x), + sign(targetPoint.y - sourcePoint.y))) { + robot.mouseMove(sourcePoint.x, sourcePoint.y); + Thread.sleep(50); + } + robot.mouseRelease(InputEvent.BUTTON1_MASK); + robot.keyRelease(KeyEvent.VK_CONTROL); + + Thread.sleep(FRAME_ACTIVATION_TIMEOUT); + + if (process.isAlive()) { + process.destroy(); + } + } catch (Throwable e) { + e.printStackTrace(); + throw new RuntimeException(e); + } + } // run() + + public void init() { + //Create instructions for the user here, as well as set up + // the environment -- set the layout manager, add buttons, + // etc. + + String[] instructions = + { + "This is an AUTOMATIC test", + "simply wait until it is done" + }; + Sysout.createDialog( ); + Sysout.printInstructions( instructions ); + + frame.setTitle("Drop target frame"); + frame.setLocation(200, 200); + + } // init() + + public void start() { + DropTargetPanel panel = new DropTargetPanel(); + frame.add(panel); + frame.pack(); + frame.setVisible(true); + + try { + Thread.sleep(FRAME_ACTIVATION_TIMEOUT); + + Point p = frame.getLocationOnScreen(); + Dimension d = frame.getSize(); + + String javaPath = System.getProperty("java.home", ""); + String command = javaPath + File.separator + "bin" + + File.separator + "java -cp " + System.getProperty("test.classes", ".") + + " NoFormatsCrashTest " + + p.x + " " + p.y + " " + d.width + " " + d.height; + + process = Runtime.getRuntime().exec(command); + ProcessResults pres = ProcessResults.doWaitFor(process); + System.err.println("Child VM return code: " + pres.exitValue); + + if (pres.stderr != null && pres.stderr.length() > 0) { + System.err.println("========= Child VM System.err ========"); + System.err.print(pres.stderr); + System.err.println("======================================"); + } + + if (pres.stdout != null && pres.stdout.length() > 0) { + System.err.println("========= Child VM System.out ========"); + System.err.print(pres.stdout); + System.err.println("======================================"); + } + + } catch (Throwable e) { + e.printStackTrace(); + throw new RuntimeException(e); + } + + if (panel.isTestFailed()) { + throw new RuntimeException(); + } + } // start() + + public static int sign(int n) { + return n < 0 ? -1 : n > 0 ? 1 : 0; + } +} // class NoFormatsCrashTest + +class TestTransferable implements Transferable { + + public static DataFlavor dataFlavor = null; + static final Object data = new Object(); + + static { + DataFlavor df = null; + try { + df = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType + + "; class=java.lang.Object"); + } catch (ClassNotFoundException e) { + throw new ExceptionInInitializerError(e); + } + dataFlavor = df; + } + + public DataFlavor[] getTransferDataFlavors() { + return new DataFlavor[] { dataFlavor }; + } + + public boolean isDataFlavorSupported(DataFlavor df) { + return dataFlavor.equals(df); + } + + public Object getTransferData(DataFlavor df) + throws UnsupportedFlavorException, IOException { + if (!isDataFlavorSupported(df)) { + throw new UnsupportedFlavorException(df); + } + return data; + } +} + +class DragSourcePanel extends Panel { + public DragSourcePanel() { + final Transferable t = new TestTransferable(); + final DragSourceListener dsl = new DragSourceAdapter() { + public void dragDropEnd(DragSourceDropEvent dtde) { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + } + // This finishes child VM + System.exit(0); + } + }; + final DragGestureListener dgl = new DragGestureListener() { + public void dragGestureRecognized(DragGestureEvent dge) { + dge.startDrag(null, t, dsl); + } + }; + final DragSource ds = DragSource.getDefaultDragSource(); + final DragGestureRecognizer dgr = + ds.createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY, + dgl); + } + + public Dimension getPreferredSize() { + return new Dimension(100, 100); + } +} + +class DropTargetPanel extends Panel { + private boolean testFailed = false; + public DropTargetPanel() { + final DropTargetListener dtl = new DropTargetAdapter() { + public void dragOver(DropTargetDragEvent dtde) { + try { + dtde.getCurrentDataFlavorsAsList(); + } catch (Exception e) { + testFailed = true; + e.printStackTrace(); + } + } + public void drop(DropTargetDropEvent dtde) { + dtde.rejectDrop(); + } + }; + final DropTarget dt = new DropTarget(this, dtl); + } + + public boolean isTestFailed() { + return testFailed; + } + + public Dimension getPreferredSize() { + return new Dimension(100, 100); + } +} + +class ProcessResults { + public int exitValue; + public String stdout; + public String stderr; + + public ProcessResults() { + exitValue = -1; + stdout = ""; + stderr = ""; + } + + /** + * Method to perform a "wait" for a process and return its exit value. + * This is a workaround for Process.waitFor() never returning. + */ + public static ProcessResults doWaitFor(Process p) { + ProcessResults pres = new ProcessResults(); + + InputStream in = null; + InputStream err = null; + + try { + in = p.getInputStream(); + err = p.getErrorStream(); + + boolean finished = false; + + while (!finished) { + try { + while (in.available() > 0) { + pres.stdout += (char)in.read(); + } + while (err.available() > 0) { + pres.stderr += (char)err.read(); + } + // Ask the process for its exitValue. If the process + // is not finished, an IllegalThreadStateException + // is thrown. If it is finished, we fall through and + // the variable finished is set to true. + pres.exitValue = p.exitValue(); + finished = true; + } + catch (IllegalThreadStateException e) { + // Process is not finished yet; + // Sleep a little to save on CPU cycles + Thread.currentThread().sleep(500); + } + } + if (in != null) in.close(); + if (err != null) err.close(); + } + catch (Throwable e) { + System.err.println("doWaitFor(): unexpected exception"); + e.printStackTrace(); + throw new RuntimeException(e); + } + return pres; + } +} + +/**************************************************** + Standard Test Machinery + DO NOT modify anything below -- it's a standard + chunk of code whose purpose is to make user + interaction uniform, and thereby make it simpler + to read and understand someone else's test. + ****************************************************/ + +/** + This is part of the standard test machinery. + It creates a dialog (with the instructions), and is the interface + for sending text messages to the user. + To print the instructions, send an array of strings to Sysout.createDialog + WithInstructions method. Put one line of instructions per array entry. + To display a message for the tester to see, simply call Sysout.println + with the string to be displayed. + This mimics System.out.println but works within the test harness as well + as standalone. + */ + +class Sysout + { + private static TestDialog dialog; + + public static void createDialogWithInstructions( String[] instructions ) + { + dialog = new TestDialog( new Frame(), "Instructions" ); + dialog.printInstructions( instructions ); + dialog.show(); + println( "Any messages for the tester will display here." ); + } + + public static void createDialog( ) + { + dialog = new TestDialog( new Frame(), "Instructions" ); + String[] defInstr = { "Instructions will appear here. ", "" } ; + dialog.printInstructions( defInstr ); + dialog.show(); + println( "Any messages for the tester will display here." ); + } + + + public static void printInstructions( String[] instructions ) + { + dialog.printInstructions( instructions ); + } + + + public static void println( String messageIn ) + { + dialog.displayMessage( messageIn ); + } + + }// Sysout class + +/** + This is part of the standard test machinery. It provides a place for the + test instructions to be displayed, and a place for interactive messages + to the user to be displayed. + To have the test instructions displayed, see Sysout. + To have a message to the user be displayed, see Sysout. + Do not call anything in this dialog directly. + */ +class TestDialog extends Dialog + { + + TextArea instructionsText; + TextArea messageText; + int maxStringLength = 80; + + //DO NOT call this directly, go through Sysout + public TestDialog( Frame frame, String name ) + { + super( frame, name ); + int scrollBoth = TextArea.SCROLLBARS_BOTH; + instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth ); + add( "North", instructionsText ); + + messageText = new TextArea( "", 5, maxStringLength, scrollBoth ); + add("South", messageText); + + pack(); + + show(); + }// TestDialog() + + //DO NOT call this directly, go through Sysout + public void printInstructions( String[] instructions ) + { + //Clear out any current instructions + instructionsText.setText( "" ); + + //Go down array of instruction strings + + String printStr, remainingStr; + for( int i=0; i < instructions.length; i++ ) + { + //chop up each into pieces maxSringLength long + remainingStr = instructions[ i ]; + while( remainingStr.length() > 0 ) + { + //if longer than max then chop off first max chars to print + if( remainingStr.length() >= maxStringLength ) + { + //Try to chop on a word boundary + int posOfSpace = remainingStr. + lastIndexOf( ' ', maxStringLength - 1 ); + + if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1; + + printStr = remainingStr.substring( 0, posOfSpace + 1 ); + remainingStr = remainingStr.substring( posOfSpace + 1 ); + } + //else just print + else + { + printStr = remainingStr; + remainingStr = ""; + } + + instructionsText.append( printStr + "\n" ); + + }// while + + }// for + + }//printInstructions() + + //DO NOT call this directly, go through Sysout + public void displayMessage( String messageIn ) + { + messageText.append( messageIn + "\n" ); + } + + }// TestDialog class diff --git a/jdk/test/java/awt/regtesthelpers/process/ProcessCommunicator.java b/jdk/test/java/awt/regtesthelpers/process/ProcessCommunicator.java index 8c0e6db916a..8177a2d2ab3 100644 --- a/jdk/test/java/awt/regtesthelpers/process/ProcessCommunicator.java +++ b/jdk/test/java/awt/regtesthelpers/process/ProcessCommunicator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,21 +25,22 @@ package test.java.awt.regtesthelpers.process; import java.io.*; -/** This class is created to solve interprocess communication problems. +/** + * This class is created to solve interprocess communication problems. * When you need to write a regression test which should verify inter jvm * behavior such as DnD data transfer, Clipboard data transfer, focus * transfer etc., you could use the next scenario: * * 1. Write an implementation for the parent JVM, using applet test. - * 2. Write an implimentation for the child JVM or native application, using + * 2. Write an implementation for the child JVM or native application, using * main() function. * 3. Execute child process using ProcessCommunicator.executeChildProcess() * method. - * 4. You can decide whetherthe test is passed on the basis of + * 4. You can decide whether the test is passed on the basis of * ProcessResults class data. * - * Note: The class is not thread safe. You should access its methods only from the same - * thread. + * Note: The class is not thread safe. You should access its methods only from + * the same thread. */ public class ProcessCommunicator { @@ -48,31 +49,34 @@ public class ProcessCommunicator { private static final String javaPath = javaHome + File.separator + "bin" + File.separator + "java "; private static String command = ""; + private static volatile Process process; private ProcessCommunicator() {} - /** The same as {#link #executeChildProcess(Class,String)} except - * the {@code classPathArgument} parameter. The class path - * parameter is for the debug purposes + /** + * The same as {#link #executeChildProcess(Class,String)} except + * the {@code classPathArgument} parameter. The class path + * parameter is for the debug purposes * - * @param classToExecute is passed to the child JVM - * @param classPathArguments class path for the child JVM - * @param args arguments that will be passed to the executed class - * @return results of the executed {@code Process} + * @param classToExecute is passed to the child JVM + * @param classPathArguments class path for the child JVM + * @param args arguments that will be passed to the executed class + * @return results of the executed {@code Process} */ public static ProcessResults executeChildProcess(final Class classToExecute, final String classPathArguments, final String [] args) { try { String command = buildCommand(classToExecute, classPathArguments, args); - Process process = Runtime.getRuntime().exec(command); + process = Runtime.getRuntime().exec(command); return doWaitFor(process); } catch (IOException e) { throw new RuntimeException(e); } } - /** Executes child {code Process} + /** + * Executes child {code Process} * * @param classToExecute class to be executed as a child java process * @param args args to be passed in to the child process @@ -86,11 +90,11 @@ public class ProcessCommunicator { /** * Waits for a process and return its results. - * This is a workaround for Process.waitFor() never returning. + * This is a workaround for {@code Process.waitFor()} never returning. * * @return results of the executed {@code Process} */ - private static ProcessResults doWaitFor(final Process p) { + public static ProcessResults doWaitFor(final Process p) { ProcessResults pres = new ProcessResults(); final InputStream in; @@ -133,13 +137,14 @@ public class ProcessCommunicator { return pres; } - /** Builds command on the basis of the passed class name, - * class path and arguments. + /** + * Builds command on the basis of the passed class name, + * class path and arguments. * * @param classToExecute with class will be executed in the new JVM * @param classPathArguments java class path (only for test purposes) * @param args arguments for the new application. This could be used - * to pass some information from the parnent to child JVM. + * to pass some information from the parent to child JVM. * @return command to execute the {@code Process} */ private static String buildCommand(final Class classToExecute, @@ -162,11 +167,24 @@ public class ProcessCommunicator { return command; } - /** Could be used for the debug purposes. + /** + * Could be used for the debug purposes. * - * @return command that was build to execute the child process + * @return command that was build to execute the child process */ public static String getExecutionCommand () { return command; } + + /** + * Terminates the process created by {@code executeChildProcess} methods. + */ + public static void destroyProcess() { + if (process != null) { + if (process.isAlive()) { + process.destroy(); + } + process = null; + } + } } From 5b7ccb7c0a20d9154ae64164f09e600deac0cad3 Mon Sep 17 00:00:00 2001 From: Anton Litvinov Date: Thu, 15 May 2014 20:21:17 +0400 Subject: [PATCH 42/50] 8041725: Nimbus JList selection colors persist across L&F changes Reviewed-by: alexsch, alexp --- .../classes/javax/swing/plaf/nimbus/skin.laf | 12 +-- .../swing/plaf/nimbus/8041725/bug8041725.java | 82 +++++++++++++++++++ 2 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 jdk/test/javax/swing/plaf/nimbus/8041725/bug8041725.java diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/skin.laf b/jdk/src/share/classes/javax/swing/plaf/nimbus/skin.laf index 39010042190..394721e1c41 100644 --- a/jdk/src/share/classes/javax/swing/plaf/nimbus/skin.laf +++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/skin.laf @@ -1,7 +1,7 @@ |lTwn3P@#>fl8+RJJ_E zv*+FdjUH33e3Rcy?s3-bp8EpZdzt+P1~zuu;w|_j5DK-3KJxIAcs}{mU8&E|eTImYwsixw0Qb8LWc_@wvMbR0mqwwPbX)kOkQE1R>RCA*C^j(g zIf9f)vPE!P&^Bi&R{p}CJ7K|X)rTE=W<|Sfb6~FhwIKEVhmNx`cYf1Dno>FDwhZo) zj5M14e?LN|4}1!sxL~`n*Du&O^UT2X=~f^=OC?vKF&5ga6T~%pMK{wl2_AjOpX6O2 zwBSN8d*l&gNRr$jSp-3um>pY(#RQU8N<*2Bez#Q11Ysw*@Sa)#s6Pvc4GHfI3>mFT z=3&bQ71(1)^&Zm0oa^(l_J*&Bnbbn3+mQ&_qhv-@?7DD6TowKV=0d|606!Tpbq0|Q zSgw>mb_GpXU_$4ry%HB?NuYzs_VIESIQ)Tq-!pKqe2l{IFYiUFZX%Q3xGQO-$n3lH=L;{i! zjLwqd<>?LmJzilPd`oX$DHC%%sNIS(4rrtzSbqQ7TYrC{tw|ASi(E=3arZa|G53}; zS`$%BR_cr_Ox)`{gSR{&$DOS7s)-(2(ud5AQ@oE+i#{DB!VR@FqsEjCWbLNI%_c)u zV`MCb4p-2`2pmP!RL96(T1hlpv&4TWTL`OpBbk}YSbtzIwhbJzp(CJPha@sVZp_ve zePPH2l*v>|loe%l%+QA8u^{S3q26~rYDrsyZwK;nD=|7$p~tQxO{kR-$0ags_$=n| ztQr;#o$fAv412I_4{O-;hJim4<1&a2^gK{1gT4tN>XImH+~@`r-xEJ-D-(9c0b524 znP0(gQFnPC7QTTy%I(kCkq{0rsPApJ*#%t*AvB|0?5$$OA_Ja9oIQRI+#EcJ+eIfxzUhV-ud2N(6)f~yOsDd zz|cib+{|8GP4rdkti9h4qFvS@TT#!zU>Kg3J_v#~9$35|knORoAIDXa^-qri%n+l) z+Iv{85{&l+a!pQei3S>27?C!e{8e4#K}RjD>CQy2kJz)!SwMO_?H}#}AQR9|Mb6!o zw1H0Ykn-!joQkfgzx&z*@LF~qB$KwIX_yah?al8>!pE8rt)8Xm}W)}f5)Fi94* z^eN_Cc}t#JXi~?S>Y~zRS!`+T&EF5f1E+g))-_D0Zu~D|1gnKn*kWj(_@WP?0EB3u zk=*2{uXcs#zxD@zv#TKg&O!%v9Mof%NA8DYfR;fTvI`^+rZHf*LOFzJ`qqvq2i7k6 zDpst?ul-Jg#nl4TMXC9uIU}2~C8YSgR+3&ZJ_(LlRM~x?{nLkuDLprtDRYIb*U%nL ztFKKTS*;gyaT>{`&pLTfL`UKmBonm=M4slyjv0h5SRX^8PDLO+qpdEtieJ8eL`x3p zTMRP`f|6v>Ek>@E)NyUssgJqY*uWiK$)1x@^QVv$~jND3F77Xik% zJ9Ch_mMq}y!oGqW=#N=%c$`>d@9$v00gY;lL}I=*3@*AR7}I<>+!w-L z8z%Uv`JcC42wCy)aZ+Fig6k}n;pE?BG4*Twr=(mQ1gekzkL|#fSL`a!1ZtZf6vM;m z_1Q`(l7(Et!4#C#yibrmNO74RV;tF#EtO&^D7fnJ^Xk2=T zA`)6>S71M5iijufG5DZv5Xq4CQpXu}ySa|azJ6!!QaW9FMGq+ko>PJ|b*=M|aU~q5 zZ>dYwCFp%DxdklQeh72m$fGTjS3ma`!5)peQtG+ny(_DB)Kmv<_3Obe)~#;Ysn4K2 z>vjI)v_n7K4+NsLtd0`BNL9rsp||-h=DMuSLe$pDg?_@l+U|i>?7XUnj>(2I4JYp6 zuN9cARPgi7{DKWb>afy@G0GZpWIKfePDWu}@r+ZF-6wZWUJ4Ub8bC-`_>U*J4?^@hdaNpW zeRV59!q8`gv2z&1CiUWXf_J3U5pj43XV79vvZPE{UOuj~vyOwnrt)%&X>Wy9wu`X?zD;M`Z;gi}4= z`f;AvmH0!gRZ1#+2gKCrt}+h2JzS;Q$@CToOi+_98MA`_fOqZO_4D7YKOa2IqNxpn z$zb0m`}m75?a8f-{NYwvgO`bekA`&(70=b>7ie5PkUc#))3&;}-d_(88LI|1_ZY)> z5ntV3G5e3pQ05+)Pe0DNsMgw_P5VQn%QI}JsmS(V(K>XhaOnAEr8wF{A5Aav|d%z{jZZQca9fp4L~4FKGNdkpGG zA;spYa{Ke%ie8Xq_iNR`fras~3vq`I?YUDU(e1F`l4X+X43F(8XHx16VC*?(5^ePc z?@4RXZVlzS!D$Y@x5{|=l|;tgQr|*klkpBk4gqw^c*U@V(b+Y;Ahtx*)Czh)!#_Q zq7y3)8l{mIk2~3CK194SDpDu$+UHN8J~o;pW8M&|^Q;UJ09-ZAIaW8a}#wFQ`HynDeSMVYq2?wf|@S+`wv^`+h zG)#6ZujcYK<%cKb%M>+uK5RHjIQ?nRU-s%7$b7Azt< z1;yi*i??^2EUI7pG;x;};Twf2qvy(UTct~*84H~56`ayr#ZyT*XV~r??Z3D3Xj5Fv z{vNtGCwFRUQ@NI&A9`Cfc>Ufa!Bcu3%_^64DK9Zj^-#W2u^kcm=TvsSP603TfV{MzIWT z+$vIGq?&x!IwhA@?U+36+&%81UFe{dTJBT*ck%bKvPJDVr}D`f@s+c+yl}O3`Gj)` zrR!#aNIR}VfmUqkZ1v}v*m8zas84B(i+6qu!~7yKljP!`&jlkUSsY8$iZYY5bQ6_Q zjeB(GO!vxk8yQvSBM6I-HmOP0<77r{Vk#q`|A9SrSbBpBY)`B7YZ1Z^L%{dGKl*pb|Fwk?h-Jio{ zafeYf#W;L@J?5LfWr)X6O1}HnYQW#Ko_qnTH@fXQuiDB^vu|l5J0SZY>|*DPL896s zXz|`VDCTE~LhY_b31FGw0mJp9DT?xl2a2w{%jxr0&Tu~d5xLlZE;RD#Y|2bh2F#1y zrJ@ua0|(4g+~t2BqJKut30}nZ|Jv~Y;+c8rbk7g!^urr%`-2Mz>b{AjVa*oNg%VBP z&k&3C$setnojxnnwDa~8fA*`U!{uh+BWWGMN|BBN#=4VvfJ+2u-Frw8c-f%qeE}#! zNQCeoHT@BZ0}J`1s?W(!LBG)n&NKsMeuVQdm}A6**b`ttx^b~_XL4SX|It?doVp@| zK6@@%`K3@QlW))wF2f1!gCgFVJIt$0vhn_+%W2JdXY;85L2jbJxCuwmp3Ux#)_Ad~ z`kQiyjU%U06X;_s-R6P`aE=1V(k+qgjL2mTRYe!B04Os$)J|IennU<{mJaUaE+=z3 z*+8_CuXVbkx?h-2QGublyew)3($l*da^7ci=dNuo)hYz`eE>)qlWnedhsG{*+9Fh8 zye|*}?)nsO)Ky|0efKe)KJU_Rv2iA2`%21c1}TEfgaNakGr2Z_e(OV;Uc81wxh8Km zz4XZp`5`sFN>0ee`{MCZy$n#Th#O?RwKDZ`-Y zsz-g3YV!~V&-(B#Iq6(g(varw&1Ep(V|JmA9j)pO?b87^#k3O%y2vtP!>9_zFL*WL{$FuL%9-Hc?TcQh`3d~15(Rm>$GuttIllQ zLf@cWOMCXc&m1=@x_eC*dv1Xq@jkRZqxi}L1u)2|oqrc%D#-EBK$2(HS5y%%=Nx$5 z#a+lud6EXuufuWx8=u8F(rz78CK~v`@HnzRI|@OgW0KfP+~C zp`F&qr$LvfCID?bK#jhW;qwv3aHHL4&bZY0bWzAx%PEM8i7HPP3NRCKMV z{z3v<-L`zibHWjNMj$k)_(Nplj4K-QQME%?H{kDmephyhg~D+JQ0Gmmd>h4#7t&8c z@2AAADyjwC-%`(7_(FX;Lw$t@Du9^pmy0s-Q}k+cz7zl!TW0nn~Q$e zSM*2#G5a@bp02^p%)d+FF`mMEq<%;xP(P%Se{*m9Pxiq-8Mem%?%ozB{g2yau??&^?Ou*TJW^u5@~#=8Kf(rVbR6? z)6@4vLgF)tid_CMl_!rNwfT<3AS+RGcNUE2B4466TGu-q+uon>+G?~(HM<&U{T3#~ zSc9{uU_T_%IdLEq7P(QXZgotFh<5mHu9w7bmj1vV+qL7Q9KMHI9N9wP^=jG?Iv7|7S)LekA!nl#u^U^ZCyikv6wB7O*vP|Ct#lV&Q+>Wd1{I z`tRbpECp#xWPW&W9;S}OiI`Qdw<>k%Afpd-ZgK&o85RJ7h`2aU(_(E+6HlXNqy~?h zJ>T1MJ#e?1lRi8WmC2aD?GWH|a@yM3HCq*DU$5uuuD@FBX@29Nk;)GUv!=edt&08~ zLBUf6!4$WtWOV8H7J-4KHaci}vVV-c%lH-k6j);*MX9p=Qph$TihH&F<~zgp#9R;)z$W zIrJ13Sl(4MRGOVKswpAA)Dd@wcP*MSkk&>KS$#>nDj#uQ^Cf`l@G>BYh3SMtI+E2Vw!#qM~V&ayjr6cNTM$-Oa`XE08L*YYn53tYs>l4YH6fX%Spc zWJ{2=+b>=AAjy`F^T^=3fIZ0>;a8+{Sp#S=pGXL( zLFR(1Xt~Mp18WN#2M2cS7R9)Tk_YKg79)eDqWLfu4qn{#Ryfc@+o`UaoD1y%Tua!i zS4zox9xE31eSeAT1T+Io{^yLa<rZllC8zii!bZDiUN*6{!;P zREVGz%T4#qqr7vC9pqf6k&-H18BaRNg1<$e%>DfkkvEaY&({51f6-qswlWpFdG9wW zn4B`LN#Bm~(Im!B2_@;C=96gjfhH^(cKMh~*oRwCSeC2vf>bGu4yd}|R9W?XO{H8b z8kflQG4K93Wp9|994pr^PVkFH`h#0Gcf+WBm{&rWVw~p4zQsWTu!Nxb04*9GxpQ2F z>8Mp59a>;?xbihyCKZYfp+nXB5>S=EEXqs;)nJGdV#@tY&`r# zt}(%0ZoGlb8r*-v!fKG3XPR3hDS0O$(vEm0;OaASV^F(E_N*R>xN@Ea_W) zuM!)e6~ftr@!&y8<)H~y(Zy2Hg;P+aTrFZhobLGC})^+>B9fbK!3ziah~ zec7Ykj!*UhmV1yj>#RW`JP`8CI6y^Zqq1o+T*23WK2~Bl2#@)@D~2lbf&UO z(;>HrmP~n(qGEltK*B&0qFz{@a$q*&R>BFOxgzmlCTVUE>y~-mx8fuLBTVyYUA@ zZ>F(Ov?3(Q=^4(T8S!Rb0dbqoOjgWldV&2hLLK{H20!1hF`{r9G znLDN@OW+sIV60dN^UwMXSGiT^8PLhSJQhEUHaO>P8L51BP^H{jt7;xcHRWF|!6@uk z7`zti#xCB!5@@ z$dq5e{>tbTj$f|)0pdF(4^>s(8Iixo+A#hR|=u;SM3MU%boP)Njm5mz6bi> z#Qur;TlY8loLzO$C;c~!zp?qd?4k!ZALd`+{WCYWmVD#puPIcA3*VJR)e~>Ns?+!t zUSA5e2k|QS`HI>pO4_K^wi9_?a8f$xMQZvkR@pJ9?I;(_w4=p^be|%f+g*tl3+(s0 z6f=Ep3+V+kXFkm((8vyIpD>^Y_nAC-zO>asC>2Cg3d0%IWd?~J{g8Hu4q2RPbp_mb#p$61iX4I{yCoempLdCmu zEAvX(-UOF+5a(_s{+Yd(Y=^1q2M49kkqYNWs9>z{HFQFeRli(RBQ?*BAS9REfk|?Ytf4JX$Jzdq6(^*3+p6=+J#I*4oiDA2B`KdJXiwHH!HkA zmjqqRHmKa|nHIp1Dn2g_4!iUH?kH_c51NM9stQTZ9?r>?2o%z#?`l(;ZBU;pmpVji z2XL!k!H=%_O4c3w&qtEap?K<-4_KFi{VVl)YT0&6)U7IOiwN@*a|A3nVXjSaxh)SbbTOm(5AHWvo_=vGZ z`X|XIbok4uYyP^k9^0cBtZ-(nCd2Vo^yS|9kJ)9Cy)9I>W_^MG&%cRR0YQGV-%dbX z_#Zz=|IHag*#0|oZs(%n>F|I2fNC4g*iWcme#=W2u{6-5k;up?-L#X4?RpYINh62* z2H^=Ma9~MIO)G6ko}?`oy8@K7DQFhblt*a}zQ$qW!W~0-1I(rwmbeBUKk#+~bP!)#1j~z462t&l2!Vo*aSU?!)fB}W| zcHjzQW<+6SA;cdInNq_k<(P2t?!TnQVp(Z>>r&a*6HuX*#B3sgK7Y7$ig zhGY3k5gp-BUiqe(soO<{8)SuD>A=n7x`;F?jN~XSzRCczHOdqkAd(T86A9ZxE$;3h zqjJUTRro#YeY1MQ>}@&p2z;D^2GY|b!34u-DyVU-CqH(2ws)MgiI@;walK}1jq~St z4_jR|4^pwjW-&*lj5X+tw|H%?FURsjLZ%QmJ;Ns;Wp8qE@ht>#G8pp=%0^0zZZ^s8 z>$2B|m!62L>A*~}PKC7`qEjOu+vY4Vq;2EU@rj1cegf9y8pcl9Mc2)cY*!m$xzQ)4 z%>Zo8-bo4G(6pJl-0o)+cbk59VdFn}$(>v6Q0t1g{)73hAE5HoHX2z)gH@ql)F|RZ zgXetISIpOl6P6pj@;8fj>O24^;|q;s*=%J~=T%1Wd0=1Q_jx$b=Cj76y)i%Bkb~gpBuC{z0fs6jZvAe_psVy@d>kPIbJD}{^;rIKG)h<6mRO11G-cHz zjZ#T8Yd*%s=A_2+9bcPku?|};;!iC(!0q=t;0Ofkg-Ts^UM%sQoDPYb*{-GxqnMsc zW9*hG_KU596??WX7G1z{9w|k82h!GU`ic=h{!A8|yT)#oLTyf;R_RJNR>64}8NeL% z^3(8seIW<|tK_c3DtX+@TpI1fl$uC7knfmuG_xX1$_(_{Kz*kit?=#u=MOH)r4GnH zK$|J**;1!d;+pDIO<~?jpGz3m6Qfvg#@zF)VLJy3r|{&)nu`YkbAW~GUd5E(8BJSa zOHZl^aSQH7+9zDOhs&F7@(S<@`ctcsCu&l`jhZWHL%<#Tx|e6k!qyYFNz+oO$pSkq zAYYpyR+QbZ(hMUBmtwWY61xaf_eMah%~t?*Ys2KO8nFzDFxk@U#JE8S)M5+Y9)6NA zHD$D<;Ozlc?SDA&X|d;lj?X{Dkym0ZR|wp1#ChTfLgp8#cs;U8{CgKO?1WTiH=p7_ zdG!?tu5XZ}Z$NY9iQOBnrt3@l(nWVChTf6dZO(|AZ`AH_{z;#~p#6?5#y15o=%o~4@Vf*(-DF_5u2$R!m9b~U#~&bS z^UzW?Bi9Jm;|`DDT!=sT3-8`Qz;mR_*I1z)_JCR3S$?B%vV}!7N0nHi?-2Ed z9D!Oj>Xon29BrU`W4skv%(qODOL%>Hi<9Pn>Blu(Hv}E~#%|32W=s4RcKc8LF^Q6?v899M|JWc?m9FIeWm;+eTy2<#8 zJju(%@0aTb))+B{wwx+6G@=Xjgm!n7=N84K%hYHX%VcdFOHd|C*tCrhklfkW@EQD- z$7r(bBOkg6jlFplIW#_W_CC>`pER(p=dZX^adpXCudF89VxkU3zv;Vz3iDic5@|4f zBn3IVs{;Q@$nV6Z(-rq9gy=!!(qC5w1@UnZUCvt&PqkrPJfj}Q}HUph}_l->_B&VU5br;j}0 z4o_*?qJbr~ZiyG6CLy`}M^V~E7)c^i!$_jGW%K8phT=lgxgWhnWVw?2G^}h#$()T2 zpdvOKW93g|dll|$FP$JK8=k?M7@8+`JA>gqAz(rh0Q@Tf4Z-;6<4+*rbo5p|5- zok6BcUhDmG%Rt<{b+2a*^FR#i~}K$=}=3XVOa*#6l+u9 z3rvjn75o66l9#|qf0w|^7uF|)Vz5~i1LGvd9@sDs1%8#(a*Wy(gHq1GQ^;L$eKhSG z^vR5WO8gTOVm3vzS`x;9v}i(RC%Etk_%x)GzlSSStYhoNLJY)WT;mz z?nyA0N7pv;h@w0KqPJkx5{gh%vt=EXAQO~SdL9D3H^outyP-s{zV>Y6Wou*4EB1Xa z+wQ$LKA!uf?{PmhNUcU&1JCh>%2HV;iih-?i6dYCi(KM%gZ1zb5pD=g^-~CC! zRCx0ZQ1I0rA>(+ew;4h7l^&b%^as>557kh43U{oq`lIYDEqmEeeWVCenVORlFj;Fk zsdBI`?obi2K&ZH9Dl=?K&jpEN+1nTSo!yerx|{^NvDw`B#Ud;;yV51%;?p(1=JPbT z){-X6wUWY8Eyg!MydW#}j46&Cwr^(h? zS?9zD$3!KI++U4zfw1rqS`ndgxcWh&5|?&?oS(1;3kd~I%;$=*cQPcC*}u*c6LTiF zRW*&&Nt0~np0_Hwph%#nV>h+TFEqpTViIQ)1Lz~B8fzBevop?3_*1s$0VX&NoJwXp zCT#>i`xkd8bK9AkYK`^g_n4$~G557Rn50*(GcqZo+(%=1UB*qgOyd(1y=8)(R=Cq< znyFJtQYSXZj5(Rp9o1pJkk5tBskwqDjRLK+A=EZH<%*_mcXfHLGY&Mi^?k=N zz30)<-p<|=?zabvt(82!tV6fikm?V+H?}PXDu4dU)>nLB*0p!_v6F8=@>%CGW3{k1i2XSbcpFC3XmOdwJ7dBRZb)*IK~ zKo#|Q5B#Vd9mS^HFaEZ4Gea8UonEBIICfxbsz5oTy>O2TEVI|g=g$_{L7*F7{mU5`+CbSPleS4w&F4E7Uc8@b3BiF(WU(u2JuoEVlc z=ahy>kE#K<8wSAlh?rRp4N8{41B|cb%+%;Ys4GzP-<=ZAPzpKH>h@;qt6yHCATEW` zP;6yMOnzlb%jVOHRO-a6%7oWXy`NDP^P&nW%)-+t)Fw9V8sjp9G^&U>iDczyN8Q#2 zlP=OUoCQ#p8SPtX^NxG86#NVxDA|>Y*H$dTmN2hI#$wMzO#tLGyOQUkkurNF=62!) zaU;kzn98TMPZX7jBu?O@r*84-A_b-W6Attz58^Fc8HFSrACn=QHo4Nq4a-<9xWX0+ zgK|=PHtKAxl0@v{orx!zR1o3ibtigUE@O4m@-%mS8~4)>9Z zW06d)^RGSLA*jtWaLWqg-sy3gENRSQF?My5X?o@o6+T?T@?2DhjNFzPP>vHqXJmeG ziZWVWQ@Lck?mQP=?_Fi!+d5EwaI>M7lb#baaZ}RcVSi#|zHfXRie$P{yko|W2X26! z;I-@4El(o!j1oIxcq}BU1x7#Irqauu%Kd4ww};geD~pcH4ghaVW83UkXSZHN0H(sj z#U#lAYGSz;WwG+41~Mfxtgs1Pe+M`G&E)23l5y#itFuI#Qf)TGMp>G&L=wTP(jYD* zF*@~QKY(ebroJTMw25$mMR#-56n>?qk1cuZ`Pt`)V2)V*8|$NZ3^=qSAzjcfEv?Sk zpQ+qLdsx4b{?Hw^$?B(CSQsH(mM(cZAd9KUvKrykL3Y4PfANi<5qSWAbRec9lyRr5 zhOEq~-wL>vL~Ka(i+PV`L*I(<%1&mh%lz`L40_rq-abxf|Do@2L3^uzfC{ef zS9hjI0b22)sTYvnKTrjfIUtdcaHXg}){YMyk<1Z94FwV6EZA!MZ>4boaX8|h|7?L436PnX)Caz5K4{YOFi7Vg!7oa)TJ&1y4L z3}-|WgIpbt&>Urq7P$jP+;E@I#DV{L@25_zaR(Z_AwS*-uSduiuT*@}XsNb1&I;<* zga$uYNp-w2Liz*&&ZruUVujCR9p(s|lRK+pe;xz@2%LCXT$~=1jJ5pKF zGM^3klsppbB}Le$QPNSFJt${mQDL|a z;+}zKcme-QERR%jcp{05*PpLPT#7=c#Lvq>a;|Do%}`q)(`y-t zn)pxnBHGplIME}G9RZ~5hM~doMrX4idaB5DyDgG5*j8D;&O(-R1PcPxSHPh-oH?T{ zCbo7z#LsJs4?&!SU7}Ps$mhgX4|8^?i8uyx;Il`oZBo$DHVZ-K)o6pIF|Wl zj;rI5QWz)Y39EGHp>+57y^hhO4nY;Ff1cxmyV9f>L~tXCb}ltFeo6iDLg&ptyh#@lQ;pgA7wQ)?QM&x>3taU0^gQAq1tBU4eu%) z7ASs)n8_4zsX#kf&S8&p9&!8v(TX>iBUul#T94lkf~?^SItDm_G*(Grx_L1xC@n=# zTD)w{$5{XU2Skib_;P;yJ}tF>gT#OM{QfJbAn0stY5D(ml*cOTDr1|X__1|!W{2GB zQjiYJtM#!-NJ*c8e-p!56{(y;BkaW{NNC+`8?NyYBk}K~{_SA46T1B+N3LPcUKz8k zqf6QLyKv7FzQ*sh8U$EDOi8F?C;@%*%9OOn>aVbG-JDW_mCpn}^&D)aNZ9%2f1ZN*VTY?&t zovvRS^%`)i4LG5MLX(<1#}a`iGA}Bph)(X^Yd?5@!=g<^Wh)n?(WcAGY{Xs7ICybn z<7z4vOs6luO{x)URG~Smy_IEBJCqqWrm#a(o2{j-%3EFQb{82~+%Z2mJ5y`2TnWv) z=~Q28*v%{FR(8EqUpGzmqLgQ>INkdQR;lc!n z&$Hm(fXAyfyB)kI+jxEc;|;x?kq@uUW{}X)7qkP%IKTa#3AgRlaHERfhzJUxEP(|- zAWwk^0~-*%<02623n|rt>#l^7|0v%i`He8L-0`Xx%z3uVg1XF$KF*Rp&Y{T7vxJ>8 ziJei6MB*b(?}7L)=%)uJbAWo}wN!g-Z(M?|;{PJhPUHoA+Zr(%eOYj~aS~}t5lTSg zTf6GcWza5-WTc5Msb@Dac50SUh)!vA=U`Ntj(M)mBoNZ8S(|)k9B0-^^|;G1XIPmM>wxSd3$iOB43VE-&h!7K4pbzf^22w7voq) z^Nfk}dIi?%VKA}ifn$_hy!eh2UlQ4E`hm%6C$}1w>wX?cemXEbGiO_rQ zK4J}JKT>Pi-4s8uSAvybC2T?A&KSkL;J3gOWq9j?B+&aL->Zd zwgQE%E0Q9^QvfR_d)({4h}Ugi^|`?p);$44F$Xb!srsIlVKYo>_psOp&Ef;CdNlVd zc8Wt~6ApIs$T9;=@+Bm^>v=GE7utV=TfPG-hPI~P3LF_rXBQGRL!19< zom7;S27Gt1WS7Xs&Moh&f1;sk!;j#V?w1lkh=xktY`9pqmuO4O&+8vzy-hSXVKoa4$iEZ#`Q3wmTBn>3&Wkre zGLxjnlZ5EYd2zH&O*-iIt5`yzt1yWea8~=Im z`kg;}K}=B`@`41lIc+%GPmA7w0e!lzH87wJ+y5y)nxfwR^7<2AnJ(N={U{QLub^wx zanVe}#>AV4`@+99qLYm?@q+K5ESz4OyQWV|UK(PZ1Tj6aDSQEn>GBPVvkH@6QVVWy=N z-IjQ>Ac^QRCV>O^=9L%{rH+*<>@g3xTUK35Y)AVnm^`LkD^#q~4As52B!Le0j;mR@ z`fuw^Y}w?%52+Q^F3L^ymSgkK6kiVnUKsu)Mdu6lw^D|Y{;N{_m4`uL9Jk!!7)7X2 z9Iso#|0}SRR>8~?-9=9*lL3GU@C-pWzttQ}#q1Gz-Gr$dEc3x+jXH_+6wQ$}Cw+xN ztHB$9y2cy$vWZfsP#cG65Kc_?$p-=J5SWUU#HKSsWymx(aVd+{O3@!!s+5r^@1q9O zH}L)7-ef#1#5|RSDg(x>+xwGa_P!8#4DXyp>r{S#MYo_?)(vDgPbB64k7^9a*O7c7 z*dIS^vH$NvtN-}q{HM?=^&4BE9HIX0Ut8N+GbJztfUzOK5+s>4L#7w}R3;44lmv1@ zTbxM1O=`{F>JTSbtftjyU0>H4-mP6ivDQ|Q6sdY%w35HlZ4F=EZfi|nj_zac&a@ee zcuc>Xdg;CKz45;JTW6o=cak{zW2zL?52NFE^zZk=T|fM`U1&WYML_z8gYjPuoL|6L zc#F3QVZm5ntT2`y8URArcngl2y-6&*rQ3|KQC1&OfI6#>EMSGzM;O4)%2T)}3A;0Y zn-W&e>Z1*CXYo-7ys-G}{5Jpm6>a{J5o_N2T8PiuAy39Xe{0OIwo8uXM>Ujh`P#|w zSBUKQ_<^Tq4?&B**Bv#zU+o^dAI)HN(-kM+M>TEOt(FbU--`C0ld))zUh-Z zAKs^CnLlEmde3Wh&)?%=Rid{Wr;%!*w{VBQ3(@{>b7WX`zxqud@jZF!_gMElb=yAF z#q1#f*?K)kqhdX@$?k_S#Ck#L5o;22V@Kqvn|k*ik!O8u#2a(1Jee0{r*kIrGVJ6r zG9yz6WFpC$%(*Phv}K6Q3n2zQ%$ZWz*xmb@%nQaY8MSvM4D)7bJEn|xH7!p<#VZzL zrU#K>%N}Ii8M~TD@*~Z%AnLBuU_t9SQJEn~YukAj+g4>OnA*rPkS%3gF+*U)xappO z6=vQ0G;V36ZsNl215O8^(^z8F8GFrTDks0=%RL&&({;0Dv&CMFIMoq31xHPT{NLi> zn#r-{Ni!v7OJXqk_bHu6D`=~2>V^l0!6KHIodzY`*cv)Knvz#^AUSQ!ti`Lk36rId zm*@E(@u}5#-afG0Lo1y79cywt zCtQ`Xx*?#W!H<%~CqZKKr)JO*{>f271QRx5Y@|4gll*GsQ+KDzxG63Q8;Tbke~WCK zr(}k@Il0~tj9z^+jg5B+@&F-pBpu$dB5|~i_R>d5IFNkAXxM3o=aP*!{L0H2y)fT* zl$OohOV;a=`yuSoc)$5Hvm{zz%B3p0${;8ug$Ahbb$%YVIwiAjV4qjv7I?d3+BrrJ z@l0CDla5AU+iNdbiQ>E7)@LH%IZLo$GP~DIn5x@qlLeSWEf|Q+yJiC`lXL8!eE$6@kI_Cdbv!>lW<|U~dZKeenlI;vHOf`T$UWszkJ;S81S5JV zLu?&4rBV?T;+W<6a(I;WmdFC80`y+-;q=%EQNPliTjYer`5l9gDoSlQ#kO25oZ z6TfsS`KY;%azQw#lZN7d_v|=lViJ-ne}H97#tmY7v%a|uJsn2_Z7t^-tvn1$J>7Rz z=_12q4_DMk;GlXG|Q87sSF&b4`?ZM&o8@(0R#%2VbRBIb=r+_+=*& zm1)GtyX$6Lwo8`8&)f-%9=T)^IXcufrf@!i3Yw@qo*EyyIj`Bl3aY$A|K)lr<{AP} z*NoLNBr|R@yE^&yl_Y2hMiRi z=T@#NRZk&vFBo#Tbm`)#FCS>tdsdfA8hvqcRcYbtq!J6B-~rO&Hdb|p;OFN}I8U4_HYwOI>hD#lb+dx4EAo$r{L zZqDM%^OnteEB+_mkPOnylFh zyj5?o#5V%Qyc#hcROdBpi;b6)sYpm7Eo=~AS!M4gTF@vN;T zld_|AjcbGHzAUv#~7X%hiY}>5gfyeFzvCai&a4mOmEs$_6NZ?wPz_vxew7UY- z&IPhg1)#VVM{q6Ua4nQ@EeXK2gMn;Ifo#)(YG(r61A%Tuz_k;BY+HeBfIzl|K({1d z+hvHW0Mt}SKfM7(s4SS&G6SMehG;4WELl-(*P@srGsOgMW7wCGg-*~s0CBRn0sc$Bb!FW3;fQ;}`5C31G5su#SL!j9T~>LBMITZj z=!6oNsHQx0DhI6)`$f@7^AE`q4>HVofRphl$2FIh8VFq_V zRDw6cgPm}J8rVZ7no~DeV?mvw>DyOVxTDnH#0zkS#yMw>8LC~4QyCE*2I)RU?@n`ng-*Ho0gDoz_*MK!P<0E-A2OoNGtAG`BUpDZb zA((X;kr*mk;L-#3xU~gOv8S$%-L;DTB5cI7MP?DQw65R|zC(OwOa?PU=m&Ny!bS_H z!5L}tlZ7va&whYN5eacK=hFj=_aSqJ9EJ2cEPQ?3D%M!2WS$|+C}~JR|7`{=eYTZ7 zXzF$fo=s+Y)#B`z+Rlf=?J(JiMng5u{Oq%7e^VsSBNkR z^T2pub+0P*eK;VmO;=Vs^wf&Tpp*9k-BDwrdo}*)j#qrc+$mBON;vH#> zg#RTB-39%;Hw?x?%XBc~FdS|MCVwj#t@aojsS(+S-^#xd5M8g*psuHi&; zbC8?rJ%{O}?Pu4tT^bu~vDGr`%zQ3<4X`+nuxv-u5sdFLMW_aA)N1l={Qz^E5oCei z70G6$nY0$8t(FDOSpmgec7nN5ioaCC1U$St=-Xy+uEc&z4^tXAzq6D(;+UU5n9nd- zW}7qQ`3I%`FnXPtzp{J+d7pZ2%F^%Z9e3yJ4f%ON20u3CR?uE1$ulU%91ii;6g^S8Vb7UTnts+hn)J;C^hH{ELAO4#rOk3%loEUJzl1!X3We_r zZ)^!B6 zGch1_d)X}$veFyn*-rwkTPQ~zzOuoT#}2FF#lZxVIxvem)`be6Z6;<@lklQ8rBEa* zRDvwhqWtb4dPuEIyKeOnBRwGK>h}1pBkgV(25qy2j^dJD)zMzCW%(u)odj6zkW?W` zw}!aEm-MyP9X; zROJi@xaR6gSa&8I>t5_h&*OF^A7R?8*~O87;!d?@DQj!SW$!S`y#F_0^uHL(>$9px%lFY8;rr;$_-~Hx z|C6!&?^mLBuK!sjnX05Kjr|>HaZfgzHe<~yTZeD;%cgLpe5@^{FCr*uD|nr4m&9=~ zaYu6_-;X~J4pO43*bRpNR4jET8&JYdXqvj*WIoCB{=N12c5#pOOPdCqVowxP{nKC4Pm^%x4OT#}wjeIgtZRaixM|orwvVY7^ow%(P>cq-5|$bTYq~xpDvi7hzNufV*_;6F55b>J zz9d}0_<-E{G?$ZdXV_n=CbKg_ps7#{p|w$;2+&1g8l%loB*Q2EKO`}HHF6%$=0$17 z=2c2pe@;4=zjE0J%$qkZqroe;te@w|7y$ZxATvitn$#caC?22{3`qBu$&SB?sCNXZ ztI=;~IPMvy-Xjk53L~s%diF3dZWd+Xn3hSeT$w&77AcCJ~auaB24 zLwVKoqr(T!fl;GE7Qmt0fl+v5IzBl^aHKB%u!cHs1lEs zv&@hqh9s87W{x%HCKrhady@Jm2njv)N(n37ku~egT7<`FT7*8nzf>4Hb5*If>{jXsPKD?X!kPm8*UD zjPyd&8lOVhY4rvpY*;5-JVd+EfJ4b6E@3=?Oo(NOR+EI`K5Y)YnG8~7C_45*H}gDY zfHUvn*G#codc@TimJPG6{5#2L&h#{{K)a3+f9y#>DQ346!Ecb1BlpfNtfY2o)I8d5 z{1&)8h&_QsrPDj-LQPh_lCr2eiQ#dITTs$N=O^}(Lv$gd274#ULQwV~@rjApPf30U z;ChNO8c}6=9#jBTb(|Z_IY$6nSfD?!^7SXz2xFn4k~p3+mz{A|p(%Yhm)UF~h-rUt zH

    }W1+sV;AoDLSxUwzknr>0`uIZrnK$|LZL0L3Ti-q*54W4-LfaERv*YTP+C{W> zn{FYKA)gmH=gWgUEskY@-tLLdpo_>JTB*UrRBBHV+mi@cOv;zGt&jUGimL6JmP}d8 zEQlGBbe}BlGFl!go~Tt84@E8PJxj4va8dlP?A)1{3+b?|QMcWCB!PY}Ix(h3<kmFR_=OTuNz7Rt9~M%KLjS5xPUL{F(MkS8SNm zJa@+gw_H^F@3~2YIu$jsemoqq>WY%=r`1sQByHJEQF-td+tRPjP@aM?y){Nv zjA4~F80qi-DEZZIJ9k3=4stCc{d*+#4~Y67-@jCKO9$l@)UUY5$2^h{+89u@rig=v zF{WLCfn8AW4FMx4vH_bmLW0TPZ4ES>NiyThAVy6$(vgLr$u327mir~EWPyYWWD9cH zGD&s|GFfuvS`8>y}tAo9}s~m>C!tq2>1XuG=8 z;}vsY9X9eRV#Jandm<5(EkjDwU@tUy2%H^I5M@ERsIy4y!9tUJ7W;#J;Opx}Gd#E` z=HPZdC!tSLN}jO?15bkVaedt3u`zW1M=1PIEcz@Qrfs?YqBlvY-PT5@*$C9o%$O%l zCe)}hx9~JTPN9v(cFkb)0OUQa7F$+)vQ#*n>W@&Og(%4gn6X#YJ{j*~C3%U&Asla` zfYN297Ivhll52>-?u00flf z`6EixOioNcQe`Ad)-kvskF^GQds>?9QI37wMT;m4ZOu6FV$b(fq9JXn=^E0>6MCw{ z9XICjp`1Bu1DQsw@t~iMn$Ts{gU@=3A;c|KS$=A>P0y8;wOPt*b9P_)GzBZT48Mm3 z*3m^0io5fek|Y$Hbva_YOW1N)3FQhKxNvCi14lOWF%k)Ad1x}GL2l8h6h{9*pFnUa z#F5s~psGNvaJa)cFwNA+6Uc^Mfv$pD+C&d*TJLg|wyJtb;gU*gy+OV7LdTjr98_!M zi7eOAh-IZ~iAt6~z!W-jf#~E+kvPX>K{C6Ea1G(uZP?aCVk?iH-QFFnT_s21pFHca zs);QA-Ps`h`iP4|+(G}lBEe%j)a`Q5=LDnQmLP9`^bjV8*_TuYW6%*@t{~H4OVxvQ zIItEM93v(~vvbX6N81sgHDaR@?^=#A9Cs)%T7sM>u+WmA2;eOg;k8!M2oU5apJnMK z=+E$rvnbkuv%O+cVfbSk_$+oO1pD+NE%1k|e5l2trF^;1&2 z?Wd1AF+Kg7`6RR!C%1bsrU{ktF9j+mOro+P*pGUKas{e&3#ux{t@)t7Gn7x(QDWMI z#4v0}W@ixZihh~MCgHg_W8~z= z^D#NIy=BO6Iy8n3R;SvtHfWuiXt)$;iP>Yku-LH>TDK#+GwV~xKZxM(E#Nj;*vrj^ z%Xp(Pmc$sAwdf*qkLaOJ-gZ2()-N(x2d7nbznoTAHK=XNDBm&6R^GM(4SkSoj%u6o zneFRUQlyrO^M-1Zwe$og7m>Zg7&mwZz*D5Ov7kS$GXV|~T@vRmFjXmGlQ(qOVO$k* zCh#TXdXE*t8J=*VwV-*9Q=ZYP)T4@5jj)9h8TS-}8S|PxXwKEGEKtsw#uQb{GXopv zU-|0Tqdk>-M_yTZ2JKSed*kbHUDBAAeTeZ)6!FeZ4qz}Ck@-WcKXxDTc$U@#=wEPBS;i-mUy5bPKAVga*hE?LMEhr}} zInx%T78j^Cg{m9VmkDH4Pm8TcD#6;7X|D@gIi$W52X?=dTjKcVQ#oW|JtDCfg|Hdq zWI5!sZ?V^7 z>7NvGid^WQ=86~Pi&F}qSp;ro1-;VW@aJ-ojy^L2Uobz}os+F!QxxqLo^Xz6KSC8T z|K1p4D??o!-)#q7O&MRx!vU8~8U9LPgqb+Ay)?*61#{?jOmlwt>2|NJE!VF#qzX8t z{FC9iuk18#rP4vCeVoi`TG!%fqy8A0B!=G{JF+|N7eCD&(^eB9jyb4PIGi8s&N{8t z#PicVwUt2&s`p$|N4XXYic2%lCb%91;Y3z&LNEVU@0=lN5g>$AUaYzWkjq64Kvc8Q z%T};wPF*iEsE#JbIb}GxhA><3r6?4nDJzbtd~eLc6Tsz-czQ%&n**%M#TTaHncMJ2 zcAr_o%rnPSn&08z8uQ=|P`ee%id&zAcmSLnj~nMRLnN_?x8Z$W1rFrTuoJ-!uco2e5gtu^WC1vz9vrpOzo| zV^dn~M75(%0^UlG4hbvmJup-T%#r%-=br{t@csxVoZXr6K9e z%Zv8`lycvD8E)bI$xKAfv5>XbYrDsV1>`Nb(53Du5)lT?{DU&-3q`_TXC6N+(Rh|A zG4HkF)ms6YhFH+Lu_^x|r?#?(WDfgsA)BK3L1XX{sw+Us3tIKDc?z{GU`28V%j9|p zybsKqvl;C<>E1)Mk2&Jm9IcQNe1 zz|BHOqI$d+&d=ib4nvLr)XZzc$WXmuV{CwH_dJhKI0K-%<0aziTh|Y}PRYx7s5;U> zfPEzAvD&OZAb2wi1jmFJkp6@t5i&qxzA2MsZEavK<<>H<-cNzr(GVSz;emw0Um#)8C!JByCSgSi zd?p`(tF@U9MAbVcL+EAoGyK(~yWG1t1mV35qY*Vgew>$?|9uCw~Qw0kYBwTIpL0ny8urun;T) z(JIu_{Nx21cNLq~mo3ph)-*3PH#Gn8X;JTR+HC{K#^g`wdp5ncJ6>`=_$PQ@ve@Z; z{yhr*;`li;@ebr_!BFIC(UL$4bapKEwar6&=AcY%+xu1rZbp1)>(Y(7S;#eYAZ&7Gx+a5k=!n|Q@PXO@J+*avj+c@)dytsM0}Aq(VJhyJy1yeaOOvC0 zGO%*xCU{0|Wd|d5n~Q6=&gAa5Fyt`}C#1GYDiHch)?i*z_~pD_;3o{54>qgD1E$#1F8wst zb$dMAy1hztjR)S?boN5b&Grp(b+r4YjO^$R4MCYjG<{6my4EAoS+B64#jvRxvnN4C ztK%}*>`GUsZhh7;s}7(udS`x&(*t+K+{1z!W8y zq9oR;=c>D^s)web04wi0eGX;z0rZC{csJ2?pc5ivmv^E$Km6aRM5`P9xY<|!>VBis z61^*P>#~I##tJLf&{dV0_>myO)D}7p_9hfKkSyST6+9W45A7h_ftYCCqycGdY#7ldIeU*yEur+eYjc>yJ{rh@`TEvO0hL${5Q6D=&&cJ3GJW#; zwrb*51ogdUdoV3;>*#Mpf~H#S#8aQPfyrQ#Y0}=F{Cw2${0)QR&5` zh}w@t;lbLKH)b^NDHUEmJ_i43ibxux!T5SnuIn6sG9+@s{0 zPPUI8jlFK~$&dY#Z{sLlpQe@|YrTUGquS~$!o_tc47f@vt-T>R!vuCQ$U?#3I31)S zJ5-!S0i-O_H5kdzd8l;HiA%rU5)9XHjBRltucR}@Mu1PuVLL)U#oWJ{PN=JTr*r9X zhCpisF-jdgn~c=cB93dLys(m(8LMlKh$gufrAmjIg0CpZS{)r45Gmq)0S1Ktlg^Bb zLb{^vtjfTW+sTW_wL&slDbU(QiBJGa9S~3P;o-$FI7iWtfhByF$&pCNAvKQ*&txyW z5`pR;h6!v=xt7}T_FJ)v9xcYc6zWY2(l<$EVYHJ@rGuV*8Dfkg_J(SvFz7tzZ2@;P-{GJ|SG48bY7C)BNoiO z<8t@7NIIrq)j&LK7qhhLh>)&J^FB7wWnKxZ{va8YCOfN<(CWpTzKqG2EIPvU$qB_D`U;};IR2h_T+9UI+ht>zaYQoZ#}#Pg;7yq^#)T} zL{KE5pL-``5%0?H<@L7&E%-0#{lIf z#3f`66GAYJ&wRniy0^X`w_v9Z#*YLKRsGQFrodfGg3^3nwBD})?AW-qSMJty7px4a zHXJA|-PbZ};Q8(LRB3+-`l`-;Km2~T`O%9g*8YWFZ4|xyeaknn9P=P3(7CCa1raHE zCpXf?f(r>LE!9qNDGxHLDX!SK^+)gZ@7OHOkdFQh{s}8vtzleBsdu)|!B4s|SVTU@ zB1M1i*^i#ZSBC}dw6>gmJOzsR)Q8f{RC5PTo9+lMYsll)M5p`Ne@sXE;#@$hK)b%1 zF-;$B?#CS3+y=bkU}{I^8YAG97ucLRoUTz1xEx7(espoo7&Ezoj2whX{plGy%xl{& zQqq>V90fjc*?c_?i>X@2p^iS;3KJ2}6izT|o0OTVi2Xq|ag9t+(e$D)81ZS5Qm8-2 zPKra%B^V+0$@%v7duQ@}fN>b#GFC;`ND`@usv;_gzNTH~R%=~Y>*~<_o01M)frZUn zK5QZOaJo<6RGX+m!?dLWu#;A8mdxe;Se*7M=CzWYyHrIrxyFtGL#|6LzvMjg=h3-Y z^Y)#T+a&!w0!VI>Ls3VmZXxRE^W9N{q$G@7|MG{k5FV zLdIM|g)XtBTK4JJSueeYD_mv0@5KqZ<~+JLKveE$wWs~HD!A8~MG>sz)Szegl$4kG zk9PT?O4T=WX~*`N)GurM2g$&j4H`i4D|19fGH6w_(9cfcq7ZKvb2Nb19$i7x5X&3; zx;RH;)2Qwhvvd$gKc@t}5d6h&U*XwrTn3GQJ+0p9;C7UE_i(rgz47>8T-RW>lFSEO zy4J;XRk(0Y2^-usZ`@6|upoZQ7{lPExPQ|w!JU)Dptq0;%!@Flb>Lntve*D#slQ(D z*{yUMgk7)mD{2hI(^rW*&hH9OF#zJwl+oId^si7!PBpdx=${2ZZK~Wsx+?pAa8t zU8XDgol1@sv)Drmof$QOCeAc{e~2xk6}|0Z=*lmnyhvT#;T$3vl)>-|%4FApf20Df#dGd)T8q z*S|oV2o^*heZ)7bY6!?>q(h;<@}F)$RY9DAIBL|a-d1R zHmyAbjMz2?$OnBgGy!C^eju8FV09?zI+*V8BZNVN;%+L53`u7xeE+NC-j$>(Y7^22QG6C;Cp*A3=V2i z8V8ARjzy++vGT*jB-=-+YL%)k@>%TRqdcSO6U)WvF9YzCfB;$xAdX7f`89^|kz&QnTUuMxz z|Drq#C=|HmZ&r}ov1Rj0Mt<~9zoxxtrW?RC^{sOs4jD8%LpgS&9qo8bs0Z`eiQW2j zIO0Co_P-z;c6=gM(?4`0KR}lS?MYixpM|yro*fK#q))8ueq>XMmpW)(#XbxI|B`Fr zbEZ$9ItZ=up7jcCbh*M;ZbE^{_06zPAMKDjT4ejLN6Oq8))XDlLZvtScz*GNpz=#8 z*{Vvt(=cC2s9i&RIU76Z*f`)05gZL7^?P{YOs|580u-X~#6v0I4pxY>Q{2D@S*R9J z2?^vRFvR{zUY zWa;Ydk!N{1&8YvrO3UL2y?E&CWGOA1V;FJ+diXFNbqvB_(k8R zj-|w9?g0w4Gxa5CMHeY~=7DKH49*isqAVK8g(a-FpkYHNH;IZ0_l|{p7L$X@DY^k> zVy5kPrd2~>rZNmBM0AaLa?$9DQousQtjE3P@z5oa-f09-`sK3*DHH*y{eDXYIEIE8 z+LTm#T#Pujh{U^IhAfw8Dz$P^{^&vAy2U5CkzB9xSve7MN|Z&OAqm34{hm!0Fw?4h zQk=u$w=_KB#~3m;M15S@oiF6}Nij333l1RKrtK4Tg&iE?a~o2>Tz-#L+5(xNpZKo^ zO~rtXfF$cuefX8HkhPzf*|ODqXk-%Rwy$LhZooIJI-amT3FNE{d%DgrT6fuh5$4oF zUM8VV+R8F_tc2)t&rMG;tkQ7}3D=EIZKAnrkLeE$p@w@v@%_`B^Y2%dY3t)9hqip~-;+aCYk%u=94&$h zaGZ;V*cTk%4SPvmEe*U-=q|beACzgvQfX~!-dUUb{S%M#`zm`ML+dZHG}Bg$s{k2> z-(A&sr%dGK8~Id>0!rgkYRy-1M)L1nvxg@v+PYrwlWd{w1_k-Jz*}9TUGDVShf5HN z>?2)iK@NC}-odQKYacwu+3Mk!PYwxj>^(zA-?e$wX4b$$7zam}okmXj?yMfQO*|&vwH+T{ z9&s{6ke6P}2WtvR9l-Kh1BhSIG~;0}j(5`38dc=j1_e z)G{tsp)?IWXYOLp(p^bwXAniXQPq@Sv<;Z@1U^6z1;;5!p-XAVTMQtbYPw7-b7{1g zTegRq5zq!@>c6Oeps+4zeI|yC+CLp=t0AP< z7oc>NG#Kox}7Z!rXl_GKKhUz=LhKE*c4 zeW>vedXP5;Hw;VM#V?V35juvv2H$`kM7$|{sQA!oB6<))<%VvCb_R2YdWOjNt?tq} z=(^(wx|4*wNv|GH;^@wjf)`W9tT}~_N9&l>ViG;(ska;>CR1VS1*VgR9CKI>NgYeI zWgnq5sOXDO2{q{c)+_3ghE8l8S=`I+*J{Kh#f~c6GjeM3(N&n#RK|apWP69Vc9V@v zupg!0<9eic%Pmj9AA-Eq@u+<%$to9SRdO7mkZQ@QKpnCS#leo-bLwCcn^Cjg1DT{` z)v$~WjT3pq&r_vRP#-E5>Ch<=-6I`YzQG=my~&saTB}?q+l-U7Nv)9uj>~$K-4|M` zxlX_x`N2?!nv~pUbpkwe#gbEv0Un~d`JHq%%G=2+6!;TX$@E9C7Av0QrF6PR#(5~9o=Y&`Jv zez4VkNUgb!7~q}KO{jxr*VpV4uU2zV&xE@}`PyNy6E%^vFlWFcov& zspK^U@0X|rP={9bh@Dc(WsYgGM>7Q{&{i?a{9O1Wj+6C1w7w7liJDOa0j`Y~o)N99vq#s8Z<0AAMw!2)mK~ zLR>^MDAN`JCJtf1lL$W1e8lT<6;*pTZoQ=5^psQjzT-OSI0_p3xJ4{p#n*oM=JD3w z{o#cClK6DIRnm~ddP9amY@ZB%2^%N1+ky5i=DlCkoZtDl{mrpRHvYm#QXb&MO)WgB zV5SiB%4ibSb`J9j@+CAkRK?a?a;ui0saDdv6Q*cTbRYi4*audT3_k^!&q+Dwegl`g zz?P~|u}*Tz7fgL-i)dFi)Q;2Y099^VsAS}mcYUU3IwZ4~k~%#EmX~lY^QKTShA8h# z6cuaJ@OR>Tgn!+nvW-Ck`{H6~vu1uM+3c#!FvFO8$_OYJjO(No%r0+lvSSvQ-eGHqqssAct;20 z``K#>Phg<~yHx`Vd}cVU0IUB#M-hbn;@vRxtayqq&qAK9$aIsZdp+F5&0EI1ry3&> z_`^b&78t|gTY_Qu{3b6#XRC7|f`~5aC#^uBr;smEHy}?M*&oMC>P-1GvmmG{!%cpd z4BsC*8V0id_1|_A|D#sO*y^<+1@g0-2=Tw;wj_T5l#aG0&i_>sBatz1HZuQj+leaD zcGxN?U)A`S{A96Q@DzoFBo-H|HZu5y0_(qEAz3-#SV$4jA&|{#$?He-W2Jq5S*1vv zCCHEr_DjeJV^LU}lb{hGz!S1TfJhLauHHlKWMkgj2QJbaZ+gxAgcdj4C!5^(|D2w% z{Qi!H&ieN;$nH5KTwx^a3sT}G>>E%{2T_Ee@*wp}KnO;G%|(c#X2CiDr0&!qqTP9- zP=*U7sNIQz$Q@++f&w0(a*z<(1+*+>J4#8*QxqgfXuB#kith9Lb`~Q%Mf08l8uVr- zwGI2JuuWyJ(O9W7O9G<=Zc(Qii=jg#%?y-sTZ$jr*(y>&GZM&fGumC2RZ1ln7AFQk zs}$qAc~FePr}u%VHKAz(R`r)v7ItiePO8UIi5UD)zE#XOMOu zqZkxd3}JS8>t<5QBTFXNYZ@q0V>@0^{ZZW}=-y2;<}_4|1Pa&cZ+Gxx7!vhQ@$^&9 z{5+LMfgrC@8J05nQ<#VDvS27-*T{cRJf~7GH1|c@IBa(OSa}up1}`&1R$ujRYyGE6rl^Ca@QPUPE&N?elBkXb}K&}LBR+=b*AVR|JjipQzr3^iHd$(*_%VFjRQlKGw?uFTy#1F z4HaevCaz-apxsy5Ter2KmRI49$mu`OQBE(drHADIEHgYWwoRHz7CDY)y}k_v^n0Mo z76|t{x%CUHS={d0ydyXJ18wchk&1Im>fw3WZ8}8I4=hnLUn(+?`*nxY@X*v7W(Z8S z0TgnyF?3sNbia9%6R~t&ui7$Lipi`VKcp$*i+_{(^mt(9xBtd&sQ5EME+E!g*vpuF z-6)m29-s65^{F7X&YkPPn}7ax;H4EKdHM>Xv%Knl~w@%^0k(bFn~tTW8>M; zuO1rei0MyPAX(*YaM$>0#bS^2&dnZyn;eG^q9{zQnFEfYGAB162+zwkXtnd1rY}AA zB9 z@s9Y4{y(efNok@&j_ALBwf^+d|F<~xKNqF{Up4)I#Hru8FQya51i~b}aRdhNi9vps z$o*)71qhASV5v+bz%Uw90Cf=stx6s3@**l#P>1kl&EKSc6a^{{HBCNM>+7mkRW24+ z#Z{XBzD~MQ$4Foz_6HyoL@!DX(d&-Cb_a z;*L;z@cFzrH>iK}*I&izdM1^4evpjB;y|9yj>K*yTqGlR&acGsIDC-Eo%ryb-6a0z zgQV;i$UVHU^vC~WBA=2)5%`ZHQ79K?E;IDqKGp~RVa&eEIfyPs**r-u;&E+m4JpM? zhfbk%k=n>x@i?)ros&*WHsQ{*4+NL&oI#SE%q(BA_>@6~pIDc2g}V4nfezHOv_G`M zn@IM=N(j6DgL<;j$UG3tj%>=4uwQ_dRV@_3S z?%#nn-M9AZs#{_*1s#pEWKI5k#gf9P6~f}&3TO2y_?kJwYPYH$s_ans`Z|PrxdF5r4%bIHlG9-qOf;U4`kqK3I#Y+tvs#Ot9Q1!C0 z&0^RmEKRIXpU~?+hTNjLkmj`BtI6sRcOuHs^d7c$I?d&jDE1`Uu;wJ_cNQvFqULtS z<)q3Ow)3Ym^+-cW!#3n+4}8knT97t2Md3yZmvkAJyMVgl_2c$5Q5hOct0R;8tO=L8 zoQZ#)bZ59t-bB>v^YaK=$W>M7#x=3*ORP0=t9pGYf8(ZD>tKNnDy96*G&?DCvZk8~ z=A_5$N$u2B_hstNn}?I@mWSq&VbQjxn&v`^=9XK1xFf3%GdRMrOz#@=D;cGx4`jT{ zC{t*p=Qwhi2ogO+#T#sS*Nh>DyQa}RQpU#-d*Ul!#!WW0Hns7skWkFL&2?!s#ko*P zeS9iiT0xVkU9h#>!sDn46-PYOZc>^Lain`(njxdc3Bo1|7$4K)pLILitRabJQv=w&i$?&ymBG%Vikk!Y~-Noz%J`~=rTT#*yD7B;cO zvm6EQMJp82_7>J9()qfEtJ)ecxgx+DRKi8sR&rteYud?~@|O2lJ-P<7=DXO^#a@7-AvVu-9wb`g5&1p_0`SRWWn|^o2YH{-VS$GzYPa)+`5UR zbnkN`mxqFIRzUObPlOdPdte`w-l^8`vKD9sg)|G`R=5@XCWGv)5Ucdu7~<0h_qkJx z1+$bS@oBsa758OM6K1NUdg0%1&EDh$J3|uz`FeP_+?Z#kPIn<(fA)gPi~E(C=oaVm z>@@|t$x|1MDXTsc`d35HLiW^kurk1A6NI?t&X0}vX8pAN*~9o){8sKlklb6;s$oV| z?*I8|)2=XVm25GU8!Ag0{A$@P_WKlQR%EXzh3ZmhdpG#S?Q*gqgo$eGy*WPSIV8++ zn0x``*kui^4=%Td+U6hobeLQizuf7JH7*$_!=2NMSR)_XGd%ITP2u%<3d$xG_xC6A zH`H!P`O%5XD?OiS2yf0LdavuzKH8C7|L--*mU+Yhqk+lBk+bfkznf@r8*jCngjc$4 z%mi*@u_`S5h)LebL8KUu!Do_Bf82icBvy?dl<2no2+@+gfa|4Q7lfD!6-2xHsJ(z3 z@v}v*)tY*$Z6CP4FygxA_mcnoUZV#Gy8m?zF)Aq9s-W_Sw++9`&LI-}?TDsWWG{f1 z6sk-VT1gIK)ML52G5}u@i~~1H%yF1@-to#o5Ia6YBJ$&tETF56ww)^l(WT>_^;NonrK0R0X6`p9 zk(}pInI8}B48`}1=MksM`9Od_RU2dU-S8?#W?Xf^CiM*X;mN%aI|=u4OQFg?;g~K? zvc1Je;CA~;)x3oT?@GMh2}g^%B`|l2WOb!%T?d}FdC2u6*P)|UR|Z;f3+_Ud{j77PV>Q~0RH~8% zS5^n|%oFw+Gk7eS!S?cD=d37;b!6@u+V!~8ITlXQck|{D6Vc>}o(z&<6cwK);I8(k z&h^JeQm;ikI6+K_$wkem$w6td!Nyc{3yb4uE!!3;uNbPTKHkRdCCO(ejqv7VNbhf{zxr{lk@-6Wr@|2+`GWgA(`4)Nl{l zl&uS`1I?n2$mxtK8n|haNYE(cGOY$wVikdtyXZutiUL4zNpX!=W$8pJxN{=F#7P)9 zz2Rb`JAK(BiHyA>-@jhk4d)-I7^L$G+hC)(OMJK((aH#$=J9;V2KO^PRq$1tUIpjs zv-S1rKCauuJCcte?;XA3XsgHIc*nwjX2o{-A-;kR@29p#cKrT8{KVk@O#^g&Y=NXd zeawkpgCz~*i7z56<6vu#|4u`3CSdDg0WO<%IPL_>zx7+L!{E5B8ZzZ3Zm3MgOL$vh zbv338e6Hn~;9kP0XY&geLw>SnGY$^eW%NW~5hxh^2UQgQ!SHIJvmV$F2NT|^q^5^l z`PvU1>eCnO#bAvc60+Ggz|F7^_DIB%Fw6Ex2bt2r#Zcak3;djCj$L2%vc7jB1};{@ zLB`BH_F|?dA@nNk9^u|k=vIQ~g$(EMoZpK3G4L`_r3Wr=XsE%x{(QWH% z!dsI>b#iR=(@plPH!;~19j+(gCf7sKhuRuw3G}gvz>Be!-s)|Sm70#VV>x*LMBMn+B#p){iI5Z-q zEc&&}MtCd)nppN}EQYZx1iKoE2qCpeB((`I9IC7bT{-dH#z9w!(f9MLhm9N=eJFPZ zYYr8kO;a_nG(h=}=N$2h;oBuAjClgY%ltPicw=|Xv^RwLYx6-gZ!u^`g7xxK8^m~B z)=~4lXgU-nXy^2`ePLr4z9w0qnIFla$X$K=v$gL(+B6KbRm4tuaL zn!j<&chMaBf+TMsK)#igN&Gwj0KFGmu>#P=@aLZ2Ogy+7&} zb;n49b#-)_(aoBz4p;otjsCzy8W&+Yr5H^{7`WgG_E$OLU&nvcMWRj$JN^o_aE~1acF%F^ zB7xsW-)H;_#)*;jvv7|$2W`f6#^SiEd21mB$XR8_s|?a#7zIeAyM8tg?#Ic zrr#IPr0OM<_$K^SD^&5J&OCB+Ec(=~PURn^y>H(nwTqizA3M==ztD0N`I^MuPEkA3 zDGq-*#3c*&9p5=(eoH;-pZso3v)Gm7vSs@gF!PC+HOz`FISbJUE0}Xs>xnY0dxAO2 z6s44D+*}gXKt0e%(X*ARl<>tYWFs5XM>C+G^)He7JyF|5QwIcdN?(t|d=!Sv@Gh@u zaIr;j#J%K6EM9F~?-}miwN%F)2%P_Igi5)%_>IA5dmiuX6P=n}$n4(`g3zNGZIb6! zg487LcDT?OFq=ySq1RV24V&?rcFQmjagQ6eo}7*fQ7(-yh$@{vKTz6^Z$@W6(yKU8 z>r#|}Hie4cR}V_s(Y{g=lIy{W{U-K{I9*RVdOOV!M8V*(ZZutXKjhAU`&tGdNJ5N? zZ^m&~7jW@xtB0Z`w1D)^KIz8>d<6%b*b$a%SF{^o?+~uy3tN4igXlER&sz3)mXaW@ zxWfPyX9FXIZ^ZD9J)n+-l8~N{AHuz?4ElWS0nPh zO!!V`XvIab6PUcgP+jQEZ^=r^FIe7jmQQ_U8lMffSmak7VO^>+Cl@r57Nk3ja)_m* zV4Y-?#R!WW1tk)7hE|9CYD~XuUZcSo8Cw!YD~G6+GcVF+vPpHZGgoR|kAAE5a_@;1 z33f>r@EKv8C4`)oN@eU$@uZ#ekhS|lLvmGN#+9wm6BxF%y4)!xOyji4S9#4uKT#gd zJYU(aH(su1CTY3Dww%CTHxTt?<(c#2i)kdkdc?n4peYC3|1#)~S~2^euh#SS~kkGI+#EoZJXszB~n5lb`08=~rGqd(KlWtrpKeS80ssVbB9 zS&A}Yz=}6vG4PuUARP9fVANz>lF(0yALRKPZDECb9{nVNg>CO&huDIdc?+=;gMq#; zYQ+3yqdnQ{8lE=Ht|+RKQ2a!uqxJWOiVX!z@MMojY~rLe-wAO2d&j8unV;Ne;M;eoCM-MZ8p@ zXJmSqEp8&K{6oT>UsIcV)#wrmy#a96>j4vYkQP`MET?o56O~#%ylH}VH z$I!*Xne%t?s^y!x;`J3G$CzBJWH1WuQD$7B-PkX9uaQaKgkc!+vVg9>)usJhd$gIo z-)M@oek)t^DU<43e)xNfIT;AXoOZ|Zj`?Hnvepl44`tW$MW4L@wKZiIT?X%b&)w6?G09~ImktXq zuHc9Y%5GSw;*y=V4QE$~9@K%gv#(>2ICWcSiAQB$b=vz@UK2&m{=}n!GwpO158aqa zSyZ{9P~Xdy`uF4%kXgk9|F6A9*BZY>A-h+?9hGj7W|^4F&Tyf!p?XI)cGe}^MaN7_ zkD3w@!)})TTSBLfkbS#9d^neJ(>;^RGqn2+@6W>@8m6xZ=IEX|@gFSx0sgA-Cw3|( z{=VaZZ|nFg#18vcpjGs@A$gA-JKr$wFnR07E6PXo3=Qt|Uv3zYiX!?zJ#ubIL&Se~ zJ1KBIGw}>UH10#cMQHZ7gKx&oO(xR?7blOeOh!bv6YmX20gy`EzDZ zGfD8f8rr1UoRFrJM6LS2?Fm++2J%ohBAZYn6k_`Z+BOcctTVFhOIB3zQs%>-w%LYf z%S!N%Iq7w|M@qV_X?}uupHDtOzD8Ds1pb+ve*;%gRWdwoi+I_~?2x#T_ndIH6gw%R zl%Xj>@4JMp!4%PJfWM#8hGG3Mj7krsB;%dL2|6?Non!&mug2^r@}Xx1-v=<`pJafR zvV;GPHe*j0wvXpT(V8@99mk2mPa{_3w}~>q>RBr1G1F{15)Ybg%=<nR$u22< z*Y{o%Q!OT*OK7ys&gP8sHX`I`u5fFG@=`R9Qgr!T9+?L3syrJCdY8p)()b+59tF!I z7y2I)fwa)07@O&e?HFlPTIWTsrIbWtT{eKhbhi9ywP4Ek#5>-c`Rlo2h?d)^NcY=l zR`qj0dN}a}oq*oc6Djt`DA-EmCz%5yFd)>N&rms&b#C@>BU!tfq%Q{lY%3hk-!B4?YHhfG{vMWe|1|1p%Ett1TB7-j$E; z*e7-PL*JTq@^k@#ukVjL>6MFewVG|6n(`4dA76L+UyrG}=$5TJy(0+%y9Z!=@j<>r zrcl`_XmG+9 zbZImIVGbSnfRDGKp;!_;SEXEuV@^t#qI=>ggsU**y}fJaVM{wG`W9UGR$_iG#;P5R zzLD7J&(U3RGX8qN+z^V6O#D>v|91}GC`w=(EyECkZD@vJ8X=U9 zVJpU7z>;Ahp;((fEu}`(@r%+Z`XGi<6zd?zFn==sfzB+PFY_RXQr0k#?BP&E+JWR} znsu1rHKjw}z$=z;(I*A-&>0=0D1dd4MG3$@1mlxw5vCEsF#xKizSVND@`!L0#h+<0 z<GC+$JU(4sA0ATPIOcGxwpCv@Iek01i!*)r><;#jVpQE1COX zN}J{pnE;0d%H{NZG^NE%!!Am;w0%`2YnCCK;#K2_sp8fx6fJ;5C}nfTzO2%wNd%aZ zHS^F`@oNL+HRF)0(xz3!2f(3+(lu@Wx6&oc5SQuy{Dxw;hn+!Z%iAGNOZh(M}i!~Ch1+!o_ z8u*g`ZNCqIuhZTg+Eh|u?9~)-GCw=N`)imC4CyroBaAKrl&U7$aVPex#Fe zVHg!vay&<(AUR1UQ&)R?o?L>hqo%R4u}zDJLoBF2f0aVfQZ_doVx1!)tO*qgT>2tK z6~wCKAz<=PA(K2Wvpn{`TZd94EmZvB7E0{I2Q4f@V!l0%IyT(!doqF@bJ&%>x#+5C{2x#gdm98+m+bCY(5?) zwIOE+#b^;EFrh^MBF2$ILA9taT44xIlNZz$L1Ia<+jM9!Vi=*2jY&x=m-pLQ%)v5? zWO@4;5j_t-3E%h*Q`H3{Co!eP%8mLwS?O7cajGiH!WV}FR2+`Tq%zX;^2%KHFfGZOhmYNIPOum_6=pnQUqG)J5FZ`_?@QG$-H?JMWX$UA$# z4JDlfOSv%M?D_0964dABsZY{GG_j>4DL*A`cE9N{tYj8U(#Q8jYBa^t6FLh*vRlP7 zbse}q3@g-|kAD>0(SP~pEASdQmdaB_DH|dw`Y<6a<~9F#8cQTCLtkm~ z^lJnX61yxCG1gSYxbv!*d0pT9c}_>vMjtoYv?8G8m!z%8g_sqE(?Yw#JfREN+TRW~ z?wwWCy4|$(_1*~L&e?rF^`Qf6Dj|3US%)}F^q|r6_W*etWk{VCzilcSmJJ!2a1+py z1v+v1B`(*eaR?KZb@j?Nm1W~9w$jm1P3=jfhSGMfRt9j6v_ve?VkiH(VrVpc%Oozg3!Yniw%29Zz+g4+4^D)t_00gQX7 zfaf3)iv6JJS5EREy+P!-G;j6*%DrS6NoNSqV9> z*|hrg#pZL0HcKXWa;6eeqBJmxm?bDIEhTj7x+r2v;JE~8osBZG5fya$Qv9uu^e=JI zJWFp4M(CkV4FU&*nOIIyZOU|Fs)_?p8&c|tpYZ}&h(=XYNM=3t&Dlt8vbc)SfI4DD z!6*gPGSK!ixJ7aMBamncLB{qDVO#2OaNvgk%Omu8Pqs93gBBanW!s64PkMV2b&e(%0c;Bp zY9WMcA5z-42yzu)ay}#)qib;&?#9_g!rtGp1q`9IxGPBYaM#BNzVt)-CQ@od;+)_0o7spsF5mc>yc2 z`2nh7BM5gChBs|>C?&0D0zwVEE`@kiuZH{dtO3XR$hc#5z7g-xOqPe14hd0nIRLF{QCvfGct-l&@yGe$3h zltt~jvZTp`&blm@V93CY8LU^yPVAyV(MsC-b9j1vseTi=6B~{PrKY-~0@`pDu_VL~ zFzLOUL;m;t2lBAq=0J(nMD9~)}y8JO4Lur#qv1k@-(bv>Nk5<`~XwGSa(OUIt4Qn>1G2mLAYCWWD zy6}^~6ue}}{KsN*iyj~p%yXVOS7-A5NdGEafc(Z#PiURqcC*MIiND@jAYR;@niXHN zv+V|M>ooDYC%QHiU7UDWzk2_!P=FRCPK9pn+p>Ef_7}MVgj|DUc-3A5Ms5Hn(v_W)WaE5?@N?0KkL@Q z9;<6{pc-V8!%0WiHhmom@Q}7X@&-#ZN41j8-6w&2Gtsd)fH)i$CzCI6ET?PrA6_w) z$?JpdQA+CM5TJQ!=}? zWz~3;7ILMl(!e19gi8saM1OCAj;VYLE`gj!3JW`@K>Ra~WKr?hD zI#R%E9V6qV3}0*^tC@~=^rl-K9M>6rG_B>&z}!mBQG;2R3N3aH>OVm?${DanIR!5^ zOmdsHVK)3JR%vs)k9%A3ne2uOG~#{d88^No)+_yrg0rEy0nx<^ODke%U~k6qgtev& zXI;@R+csf2Ma8Uujdu(*ssaP3$oRptI=1JBaY^J(e1MQ*6qox#n!P1(bq_Gn)am+F?Ua!Vls_M>dfv) zm)D~C;u3Oi`SFaNk~WgQl_Y85ql}!m)WlUILP`qGP0fs9!}5@n)+M&An5@h_=r5Pd z?x1oRSTWTb4CI*2%GrkP`|_F*2+>jcnur>I+dBwLfOsH2mN^iSvXA7;z!~ojVS6*a z+e)@&+r_KaoNZ5)%LC*P%N|#0GuUNUB^&Z5(z#oiTTIB?jHld`yB*NZg(hlKWqJ0C zb8&GBF7beyUD!8&p>sL;u#0Xu`NFbIp+3B|BrWnkz?w<-2JwBy*bNxc_5V)W!#yQl zZ^7>o{Br50`2jqCVtMmZKJkfw>alT#K`_P9KCMj%y%Jn4szxSx}O|8PxwG^L9fE(NZ;jI{Hqiu z{RYaeC%GY*dH-&So#|xus_(*_zdPz{J(x;Ntb&zxu(58k6%_+6NVy52wUD*wN^3!! z@`9`*nQ9ul5LMk0OS^2!>6rNAKSZ>7pVe&?*rS1r!EJ@+Ll5l8ku;{a#-_tBu`U5oqCFuk96GF`nr^6V?gkY5R zQ(1$nDu-V1UADpznE|&I?H-7(+ntb zWIoN#J4Mz!Q;*ScePW5n^&)oS`;%D8Sq9>%O|b~c$EJfZNb!zySBF=GL3-t@cO-We zxK;4?B08?+umXM9Z#~I`W97lRJ(HxAV^AtG3d!>)&AA5tniFl9MplquGuwefCd*+K zafggCAo;?C47?xxwaOAEn(B|}Ijdo>$OlNYhbT^x>O7D*lY`=f6c?aJ>cNi>`71716tMqL(GP1;Q*c)W!7g+9W3F2mqwXxir#zG<@8 ze@wCobrwK99y1#h;m&9ACs&|)K{XD$6h`rMGF^YBaP(U{0%#~%Iri}bCC zS$n^AZ!P;57McJ(Xg*@Q-0cZ9bCgo0=3wNnca) z9DeZt(^t4GL&5N)il9F~2?_{U?##0UbAgPgd8Dj)V2$izUY7XyZ!Iall5v2X zmy{-Nx7_r3Na$>Q3`0qGUqWgRB$o%S#fdUg1bf#sv8ErFn2g6V@JF-aN=6 zlx*E!JRZIp#L```T5mAZsRgJfuyShWk7yw$@+mF&CT~;ZY{j#O4)2p3hOsK;jsxb5 z=?71H793Ik5mWYoY@qE^Di-WMuc3P54;$x`PjlgP?#Z$Q95XhY8;dvvG=3{^3mTBL zzGH^Pl@HG|QBQ1OrDTCdiVzh>RIVtCIbE4B9Y)}fNKFQf>6)zB^Ms?cR8~++|vbHLi5!R#MuFlBcqNx z(retuv80ayGmLy$J-cH~)KLh35An`x-WnkN6GcFUc~by$8<4(!H9&?(5TL$c{2Q7J zcTCD)s~+8d-M4@8Jy>Pm`Ace-$RJQIWEBKmf|4SSCWLaRSmM;3tP68`q^_^}6M5tn zN(jo-1mH6APAeMqNP8DdlmC&Z(Gx6Z4VmenEgm z$m@r{0m&i$834IQO^&ED2z^WSe)7^F^!4`|E->Z4kSMJnIzCsymVilY!Bt@%B2>bn zt6%P^(%kO4;_@#D2_6N#?`aR85Qg>aV`b~Xs??^TqRvMUK2j8;2BsY$bq(c;no5!i zUHB>vn+Y)myN1k0OGV+RKzq#46Gv7-=jfTKuKCBV=n*{zrL&<%@zV8l5lr08DozkB zW$9O%z_3b$^GdP}lJh+;!6nH~NE3~aB>!%bgIvChe3j~I0<7HuMr@RnH9)G_vW3sq zy^-F4Z3(fZ8h8~*-sz6rMxb{7+{zZa@V*h_2&?Kd#;<9pX2@XHJ(1JUled_=tKO4Y z1ds%&RgoOsGiFX(P>5t7PV07qCZ!lmyOPCp=Ov$FrChUrQx?jdmVl3UWgB#D@9nVE zkqqIM0ERgaCOHSHa~4L=fciG(f=RtL$bK3CSqCJWjAi)qkuPW3=a>PCK2dAmFcpez z?6yYZB@}c8x@ltPF7OgSmH{3&;q5N;5^{Pxe%FWtU^gCcSAheO}~OiEw!@)lRS4^PholUF5~hlIC!E zyKy@lm^9S(?ppDw0g}AMG!o8Ey3^bkea~8jeJ7KSi`iXRbyO^8o<|);bK{Fg&geD) ze*S^|xvwmDA0Y()-_z9`EuIf;AW7uw5t9|JX7~jN6#WZRL)!HE%4?4Ict2-1AM!ER3 zJrxg7x&(Ct4ZWb22QD7<9e?ym?0YB=WIcMj5t|3JZt<1Fo(HupLiPi>4#?N>>9_PP zv^ajQXlWNR2g6ei5!Sc&_UsuJGPoeXmov)vC~8i!bMF=9VL>Dl%?Q5(C;<9W~`e4Ib z5-x&{WXHi#DnGrzURB$IVd{JQmQ}9hZ%zn5GAXa>qr?blNPIPbSx4dSpi&LyobO=a zN7}hlnh6J@oD&{63T=+M93lU1_U)G06NQE@y6QXX;`kSMtW@CBW z(BfjuIlM(jJn0~rXzFB2Q^qMhc=QP9iU&W}r$G;Z{?f;H35o$R)%LxObqFO?)%x@_`*cIHXhO`G-76LQIzJS$p_zU0P^R<^`xeXtqo6 zfmrMHtrk%U91T9@9iB$g9 zOQKx(Ypdw2g_46NO0GQBoM~Lw-)0QAqk?PUMBAuG-lk_3&@fVr`}8*zblr4F@#Q*R zZn~1zIr1s7McoEK7rRA__{dlDc~07)irSVnuaqq5%E^WbOIfmAuD*32oeB^(Vmki?}+TzhCyjObWlZPxpbnT^=t` z?46rO=J3;k-AhW?T@U%LptOHf!Y}9RiS!s83nwrZDvo^)?j9>Me^OO3En2Qc6Y9+0 zU%k9=CPMu{wKeUjz(YmYXhg0(K#0^0e6>+)d29-HZ?=RYhlxrW7q;om_-xz|xwGj_ zEXn#rhZv3>$Cq_6QwX?&DJh6WXDg%YqzrYpA7vfq%T@!eKv>(`ow^zw6z&C=SRM3? zqfXd5aA`(QIA#Is+o?y48C~wcklB45luZzdbqINy*4`NP%nF9-caX)88K2f^osw4_ zWpW=@L7*;iw%*{f`0U;xYm)cqMMt#p&m8xouS)}4_r85!sXnK4Q&st6Q7SB44R*Q~ zy~L_#ko;u8j}|_L$Zd!gU3TTMV8jai%$!{4`i206MNqyLHq2x*kVXY;K+A?gyCgPP zn|VmRBsScuIq@E$4GB+W3{e{<5O}ll9;XdWcX>=uT8r|&str$fK@M1+Ir2Vs4a85C ztk4`;kuvoNNlma$1xk-rhGR*`kpSOWsgB41*_n;-sbGR5T2S^kS9c~sZ8g&!7E4N# zad~i1e57qkFi1|8+lHJf>}%3v!zAau*2G=v=GoH>OQ)vo;cmdNZ(JRu?GebY*9pZ8 zE9eGRKyq=LKqI2TDh3^X$oG&=6a(n4VQ?;NJ5#++R@P;jX6v!jV&nQ8&+o-JY*-mygk1UbW@3o&jvGtt!3xpY zESKTHZI~mxfK=_D7`z0tS}>*rwyEvM^03bxVVGwWz)tEm-T78M3m9kQ^G~#DO4nsNyT9Z7$TN*jQsQrl*Gx!_d)VD_ zCg@BJj&MIqrpK5d@TDWK1V07&--t1{-yxkWV|NjJu24fB25$=cBMKy$}KAk+nj9{ z&&|BmVJK8<%;m0ULiX_2Y-c5k{^nU(&-y~8If^b&1(qdYJ0hp1I%PNHA1utP;`QIQxEwcpzpKv2qyTT1Gz%t9e!I~TNQWE@-dy0P~*%HkU#~bVh zWt$BFIr~hP#WxvtYE|?fZmVtj)7EyQyl#TKCD%-i((IZ36|6SrpKF98=Eg zMe8+grz(`o^mK(H{7{lo8QWI_4QtsFrz{;n% z$FPsLcxJaRY*|$Sot8*1EsB@;lQ1vfd*e?#M*n*9ev#}VoO-n0hI&aqzGG=9%k!?5 zY2FNwKKV2)oz{mAUg9a#<|ol@2qLN^)NR{AGX;1G)Pd^O0V~G^D#rzA{{gf3aFke8 z7m)v!k1xuDAADA2kop5F`Z26fS{H)(L8?&l2a52UseFar?kD%S*f3R|DlrnDey73~ z)O4=aIgKhzxY!?TOUy?!KE~}ZgG!#J*eTz|tR;CyYQ^laq#c*L@%c^tp>-OM3}=Rl z_y~ei$pp>9ER{~p&>|4`c|}f$8@W)5{#LQ0+G>-TsVy;j6PK3L24I)r>^cAZQu0E3 zJQ%wm$`|`-j$PQ!b9VLC|K~#uqkI=q__-@zp>4)HC>)&KBQ3=|9GklWf8UG(X1yDCmRUn}pf|YTgHX4Z+GOuS^g;VJVGU^Z1HI-q*l_IK$M*f)u_W%h2{3saN_*Ji+;4S7$X^F%Fk!g5icZEwgY&paIOGP6 zMdYPio<*w(LAba+$(z;zEa8Iw*&$9Ipw$X+$uN(5I$M(Q*gFlxyR!Fx1#SL%L!U+Y z)sdQ~InsyX6$?ib)HtiqiE{#MQl}Li(xH<1DK6VEsW!$`9>^8}&)H@g2yt=MM-Y%d z`QzUa2I@5T`-z906`(-nyoG(bMyDY8%-r&FJrXh(Icc#ivk$dBu7m%Fv93nRRSrseB9=@Sszx2s%e7If*!sUXukiAXPr5{@)L*03~YWE?? zCxOzu@)+-L)q~^F$xp7sdbtYr1nNTRrNPCy{ zrGwTGn`6gkwbJj1nKk)*B}K6y6+PJ+T_+?DwEEn%`(Al&NBiNm`rx(u;&|{!`{jA^M*3&9`eu3m4E59V z{u%DC2pxb2f%s}e1Oge;c6Lr&%y_yyBI#C?OEte1|N?9j2Pib zF}*l$1nz@!O%^}OR8B(J#FVyS|xj`u}*uaOWb}q^xMlW*p%%ok9ANO{t z>;TRO>t?>}5YUJ0Z~p9n-=*2!s3)gy+3bk$2adsolW3=J=~>|{a?kU-p+6o1@iP>o zVjarj6O}_M9txpPK=~qiWYm-Bfh8}=%B6H>uch8}uciY39A{9g3w6eJIaQZV3foKN zDc@1%j3}iMbd2J`|4CT;kBSLQ%E@dbC;)&T^#5FQC}-m4Bxr2xXyWwWnClqTT_@y! zx+QFqNo3nfG6f1)S_;8zk`V-jb4tY}0t~cL(hZ;~HeIs7=eA?E=Kt{Z(e!`E&w}3k z!{MWe;mhL-aWQ=m#J_5Of#82o58T|+SY+FX7tcA}W_kJlK5jeN-F$ye;{s^kxk4b~ z!1c!k5De!dh*vVA^vxsajnpF$3*kT?aOfdcsRO&qf@DJohAPD<7K{dCzze_9V$yCC_On-D zmj)k)X3kQq6SCSFJ6}sU)`6Vo2XEl%GRufEhb3DJ)_m+Yjir2UUeHV3xtTUcuaov~ zZm=1Kwid&sK#Bx>IYT2cdzocdTvm0$VKO@MIaSqt@8i!iwjwr`(~#_}AAki_lA{_el*aOq4O`6h@zQN- z#icwx#v`qw6~oADHSnqcjT!{8>heSZK&el|BC$fhdbz$$1;_Vmn1jZ^@Y=sXH zw_7$YqRNPEoP#|pSEh2BsXkksTZ^@aOm2lr#M8O@fNhJII=;OX=|eovL|1SoAzOpw zKY9t!AB`^gU^2Q)PI|LP=`iIEi4ks?REsu6qp>uVn+pm}{;EI|kRM`Nr#WDGU~AQT5qme<2c4JBRO@XxSH7x`>&CgE z<8=pO*>NJGWLrooNUNwWYDVZ|(9x{)L3@bTtT@pMTo|qxwbzc^opsE!6ksls8DhrA zW1NvB<1{BVuiwQYpD6k1jM3Mvl5kL&+4$H6eWup;x^}yTDqkXnE zE&in&ky>kkWC2`mysHHF&x@D z_&%e=x?cADYC}ekVJk9f{&gCsWR?m?R*u-%cdQxh(;rTxxtW|IT^5KGUH3frkaKRt z9v7_&FZ%SaAQN69nxZ{+aQpk_?Y3yo6`a)=xx*8DE4J;ysw!0a>As|YdL3@v;9l`X9?2Ph zL|Oc_$GWQb)8?hW0y})Zkn4);q2_5cJ10>k79wY7vPm`d!dqzbj9qfl-w$$|!k*%91cx;6;yeA_=9 zf&ndSd_>X7DZoj3Kh~V?ESSNP>%7XgoGMS9xn3w8)mw6c>2J2MO08Hw%;c)mgfZM; zVWl=H@5mNA^^vP#HPKv#6{UZt`V4Zk`Lqc%0i(@P%Pi=Dv3tj6NLrx^vJ-4FQz4d5 z-*+$6VP3Q#FK&_ahd^$%w-1PT>_ISdSsGDl_%)Iuzhh=3?a zE!fx3neVn$fWz~Y95RV!Z2vGKs=eEDC>GTj2APdVw2vux{pB83Xd*W^ljnjMAUHee zZgu@;>(S=Pk$609dNTP)zhK(l$eWx!k*a;ZckZ;F-E!D5s_Sel%y@*!Irc3Q)-J(Q zXrG#IDWwV; zu1Kli?*{xcO4oXSsy^QIaY%P3`6l^S2%rve2z$U?n&GxQ>{4Q%cVuiPe@{n%ET1IP zKCtjjwNzRiQh(r_GzL%Bq-#+X{Xi}TdW={a?yTB#i&%QX$cTPy-AIqQB;>TA)$n3eGlXm?DA-C_IAI!m^Ue=7sKT=y-j? z5tOw$oP$$$8NWZ5-|j#Xj3@{|jD&n@t6YaIY%&=5Dm79sI(99OQ9|1&2F;Bb71^!t zvEL=z0M*A z&IZbME{;Yf|7C8B+NLtLD#mXPNxi{3m;@wx0NPxty@j%!s6-FXx)(e~L%Va)(8p)Fiq=l^RGOG1<_1~Y zS*(!69&>G-X=Z1#Fx>NG+fpEyz|i0e5nR(`?97bi7}@;{;PHwP)5tdwV&6ByT_X$_ zE;gf+#;we$4AI=2okjQl6_#Y ztV~}+ssm}1k~2LyWmQ24R!j_oFO-%T;sVfm8Lxz zVXRE~RB15j%8mKMvUTqopdRwmD63%#`t0X#O9;Zd?_tVB^mD7Cwlnk>wHHDE6U4&1l1%8f;NS8-GTnh23B7 zllX*Jx(zcg+&n>yTAwgq2JwBQFMftw1P$SgDasH=R?H~X1&1EPr~{l$Uyw6@%cV3# zoMW9#5^QX7WET7*@W!|?w0aAHPn5{lhnlvtw}=flFYyE|9=~!p50x1Us>{Gq-gG1QL=NgXYsYPwhO(vv+K&Lk6D>D*6TD`#A6^&|!`bpbqIjmQ0 z>&}il0~V5B5H+$&z+pR=-vOEfw9^mdNMaBVhHOOo~) zDjxQV+AW2)G8ege$K`V_(iOp;J(SWtv|XsUC)F+41ySSRxkJ>MB$NoVn7iN=JmlG3 z6gXqlOA`ZkDm@B6Eb5^Z)M>utPUzXJi>DemLx3Ak6(+e-ewg+1PsrOC;>SwJHWVGNi}yJ#|LQn@{5`PJj}d_j zudl!@*BSRO(El%-_n(l*EP46fO9B8ur13vz!~dH@_AeDSF#GRVSEK!(4!jpXRo=zz z3}*=p2$F0_5C~?-*MbP5HjqUB;6eY|*zsT(GG+&|eFb!S73ZE?|AP*&TYFMPl>0zk z7v7a;J~!RlPd#1r-&@sJXHQR08P{I^U2zvxw`H$h&)a3Mx=J$npNBqQfOLwOyFRoR zPpt0Yo%{n?svV`ZO+5Q1xAJ?pkncg@${qLBpke+B_qfbk?^iO-5|{+1?QZvcFW795c=rwTTS{UBa%2z;sCP>(%9zHGhI z3ZA@N;_x>KDkv4ci9zv4Mimq)ZyKK$#X)(|go!9szSzFF*FJ9Vzyb0Fr^GP%6J-^? z<-xN1b1MF+LHJWrm1HFc5LEF>@6d@jrFR+2X`+Fq3bwGw4wWh8cW+NT+2KGIwurO} zZ$e)5itg-ORH{0acSEeMAz<`JBbC3&SgOJ183Sov`ow=EV~oz7S_af9y<5P2XXA{Uyj`m_D>ej0azjkzQ1wm@-k!Xcf9VOi=S^&?{!QY$ zE+mqvdNB*REk%9o9C*#w-5)UVJMoGT3mf1@-5Dk@vZyCpLV*g+O0%(sVw#&6*w=TK z6DB}|9>KWV@B|zDS5>(J$`%d3#1ggwnkk%c_tp_`(ibSu-b#o;Ym&btGB7Ox^jVi1 z!xCev>coO!ZX8cL5(h6jk`|Js6}`$*&4*DAE0!=#5hQFxu*AR@98|Qg&-}7N4gF-x zF`&DOpb_-lv-0zJj_a#}P25t@sZgH^s2$>C6yTyVTMoIj1a5UYM0jB|$__GMHA2s4 zVN+j5<#Zj^MCDF|2-vfn%s7mrQ;NV!ziB;MEqeXzDjUNqW1qu6?p9lqxbylCD zeom^K3L~oEO=`4Oe=ifcLNvfEHEf`NB6TDwaNZ;!2`dnUK?&Jh12H_b+@{-^bv4ZX z;C-fED5f8Z1Xlx@q+!IF4(5aV-c;czd|XiyBpKOgwi}kUpKO7b4GPLDSP-}*iD=EE zUDEw!2uuuqsx z#RMZ=MWSv?HozQ)JXtwiNmnVlm~$i{fo@(zuu}*Tsicu?jfWr0fsA&UO*T)k}}$tir5r%G`|>qOexaBlOBxwk{uY-I%FS_ z$;xuAohC3Qy@ar|=y6FMI;cTTEJ?_-*51FGm^xKt_*8)OSf&Y~&Ze6h0j_p6LA@os zK2XheEo|CeJj=?>gJWf32_=H<-%<&&V(<=G)u7dk0b8kqW@!d-Axw8p(dcFy0c>ds zFF|XVu(}uz*c)@+j?JRX-Uo^zMvYC|N%&)1NEq}4Kiv;IeV8__S1$EtI6vSOh6N1p`3$K))p^m*ivv*C3~yF7l6re8X^5~agL zt!?Tc=QFV%bcGxNq4I3T1oJ3^j@P91@|?`(&w(i)UfAmdEGIIFS?OrgmI$$hg*lu-=VCQ^L5!^V$jmMyZKRSnftLpBO8=aMg(7d@ zRN-8jayykOf9uQ?Tkx5BJ_(V~WdPU&?wsPj(m28rL-fkhp3K3LD0l81nL_Kkixyi` z^fyr8=vO05Uafh3Y^p&$;SvUsn3HxUmJln~C}zlbe)gbpWw!yXP2OD6!V5*P%Y+3* zng%jt(ycB&EGszWz=>;FDx^o}91!UfaCUFjyTd{n%3pCIGr@5`Y21zn)_n;U4ZO$# z){5sA#fQ%^t9+A{M+QiEG2r{<1py5x95raz7D8#}?F6SWXV;RjXS#MSSlKF6Eo-vS zWSEhRt{8hcOp~u1G}KG3ovAtG)_(J0;3%A2pUEs+M-2`d zYzvjq!AWB#=?aqd<_xe0^Q%ycb1VKN93x>mTgLP<4U9)^eI}&N6Zk4ZGH)jpF&ZG^T#H@UFALqj@^;<>M(X>SxQjR}S%I2yukU zNVhqNhz0o#&SH7P?wa4xqVf;0!-%~AF~=HnVtK>;A<*pdXMIEZyRas3)$h1Y5aU2* zaYevg++fMoj`@*w3M!F#yQqP^S#S@o2}gF*!_PMNChX0R=#H^nJvbiF&s}mk(r0;| z)AkqdI8`0lVk11~0n23^@g11u_b-+=OrCx{q2VC~G_IL7@#uM&7?hvLVcf$g28?8; zgHR&V+SitnI=akO-=SQaI<}8caN!TOm*QdEBRPw2JpRI-@|(=Q-@;qody@GTWTO3i zt%ecvIt^Ik-?Zg5VC&|QJVR)fm2oNsuP=+3X#*$LAM_s?o#Kd32OZXw1fIeavnf3z z;x&mtW-X&f^Q)#W&gP+sy^pm_^WqZ7G-&FDHQQG8{aNI=UQ27<&HRRQ>-G_{#__Y4 zMB?m$KXY%p95XkRKZzrMOsiO2`Ktu1(6vVoOb}yWg@L|Mf2f{4V1;uV@|4~#vHXI1 zEAHFgvM`i9n>ZKOh)@9hvU-c|dmsJuq0nv<(WAwPoAHZzW5D?Pdd=Z(3vr7##4Nt@ zzIa1=>+a#lzF3JVsY{DB_VF#hh<_NNB%-Y?A%X{>enpH%ALUtHiGF2_0Dn40EZ@x5 z$oY~NB5uG+uJ6HYg;`otLvv)XcryG78pM7|Mu@(sag1pEaEcmCFO~y`-dC-$Mto5S zf5nzgmdwAjDC8dUUK7o-5v;D9T{FS( z2gG4Yiyw5Fh+D7~4W~hu@}-0-H)r>0Yx-|l-r)YOu4P=&fEjt^gdM^WoX^SK8qcr3 zeu2mQLZ<;fydy4t{Sq0OF%WUy{wpKm_!7x&?Nx5gGXFN^7?VGLJp>+KKQYfH8Kl!s z!_*^RMhieY3&G;fvzcELZI0aXvtdt8E~Tux(>qO>~1sAJql))xsi?$Eq!8pLt+;ix661zS4{_DZGqVp{xm$ z_*d>N`yg=+BUbk_t$-&#NNKxW(r`-o)FPQVlB@qYPvkjcAc@P3LirEuAd!)oEGm{` zg5F5>ELs*R8cXI;;v2d2C#kUnP~$F)RdQ%^+d6LKr2(Av1!1$U0a%4cDEE!g^Ob|G z1jjX%?6|Rv#Uh?XBPmqBUoT%^GFG9uAd^J~EA|=lEzvJ*r?RlxQ12cp`hB3iB;t_F z{Hkur#~nUH;y_BmVYpDzgiw6~>te4b zS`3>Vb4Q2ng$74GQAnnoeHupjj^cp^Xa`{=xY{@~l#UQ+^inQ$%+zRmwdL$ara%lL zlH{2r7DGtx@!;yTp&~YMXNi-HN4xCZpOJT;6-Z|Z33St@12^cBUs2O+nK@-nJCo&k zX>|HOO2hiz^5@PA4qZjd%C<%WSu3CCS|cfBwXZP^C;G%T#N#Ivz%7`W4#CPNcT(v$ zYba^Ba$cI4ujf{om-Dtm$I9M$S{Dp)sy!=NvzP)I#DU4RL(N zI27fH5+?)8$_jEh(%z)}VOlUgbfsae_OSousUuvY$T#8U@N!Vh#d(i*w=0FR5X>2) z5iFg${}6)9T|hDqFWGCFcuL@<$WH_BUyl_}q6qpBs3t;!#cGO;&rM7tf-)mUCz#uAQ*5lBFccMvBCb zJtJ?U1X_BqKTA&CgZl1sBe)RoGr+^g`UB-htlLoI?4o9}JmDdII{jUPJck+&Z`Y5u z74nU|&@Y;01>o%qlNWwkc9-Gq3->4dH0>_M-4}K@{IqQZ*=_a>M}!>X?a29!e1kvY zXIbKR_l`OBw|@mKz8<^}C9fAbU48>P8*2P?1DcMi-44IKid%388cI#Iy7U?}t`2#@ z4eFv-pA&1L-Wy}fp45GhY%G{}4j)c{jt2*kc)pSf&oDBFxoXY zJhI~syPy+7QSuGvG@J@Cq^=y8<%3}TzT1585eX(N&48pEDCCX`WzY&pK6hq(hN2D--cAGt^}aI)uu0vdA*vM4T%t;{DA>e6R3k<>8!JwYCCkQ=NOPHmxgx2#{NsEo z)qJd4K5UH`H5Z^wIp8&UWNQ;%&51M0B&IpH8R2o1q8>>vXnr3~eEP&fyb-W5BRugX zFEmSO159;6w9L8Qzy|{v!widJHg=kZmcvc{kgJ9g{d<9nF%z}zka7?MPx zZfu_>uwlHz%{j*_O|}=?C9nq#vKZlP!&u2Cm^Yae{$r!>0GM|*|H~neVyi(;%UYIc z%JE~-OK67J+VraQ?m9&Ly2M>Q(3o)%2!0;l%u$lb!}x-Y?9vCfgpq&07w`jF753hv zSy#9RV$I}14+D?G32-@j78F!gsAoEy&$NdO)L%6{H z_ny2UqriS3S+=c(RYt~^xAW|p=RuldblwYU54cCxF2KuXfycCpJI4R zQKJx`YY<>sacZndZ?bJL$fRbT*ckS+ zS_T?Rfvsq`z>D2p)UE1mdfCR!CG4?d*(YJU0@)s$eYU>l3K{UM%=n2?vLP29!Vp=X z5UwAr<9FJNw=TWSB@wpuJ-0|i!jU((e#AE6+F7q+H!*M=RYhkAvjs3IMf54_S4BET zXfwMkx;zM|JP=K9CYWPo*=G~Nd`fc-5aVb_W0rb(ah zQs5H=sJ32QlYKhN*IW7xzXM^0wgq}r>7Q?1hB^tV(lia~8?X~$AK*M_TRwQExB0m= zdVk+;7_f(s_{m8FkU9YVy5I`$2GUv?cKuERB<|>^pp{FbFryeFk|{JaB2oc*gA%YO zCm2k*B@>Q92-;!@T99YA;<;Ud>U^Bjq92J2p>$D5XjcR-n>|*FX{}^agn-(Bc^(kt zH!bP-9Pj+ntVc!`fa=$KsF%$$YTyLM%x*=2LKN;Ans^x zZ|e+cwjm0iJQVv{Gz8MJam8d~iXfaLU=I>XKBrim{S>%I07xpv_ks>v;%KgYK$TN8 zlO7m!WP7WGS*mlds!5w{$`4NrVY>jJUY+IIu-T9r#QxaE0sqyG3Hpg;A#K7+<+<8$ zlJxl`>r_@N{8Ekkkb$V1Ns%y!P;y0=2nN*Sky7^eCJSPf*; zm|hmE=>VsBkf+flvU`+AyMrysG3VWwyqYmK%|%J+w6ljpR;le#rQ7Ms)n7c@YYeyV zk2|KuliD1&LqXEDT?a%LjoS-vsdUQf+n^$G&tph6yP=Wu$1$3MB#`hERGKlSQ@ zejrBga`)7~Z5>0IK*$;K$wifF*h;mn<=QvW9MDc&jHHpGhRdpB)r0JFhW6y@Y75ta zgkcyL;kr=M5O72xu|-$t%B}*2uTjnBU>5zYmPU{&u@jgCl9>b(8}ee8;K3xm4Dyn! zH%0}LnnxyrBu8k2ul^b+b~KL3)W$H$=-j^{jx(}Jr;_>8$hN3=7)l8l9K#t=Pti!B zC196||AR8HBCbzJKA|7@G&M(8hJ4A?pj0d~9=`831M6t>a@-i$mW=EtrS*p?hYFFT zCe+h}BQ8Rfr%}l?;RM>&A(h+iVWwwqVvV7dbD)=I&|96~F``MB=eu>#!3Q_Eqf=MV zxu-}mv!ss1v#h1@sCwOpT8Y8ThW?t;Z$jw%85~v`bm2Q;6s{{OHD;%*7A#&aTv!QE z}QLJYH^tVB}8v!=35t1A?tr2jiPjd6w4_SKP;3Qc)>-dA7# zw^oc3op%MSBCSsjX9GSxx&Q+p_`tlmu2Es>G_Pzn*k{2#jyxNl?;I!+@KtvIeI2T0 z0qj~`sYvv|56ryLCYNjxyL`DJ`H-s_1Z%m?c)?toNYTPi=wHkrd_nEN=yzwm$dl1x zA+RbgqZ@Y{`0h4Xje`&S92p({Davk2IEr=$I?6d;mJ;{BRF{09=YuXTdBC&)>1+ng z4O1!u2%ElhGyi=FgiyqwhB?4v3*=%>rK4Pq#Zu3-bNdoub?YjjDBH?lz=fMf4hQIl zmsb~QFXS5y4`kX4S|>o;LeXyE^@Uwr!>kBS*M@7H*pENi#^H#H#)ePa-2d=tP>hw1 znYanV55iAKMz90yK05Y5GFNoW(KOm{jSv}l7htICkgegylYwp2Y@qDON&PGBLD1_0 zsjmRFt0hg4&d9yfFtbD=8k90@@{73Sp)wY=ZOVAG^g3A$uMHp64*%@jwZ(v?S^^ri zp$Yk}5=~w;POqCbb`-7G+6U-df^>F(uRW1jNn0pqhAFT9!KJ8SrBp1GM;d63d57HC z&)x|1k&{E5xwty30bO_2iLhIV3%W64&Pv7v#2z>7=^T-30UmeJTxcR`C`iHa$I@6c zcz=36$GLL+jOEmr)g-@ss{_9@cUgKEXJa~B^YP4} zouMn}XOm^`fN-Tkub(L~lIvw>E#ot%a3{0zz_JZxv281WEzu_yiYBv~bML2I3N!p0 z*TXLLh^K+b4-qjhC?9XFc7q2O!41!}^)|Q53k23KF4WTrFw!R8&+%fGc0d<|c~ft) zbKc+OSjZuUVYUJ_wIR|N!ZGbW&C;Skf&OI~uq9_)njT>kLd2cd4y<{Fl@>1)&-6S| z>}dQBTPjE$09ELt^yIdciwB-ZK&pGlZ1u^`!yWrb?J7{# z$=VU@o4*lx#sfnyOPHR`b)X&oHsDdyAmIm*!;S6U)=@I%eJbi?dfRo zj|{9i4V$VRS^v)7-!NRA0ema_*)JHnW7GaaAGr6n+*X=%nZ&j3?YW@t8Il~b zR^43M{yuc!i*%FAQ>F(ui zcS+*A#KR>y_c5rJ5WW1HEBaocGR8DyzNElv@Rtham}A{u7! z-Qo)AI@EX}EJSv@o=lKH-|Fmip0momBItl`VcHtj8X^h#6HaLtLsKav{qx3-Mio-o z0O-6pn4o&zNiJ64=W@YVh&WgWeaRcTwFY(#*W8N1>JGg&)=5H!@N|PLDd5e5Gk-9- zn>Za1c;mq!&4n+1KuaUmgD`%;*Dv=%tcs%#K|Yes*X@D9I-bne=s{YURO=^uvuG3O z0i%nr4YqzzU8A!N%sjp{2=xNKink32J<8nA^Md9f--W83Z0+ZMz~5JDhwVwc_0v1z zPN&)(ejj&jBz)+$O7gkHtDX2M1G!cV7qZk2VqTf=b8M8!I;MZ?6p zw?udW^T)B!7YE7x=}I9zg^U2Q2P9TJT_T1juHcPvb$rCW?kx z10?SsI2rxcI+`UTHj{wX0=TVL7s$?Nn|;PVi9ts?b&z5at~MOdfhl|kEEtwvqMVuE zH!cR4GE3hSa-8!-YuEp%fv*-uTsXj5d0QazVZb%UrT67;^<6g>fQh_P< z*ql@rREu^2J?keJTM@bIVzU2zgwITP&xxXcyc7a=L8Hz-<0nbG6 z=_HA3ixX-+f|AEvi<nK_`IJt7rm>r8t$TlkEZ=U|1-m4FVN|+3JwkC@1#} zjXAaRtNbjJ{~A;(!nRUW?z}t_byL-pRl(YT%O+a91cf;6;TpsIQkPLM_t_z1Ulq!uIO(;=Nt& zK{nQB&AD{nQU+`j6h4m3koA5ZkWxR2b4!y1(%nF;cBHRMmHJ&CtTGC<{)$grY1J(Q zUe4Gwina{Z27HG27F*j%++o+YSE7qU|3Jv1eHx;|hcaC(yUByY*L|Z;3;3gC$==Zr zy*K5Ye4z>sOoz}4s62;1*N;#PoX!4z?BOom?79v@y%S#2y^51}bz{_f7_vQE4^?up*ylLNU++n_Nul0Q(0gyqS?cB%pQXduHBDmYf;fV5d+NwO{!^L+F z4Eb>P@})a_P4k%g4&626dGf>dyd!w=DL5p=#b>{RWOuuhWakV1gZ&zn$;W#+l6x=< z!!t!M-o`mGJ=^{k>_3b7%HyiHcOnX`cW^qn)ip3p-~NWm-g|PwzV(@sskU8*pywDE z(aU`2yz>N$_s#40$j|lN54(65`-?#R^QnjXQ*@ZS&4BzfF#Xe>5A;)UsKxa?4V(PQ z2fn*^ZhQF}6LWj3i|oj(u^b z$8!&T^OZ^NWxl8O`57Cd*J%KXSBMVSA;4aRM5NYs#FBp|v>bdA!YZTRJm)@b2~y0k zMI_$Vo;umBon!65>{mqmpe{1&@JQ5q;&=;sgKEbdhYimj*oHYJOUN#q)+fJn$gBf1 z8SMH7qaeme72(9V1q&aJXv3%&bzss&IC5672D{rI3d@+1W0*xaf^7)o%Nw&xjs(j% zjzB7Nsi7m|GI%U=Xs0dW)PPCS+yrgj$w#4n>J0H%wx*N&L=!IKOAn;_9v?-l8SvR7XEQkn_ZV$?!*Ky zI{a-*`O*-OAN}G0g`H=>&|M-+ino3Yf%Q{+YFb1%YedfiR>3sPLzsqfNKrUz2AiIF z$U(S@VMwZ#L%8a|v0gWV88d=Mhvn>`3WsBWi{nof+Ypv;m2+g{FsF?@-S;Mfk1$I@ zK?GUO?i3K@-Tn&WHJWf0yIlogK*!o%$ZF6`V#ra%qX;#-H4oYW*;L23r|$MlB|8&1 zZWRThun6qDd6;a-npM~%Y`rKt`q_a{kf3vaOP`{zxRXEsh29Z7YbzKR!c>Ml#hk+S zMXU%AV$eWveuI%D5_;TF0$2ucIk0dbZN8m&Ud$NSW;koRC&QAEQs$@ZB{DvO z$fHNld^7fE=I3eZM`l64?6(;M4%Hv7X&jL5al@dK+MHO1J|7*tYlzp)GYkiBcLr@; zWQ*ITQ1|tBzh2HcK>!@n+qo0?mK1PvdvOYc;&oNicvfpTC6n)r%EL`}nu+RfdFi)= z5m^5c3fToYn2>;Zs$V0eBW8po3oafZA8Q7bvRf-l7^kW`_7*TV`?m32kC0yCvD@c7 zBprN`kP&0!Fk?>st*+o>No-i^aSw)_B~$~d#0EtTIYSthQlWg1LH|dkIL(H;&k_Od zK-pYSB}Z=Je+RVZ=th;N%_jER3=fLfQr-DnK*ft_%b68j;Y_Or(?A~4MO_^k0nCECIvOlCGCLXOJejrkvPVI+o#8E6B`7Qy=}WGZ{#uBf_#7B zg}s=UW!Mcokh0PXS`Q@l!((;V0U$>AAsFofbMNZv+7n#pJ29!a&dBMvZLT_ zEA_e`7MTOq$MG|9#-!N_7IKiSY>k(&;$vV+QB%t!mJ})xC2ux6JNZB zHcAaj%s?@v7|A-CGbLg}y_EXd6U%FoIBjD@Ww5Sdhh_}S(p-h(WCQ^$;=5ajQDCY; zxa!PgQtE?FpIIqwyE8UJ>)X+W=_gg+8s2PBoYVd*`q=i8A15M6JY|`m)!8Ckqq|!; z_{`izutR$5-ZPfgIw-M+qV|?aCXEbB>u6_pn;`>oO*8n`ntwXEprsn$hjq=%ywv5= z!c@IEk_2u12B|`sfl5{Qz{ncM^~^5fU|g=?Mc2(Xcfp)m*gpyZO?wX;#rNH2Qe}Zq z-b9pG@~_IN69?#UU4>RSrPs~LI|+s-mc@LT=^-k=Ep0w5H5NbevQ%zGkU{sZpsg_y z6#Y1Np{xw83;sG&3&+nqKii43%;Ee&N>E_o`pmSB)_eWEf=LH;aS*X@cC2L6uqmxo zGHP|u-qlL5IzNcGbN5Feb;iNBPfSdaMCJ+%kWAwbJ9F=73saA8isW@edHxjFP$*@R(6gOwGEWC3f9y+*jF=uqbMB-Hf zLJ0lU8H6j!B3{+~u;5Mu2hy&R)$%ZDNgK+eB)!#rYJG6VS{R^?wn@ZfeI&v0R$W*3 zGCoW?2Ml{A2T-r&fyAeO_}{xu7Q&vk63#bc|8Q)(q;OhwxfKlj60P`f2zhx6vxKpA@fhJY|7bzb+Vbh^rhlr>Dl%j#pH?IE8hzV^Zb7^#HEuT4X6ca&Zd zuIX0htZxr8Kt~}SPeS*<&KM~uz_-Lkby$BIW%FC9A%!K7azh_wd6G$MHn1G2d`5@* zom}j*Ul9k=_!ON=8iVXRc2L;os1`yLW`^^kN#!!ciA@~9Y%K+O=?H7rOM#4NQy9aO zJKEyQt7O@z7lFh;<*P;&yg*V{5=p!AC# zP7Nx_iFCFMBDjZjO4_iY z$30!dCO+d!2!@yP)8|>%ERG)*Akz#x+d_*NOV@hda)(x%#>rK)wYf?irrWX(mMtew zbBrQzC3vKKN-4NEC+(77qg{*kLNi?+J; zp>z%fI>kr%(!$kMvJA(Dqj^n@D63z?%SNDSHP0Tn!43xb_JztAlrj%erIMM1ZIfud zhMA)by~(0DG=$_dC50!4(UcMJf-(;a9~da{1iY234dz{;e#p@1gX_l8aVqgpJulLd zdioeejHZpbAQrmu^kolj13Nj}4+w!rAhcWC*DBr=M-@#!2yNj{OUUdi?x6TuTDmm`n>6wg z7eoe@yoPg-=txx5PFrksV@NA{46}i1tJRiksZZgchOVMI?iaY>h)&rv)x{k~poAKu z4!>1Ij>_H#xhbOmL6k?4Ay!Dh@|C;KC{ns#bgr_@VD;{x%t4#AD`iqp72+OX;kHA1L$6L!`9D-|!86rY!t8N%U+E|rK^C; zY24mJ>wld`vQH+$_mIh?0(J7$Q>-35RU8xPkSwDsbAbhA6~p~qkT4wSNv#nxgR*Cz$%TJ zX}@H}k3UJVN=>?|fIl^{%1dme!jgFbr!(oI2!)hXJq3pWKOtn2M$VkmFF_qi3 z^gvfC-^HHx`!Ptx67L>XY24bL%nHA5L@srqmf@d<>Q)$)Y-M@;7Ms1$=nGZNIf9vg zboTd(M6~jr1;6jb@+HTBYa$tYHv248lZJ0hS^b6LGrY@HZWjI(i?63Afk;=Xu~ynK z5>69nkrcXY1v;!&ZkVd68SZ!pkX^4?eG)Boi`1~q=} zrU6UVx1;O=PBe~zbdr;qh@>-H`}%O?f=|SHPR*R9ma4Sg2BJ+XjW-5&u3g%+_ZwP- zj`b(yTz>^8$)t^`eSST`7YrK3gR7|nFC~BWnBV~^zx9~V(!;mzOv*_1^UpILt7n&jTe?P=beRx zz&)~9=yq@eKd4wiU3Qq4cMpOeMvAkL&ko@|^E((SUVy;d4e3t$U}ghWn5MUCKfonE znNL0-(K`5%exEcT#xzLqJS2}iIJkuf;ieNw%_oj3fAT!gocPm+g$gN*ATBI|Gikb$ zJnXa!kB_RYNm6Y@*>FmowBtAMwNu-?bs0*%gY&{dcj@p;kSsh+kUOU4S^>DvguSoi zt&TO#6RSk};gE(=Ak=YeL%fqsY+Y$$nbx6Be5e=!IR2b1S?e7{iX(9ts6RON=w-w% zu7QfwF2KaxXfcienG#+ApQui5k$E53-rnG110O^4;2=BVERVM=r+-5y6 zG<JR0x1UM$t$v5gVB8jgXRU}|yr_a%qSGA?7 z=B_|H7BZ({CnmQmoKLa->({OqHtD!lf~hrSfu_nW_ ziRkQ?#npouDOpFc0Rm+o1lR%!ybmZ^MCU4{AF{_R#m|ktwqIZCDS~ey=dk*9znD%^ z=I*2d=Ez9c4;kvY9_J~)Ubxp4~R#w|4xPzyO`TgM{0Y#2*|>78GInfSmv$qeley^2t!UV!6V@g*@1wCn=QZ%HeAVvJ6_@P6*J~+N*%@U3lZgw z;z`3XTXY)G7&D{77Bh1Ae`h)anDC1NJG$)+0oyGoedJX@mneC#xMH`R+dH7k=qtx2 zU?;u8?~@$5y))HDlJUSk8ZzV_QHQnmGbAqlG~)U|ck9SXWemE)lowv5$ih=$B zXndOl<7;O@?_;IVLHdKra{E% z>d#EP>*eZyZR-O@P|j(*ijC8`+nnZfLJASe=c#)F4Xz11Bg;>v5*N*%btfg{7O>S7 z^Yz^`NHOr!#jQ6;hg2XyYY64furffl5KLbP)gztF`<4%pJWJuQ+aN>pVr+4roE@YW z0!f>)Q?IPeVdP#sQik>24fW28wG#w-?y~o;_yJQ7&YNuEqWX;6 zwno?uK%OYgqo%#oq0y%{MvYPPrIAK>b^=sahB9K&`Xdx1~HgEzc0T zMqD9O<4+Rt`5G1DOX(G_4$&#W^8xeKK;*y|n_(ifCk+BDLEUtyNu`--8sMb)umNwf z4JLO(E7iY`LPij%Ocg04O_^(4E3Lc#;#>7AYN7=;E-c#u6FTT7yc-h@biY2otvs7& zvJEW<41`nF@&i^4z6;lN>?2g|cdz34HC{@9&z9q>!^C1IOKHR-1v+9=Ep-y~Hc8l{ zRxsYV;(Oi#_GHV|Ea3rEOL$f&(sKiG)o-uCS`;ft(UYu`y){VhQvcxy4d4NPw|LVQ zNu56)T9HzRKIL+4P$~nj!4_z<0U35?hH=>zI@^UBuA!rFwhq*&*))i;Bv)>~2@9`3rS^YvPF?O1!EFo}4+a^MF*nDftpcALMHrw8TF>~^O z5y6@9qm>1eZ3A0fPy*!7kxku|;po+9%v@yk#5ZSacUk?mEnYv}YuCuKf(KbpImVpR zo_#(r`f@7x$FLkG%eJ3*#W1{T9^AFi(F8O2q=>X`gua=z--*qrkE~-9c$gvrnVRBM zVN15Z?^4!5ThY);H)!9=QJ>G2{r&DFz(=yhf8iMWgy{+5xl5eZGrHO|T5nrF3ML+Y zQtaPLXbmk2Dm?#A>-Sj4N(@Ujz{o)l>tif{&)&rb^HhLeeO?suZ$Ovh5NvsedcMV} z;P1Pv)8AVCkcIv%34OVXU^{WJwD_Gqm{Mk~9q_by-P!FNISZHG+3j`e`RH?z$`489 z{aiomg3W8EW1|TT?kcZu5KM{oKl4OFM$`puY%3KCD4eR@z2?*2mleXlh1Xg#sdh1?# zMq1YQgkfxM@IvGRfNRQXQf*c{I;ODlzLPeRmI%l9r{tx>6T@+(p9o;oTKV$rL*d=- zN4c}3v_q1FM~VRL0)|Razjnq*lLt{!zjCI%zmHDb2IKdhHs=ZyMUyw66Wek`^)-N zt9=B=To?sg04fu*lIH{3q229rEnKVPs;4GKm0&-BnbQuHu!m-~r;0ofsqKE1u~Z9R z&kivzYD@9LT};&oGRk;Bxep97D$jjZ#<_tzA`V+qnUQTYDW6QqQsDCwQ5OaMzKy1i zJLZM#1DEY|pu9-mu^xNxyv|Oxq7->rmke!$qGgN$b)f`25(s>7gGuCJ%jCEi?V6YU zk)+JTI0E1Y@XTqHgVk)zt_V6I_7y4`U2+3$sa&AJJ&F^gHdp?cB%0fCdi0a%?5V@P zwip7PF|HgqqvnYYX#zY#7Op5@6tlwh4@?@jkqm_TFhO=ybMvNu*R3A?wMvg){JKr zq`u0%@GZ{$5cuAtjM{paI4>^l+8UB+qUn?7M~E|dC|_2mTan@1@;&N|>%MC*bP!1$kR$cG0`Y}{WXtiIfUJ@RjF_L*C)8`Vjk$M+YliY4y1 z#4d00HN3*t3@(#3%dbekx8wd~?Eui)QEKnM>OgPDO5XC5E`H+hOqd?ceM{Q!OGiNJ zDbT!T$n%0ZS3pgwz^+tqv6TO+5pCAWP6p7HgQS-M?UFV3^0>!F{`84a3{67lfYvn3 z8+UhX%#T%G%T$A8STolK8K)R2&Si(CZl0aYrOD}OcI9|3Y9D&T^34u|>yra|@N@pV z@o-3hXP{zSQ^`lG0M)Ywuf~RgR;mA5(|X8x(ueWc^1gxq6s&Bp$tx7xNDDZY3<7cWN{DGl|X<24}C|~m9b>Yq`c4iO3d}3%mG-N+FIU7 z>D=b82u=%{htxIi!eP69vFZhZXMWdSg73%coa6boPK`Hp=gi$ESur1ls)yWFK-3)2 zpviVw6+MQktQ#II$pbIC|62uAOr^Y5K7Hm(K{YhRTBYt|jUK{P^HDt`H1(Lzne3qkgTk+uXHAa(t>nK{gnL*Z!Aw&1begN6HI z-s%ehpncAd{g5_j+D@IuHo5$Qape9hce8Z&>}g2R+ZP6I>79o+$;&EGl5bXU9rOC} zQ^WkSdQYo~uUV~IU)pBY*5u#HI(J?Ajk%aByS)gYE)pl}HtzSnR%CWLy zl4ub{WWIcL;M>J{oq!IY^irdKa0k|m;;NsXj&y`Qo0a^mf89os^3~cIg+ydEfwX>B zH37ALk}@=U7N~HsCIzM4)&aCtvYFj>a&`f$5OybIKm%An>Ett*~g@-6ZagKr#|Kd z0#1jqHF-eRJ@VRSjFpK}=Mbs~^E?-X6-0(*xwN93KO=5{n1{hdF6e^69jGT2seMFG zit1ImV3teN;~2GsTeSgVPnzJj?F?e?l&Lfd>IwuZh@@ynA^*r{MC*s@oIb!{K$4FPQfw974kT<)oA5xFs@W8JEnVf=uwY+u%XmX zL^@LE>>>Gh9|T>& zGk-laMYfB5^&;tUtqXPw?9Q9CXc4-f_kYx$HwoT%mvm+M-af=H>C)Z1itlzPCLW}+ zJBJW3bPL59&iTx4y1;q_BTh&9r>JMu*eLB>){!R0Iw zQN(-s!>y>8Glqs8EICOUj2|i=u>v4>Kh_U8q~4-#Nx3aVJy6V&h_(Pa-SJ*~vPDs? z0|HNM7)37q_7~UkH9OFa%h^ZZo#Ti+0#NOdDEFgvy4$dXPlRg~d_bw?o_ko%^jlSm zb!snz)E9uSfg8ZK6`}jIPY_+Tc)@>`atF~bpv%hW4P)Ms;FR?GiJn?Hq`Xn3msag6 z-nr-$enKjjTJ5vn;abXX4MN}fbjy7F_~rSBrI+dNJ)Wq$M8B|Z6=L@Toy5IGgsQIbSPMs9}#dJ4$E+2;I1KKAj@?>E0%TzzDHAfp3fIt7q0&<*i?K zLYcatZ%cN_84z0&3D4X7PwWrM4Zx2!yH)mvJNG(+VBlf6?ev~lZ zrMf%qoBI!I_t;16mQ=?xn+ZQS^3ayRseg~@<{NL{+>HY4XOT8=3cpTqSZex#rmAlN z3>@X$D2VZum^+@BVZMSWk+qICYg67}3-qmrXj;W=jOn3sn_=PfX@l(D1pd>uS~QMl zIM*oL-N+a&HO(=n!iiZhkhUQHdHcA8($@r99pq(@j%$I=O`VU{PbjJ1PwZhnL@-7b z1h^TIK^q(Ru-TAeaYQJY4e-R0v`#(~CbFr#PB|0I)PgxrArqQ*g9pNV*)G2YfNl|O zAbEpwu9!B!vw7IAR~5dqX)#Z{GMK!H>ldL8B;Hi42w*w3o@2Y34y&oY;trs;^$c@Kzm=GF%98s9=$hd`I&Yg4>%-a}5krYSYO(ue=|^Ur#QQ630K z|08+_4c{Zh=fdhqrfO+~GZeC`oVsMFSsv{QlHcjv z^fbJ2QXzEHH`Ey+6G_f_fVmyUPT}90f>Usm>{`;3+Q6(I@c$HC4Eo}kp8x>>oc%KU zsQw4R#s7h?in{$ZwsSJKwfR4cE#*x)WCMin@0{{s!(s&LUytZXw6Zb?s(y-sl{_SQ zBzSb1Yg-M)mg$=myTb5OX}!KzAP@g=fr4-~GBUpCKl)kgHd3^t`z9tXaJ%e3Q%1f& zU(djO7$pN?MB4#{7$%GZxrH=Lf?1Hnek_so2s0seG1HHPQH?zaLm~)?K)OnNsA1F9 z=GdAgWthQJ1=bg0`%J+Tq|yRLpc^#i7n=5x87aCVtfCtxxAk% zr@icvPcayXm4`5LS2)v=X?6cY+0T1vKjWOZPl#d9s~j}CR&YY# zxGRe}V4U6$7cNu=v|zDM4WZ4+9wp?tMzWb>Z_P9lD|7jIsRQ|<^Ap0oq^iFNYB^!3 zR4Kx8EEvhMOJ6_eb|2r21#AtCVg~7}^$9ku6hpVmQr+hJZ1#pBS}$7rXwQGuSUgaU zek<&p0_}kR!CCwX;O~CI^$+cYC~-xIXpY+h*!(RD;ur|ufsYQ4ws#VMC>yRp~D_XAKLCD!>LQEHzkF5(eO zRK-_9Oki785j9o~RjlQOoz5uimhu8^bJRJ;sCBc9SzDn&Lu6|SQktB;7=fV*h=?u$ zpABaUKOurFEG^`a$ptE9-EY}v!%|tb#7lU)p;98v(qu`uQAY|_=tNqtg*%Wbl;sKb zqjimmrpt_j*E!e1EU$CbDr~#a1}rC;T^rR`ib=7^N zT=I8-eXI?$47+Ym65X`;#(u=Y<5b1eF6?2kV&?p>0pW6XeGF$o&MATbxi8WoW9pNt z%Fe#URF$%}e}7E!sjxu=UzGUE4cnF%XfJN^{JC* z=*IMo^s#H5MP*6r2G(ZJ(iB`wCIW4ZXHOL*4h6fm8rQFim@G2Iy3*Xl^+dU>J=@{^ zDMf7W%2x&e9|fGiP0)IJ4bHLSL*RV*8M5@P&hxE3Pn9)v0q>iWc?qX5>5wjo?F;pQ zI2a+H~?3C9kIyxnyl<$Z9{SOj?U%vB`ESJa6wJBqd56!@MDNiy27Bb;u6 zmss`;`^;v*O>B7w{#xV%1IP^k_Hit4Nv_NwY;6_<65NhW<~4YS@dmmeZl|xu@PxdB zS=J|hhcM@gGKfKH{VJvDz8V6E(cSMXDFidOqSezOxyD#frGJ;q>Y`klaiBz zv4QpfjzY$A(@+5d7+JG2O7z(Qcm#9O(x*3qNGPu$nciy=HTBiYjm~F)9%T}jNGz%T zZw4oC9sB?^2yYNxK|y8uot85b6=KL>_6bNp)2mZhDXa!qrREKk$D&ZnVa*SAt^xrAi-yUs5TyVqDr^?dZClG)9&u3EBYYx5 zBO?Lh_w^Ed1K1-oCDB1hKlAqRoxYCw{CIc+&-JMSvQ@Y*J*fX3%a)*>rVQ*>!)Gwk z{8nc`;Z}^)J%Sar8xD=&I*#E#u;>HEyj?UIkujFI(k)Wf+7&Ia1?uMoE3IyZ(2NMp zCm66lP1$_}Up-W8SHwm%GuW#6H`E+2l`*0u_4t;*lvu-{@sOvwy)FH%56Iv& z)K651perg_*()xB_QPE6jkB;xu{heWf!csITwV-RItXg0AtA!{KSye+yjZyO7eMOz zJ9z&SfK=Gl#>v>mNyOaI&eqZVza5TLwfMODX*zs~?y9FYPb48` zdXCLVF^`3G`v6B9cV)^<0fLoWOmO_o$usrpR~eI-PSjwhixS&D>~Q{D*D?{z+htue zN@1DI;Tn-X4|%UdT=h%LZ*FUQXeR(Ml+Igaorz*uP!@3!*F0fPCx^iEB=>6)$mT+s zLrx)mOvEgdk3*r-lupAdR$#Ezy@4`Y{J3NqB~|o$mvwJ2^FR3pWY2JFs8pt$J5|l0 z?nY~eV99a%Lp9==En<7v)nf;huj>Xp(cCCeapApuh-XFk0!D{fKQ?@rDf@qZiK8 z&IVgDA%py*=zf0k#}Sj;NKlS*HxSDa^dCn>-W;TVO-v4)=Ea=yw5`MDyr58udBYD? z58a*wl)c63_X{aT{>A*n)v}(ExvY?@o#>T})fs9|^OXls-TXZN^6izeWJ#*A?nRWO z8e(1SHN&}!*K^Zf9u)l zarHxt0(JylI-qb_|*{k$~OIbjjMD=ygYK>BQ~CjxQ| z6b0d(op%nBzktxJ2y!&&4s$*0%1I%@k}~r`-KX6rPAxIe>%6sP5sN{PYyObp_yIeD zV1-aGN|FXK!JJkX1XpE@5>M;HLT!xED7ufMBTs!Wz|<^GGKQ&8#EKhowx|sy@``yG zo00B0y+{1I7#uY^C$2>B=I@tB#iZZk_*lo7q_{Lk6!Bi8SMj zQLcUeMgin0T-vP&t2VBc0yKy!0|F7VUj$8iVX3>-@sCFIHa=wpPt%hfvoB?Jeg}U0 zbOQ?O1sb}A3C`ohaW%A-2hFZHm-nn6MTrPOPUMfhZvNec#kN#szpu2du(Leu{h-;?}z{IZ0BjgghH z!~c%T*~*(XivkF|mn4@hzL@pdpuNG$>*W0oY^_ zXiVzt3Jv-eI&Ag*aW@eJhUyM_k;L{_PC*vj6Ol%H<74IJFoj@z zoxF1eDt(lgqS_}CxkIx%U~(cnGHH-&b`h?<5h=QFu@~q4p)kpQ1b9&5-H5tOw7_7V zTTaLGHqZi*4&Xmew6eQhz+mq2ZO6+llmgJNMg385L)H&GqE0Aw*PlB=y}?0C zxt{2RzXvq!&DIL?VPLDr8Bk~?<3ns5JS0Rf=k0}Eh>tzg zF0R#|oginBi=#^BC;alS0vnNxQG|PST>Aud_#|~O%9Lz4O9wkh7Bj6kP4U9&6!)AM zLUWYHkN@_Uflu^!!cE^8F|~WaJwc9LA9OolY$m@<*@d4tjW2$1#^{nnAt`yKp1Mba z`UF6&sTcLwUv9RRo?rMDQt%gTbH@}z5JFG~`Cp8^V{|3jwk;ex zso1t{+qNsVZKGn_wr$(0m@9TFMpeG-clK@P?DOtx?Q3nV^=JK?V~ja_@1xH#!=8)a z*&AXRd1#(A7sTepzRin>nU94+1w{usA7|hHcI(Y~eev;zoF8rtr?tYzUDmDcS~D1z z^T31+b2>>-@IZ88gXMTyL6y(UsN@MDTGeiEuC1lq3Sm_$fSLfq^V z$G&6D1W2TZA9B@(ER|&mB`mn((4>VY_EAt*`dvZbIOY(RUl&!^h6(p`j6-B($JR#D zw}8!G8Vt_cx!q{(w@N6Umm1{63=r2Lm6=6?#yPDbnqq5Hk%md`)ml+{+YAP+@`K8n z1QKQ7o)b)-@@z5VJ6`Q97|Yr+Y?az8qp9p5@P=We4?e-Y*X7s~x-cvS7bV7;ZCxv;C5+5c=KDXM1*C_<>8GxeLPt|{8UH68^4CF(kN z5W}E#R$>4wfpizkvi43JId|)ar0>7?Qam7I+AvX2Mhl4du14#7aAV?1zH~O(jMI@yjwL$eXF$TS;Y#8g2vWm@` zP}{&3@I=1_t3Qe629{v8bBxy$I{)l6Aj6x&lg59PY2|5d(xv=?+yUWbyZZDFg(Bmg zn_ttHjsXXcwTT9Lv@fK@Z3fR>9AOg4HN|C^Vnd~olIcJCgn5ih^9MI|K(?!v@{uR? z1iI0^;sYaTDD{feb`^t6<7HwtyJgr14ylznZ4*OHv?OX=iVfP zMb<@%de|LCwN3_$>H&O;YDxbDDvjt+LxqKPl-qhgrf9^8isET4^2hgceUfcC)`GNx zFOxO-alyi{u4vGjRpGbIayq^#S(~v~LbuG*G5Si=RwV|tuHZFeBZj98N#niJXT>GB3dKIW55-||V#a~W)0R~;{?qLCq(Q8yh97jJjBdz34B z;#krawPBWqPo90c~R1)gc1r8wi9$bKq)k*I&cxK$xgdIr|+J_3DshG`A> z3B}5-A3j=F7`Q7)(icH_mPKPgJ8UGFW5S$iM?0`64RegdF4#ITOaX>4I+iaM1c1tk z&chC_HK&@ZbX=x5ow8czZ@h?V+MkA@sZvBw*$hS4Q%v1v70R)d3{ zp*%yGwv!7g%!ET;8AP>t67P{B5K)ASEm+N+B0{+vUMz?kzN&A9yJ#*(Tu4EbE#ym4ba1(#yBw!Y>-{Cq&DUrk!2J~-P^^JMa4Wy49merf$RFCwM!tMgozln992 z?=n$R-MP~{i{UQ^%_z6)a+a#*oJD=SOTNIL&C0>D2!0NJ4QM^?AQBV*yJuU|X zF${i;=%@?&SsvJ#Yo^hCBi)Rg=LL$w+2;}$RJkHf)gKp=z;`fgs=G}Mg!O$}pF`P8 zCCTSo)BSNEQF@*DZYdnwNL@vNoY@x8&E%VFm`dG_7!**PD5G^@f|kb~@2n>1g$KH$ zs>`_~2O!;&JCR)Q+TS@&S8=zbLWkKq5_TmMoJ*p+CXqv3&o!tj8AF#j1o z6;mfS%l~-I3;y2`eQfX*cSp*Ry5Uzgc61B@1 zl6W$m#2ilD&{U_q62bPVh2~J@d{KGmqf;cWUAmHoLU3&_W$k>7`DZhYM%t-80)GoP zx8v>m9S-})nKpc1+JL4<{SQ>tGBKi#V zbHMvd4Y%Flf$pZ9JiGYp_J5Q8KonqJ_(2dwB*0WJcIsaVz|#82n24I2ymiLPUAlt> z?PG1g>_Z;?K6PMk;-TN}XI+Tbm$V;H-IEUxLt)r|=Ke#t$$;}x6mj&D6exi65*6DA zbGB=8fmZO@1y?6+@`q?hz|=!-?1Ef=7^m@>f$41b;OmZWbsX$~zv-3#ueZ|JHkWR> zc@;NmG`V5urPUlPtjJ5dvnWwxI-H!9qmaY_lWGI!d#Vd=5?^+EFYn8%;2y9IY04}4 zVSt@r!#s3eWvuLBTokLOGdOvB zjKmTRRKc6kF_Hw$_@yKO)1joQO)B`)aBS>{L!v|EM0K7@mdszE#a;aQU*L&AjMyhopZ*6*{rV&P2<%VUBc++jymCLY`sXWvbh@HI*ifppEtW!=DB{Uy zp_CGe8O2raaJ-(ZF=4Kxggac^uCx>wx9HM``(oj|sM<|^WwFa(1T#h>PEpV=R!A@} zR2)M`B>&a>94C1RIpp4fC$#nJm%VR5zF#W2eh zJE}PyG%Lq(>s^koJ9#s~tz9$Ef2sC>y0E~-%{jScQPXCM`?;w@Yfvm-g4Ehe2-~bw zD5J`rz|zH$!;YfQn~W)GVa4~+ZuQjQD+D5Wt&a38)QEaWS} zvgf6AJHE15Y;0EdY%Dz9O6AxD+lKe07&;WRIl5V@)BDKk`iKM+0;BO=GR6SFjy2j- zzX56L`DqMAqMNsPPaI!7eUVE3?FNYVv~BBl9#jaZ0zMc z@sK?M;Z8a%D9Q_0za8#9IjT)xtN1D|1Sc~)XZGUeP>lSJd*A^~sAXy7wkG** zk(bzVh?U&OY=*|@*0Q?r)M|4n;Q7PbL+k}hU}NTb7Vj!4*m=HGNUaVj^to`IPjIjZ z&}0w?U41Mp&xk(fqnZNc;Nt@CqP`b^%RCi{LMYr4cI%PcUWMbsU4&oYF=2+|wCAJlP)@yjn9kk@n5HqI_Ln#F4 zG4S$@#1KF2!Aib1UD`{?vJv={-6c#qiN(QlIOk7>eFhKk6(4FoABb;+!vF;Sh!)&W z`DA0zJQ_~}$jH|E3W(-}qQ0lGUh_Jc6s^j8-E0=Km1XjVISG!GjVH-=u|6coMg@+H zGZR6AV2)Q)8WzbsuUk{z^-?3+*&Tew^u}m@L0s+97!G2yA&f7kAh||sR3CoOWL;!! z#EHvzVX{#Zqm0B~-DLhFe$q9fazbHmiuQ_T(rBu{`D&}iDwxxY*fx&FmSq#LZ*Iw0 z%;v=2f*R=^1KwRb430Ngy~&F*COI>VCpQC;ylI@0b4AS)xGIgiBoYIVJNX8m)5jvJ zQ6rMJWJ(Di%L6LCS{}x2S%e3lduB6$iryKo^6N)Wx)Wkl*N2R_!yyV;O>d%lh04LS zM#;uSs?{2lV@CU9XRUS@%exWY<^yZxcH>p@B#f!dYSXuS6GQo=uABiSZ^NV3rW8GF zMg&8?sqf=7;(kXE(G4p-wU)w#3vbsZQYs;mXzlf!_R9M?AL_N|T`H5CsQ2>jyxY~% zd6?hE6Fu$`fj*D*iaIMYu4J z%_O1rl)GY9U35y=EEXRQW3f}99Sr(SND><*O(RRN$x2WNN3R+O7qys$BnruwG_Yxr zTkvU$;htd4og)D|up58j4@dpYL$w+8N!s0xfU!HfuwIO&CVG5P@3ajr{$MpB^=9ob zwr`HHJ%Jot6_piP2dw>}o(Ou982g$OG##9)7%=QhY0WC zY6hH}(HRz@Ju>8n1u$K9^5Jb($w9sbwC9Wx4Cz$FwkomY$V)6jo?>zb$Ci9s#C}7x zErzOlxV@BpA|CZ4wFr2l9BI-^Hi?5+FWYuOf?pWvcEW;RnsK4u7CKqzapB*d>mupC z$J7&6SSWc=D}CYClNTtaIm7CV%q_D%Q*hzyk>jwy?^J@Fr`yo&)YB1kFPH9tMJw*8 zw{U_>WrWIuWGHFpo*N5S631}PX6O&CKNW_!k7MLbTbL<#JS|plQk!MLP-2CoW@Ee1 z_(9wR3|_p{0^{29&M1>LDA*SRY#(bz-Or|2bOs|SQ-Py!hjwc?nyOTNJ1)@>C7$Im zLSrR!J+~jPFwhQ~C&AUl1-IzrQD#~L$g{?q!@cg=MX5aF}4Wo!Q-6(kd#q(I8?uP+>(# z-Jrum_|r7-6VT+tGFRQ`m?oL?vAKuco&}&+t-@>P`WY$&nF9v-tw1Pp8C(~`N-v%a zLkK(#KlwG-_-bKNsYFgJOFhGU?p!y$cAy0?I4t)=9g(~SSf7qlDE;eM#QP2e0(aAv zj>f~v`HmVb9m-m?FgMxU_7CejuWM@2EqE?R8a>BSnp(iJu;&%!O6**c`SD>!EpOaM z*8U{VSdU~dF+(tl-Pm+6X9JBUTafETaLnxa8})9Ew6O?8PSM+O{m{I8aD}TQmF-c` z*@%xV1$MK=^?8c*1IVRXDwuOBm?KMBkB1wqoh#k?xI#fCYQ7!@H(2mC&zaD5DMxf} z(RXghnmh%AfNj}AU73>(?KA4zU!FV^`w0Tyb-_2+anE=@wivTNNV^v`IYM5jxk?D_ zTjK5#bfYad$UL_r1Dc>H`41)x}GwUQPt;K)9&bpxv%XjY6c*kfUHi_WM$ znyZvb^^(#O)P+K~hUUEQDu^HLqanms`rJek-oigZHA6ZI;$K^dr-$jP6n&rmLumg? z9Si(4RNnm};JRM~9Q(f+oU`+n#fp^mZ{n?NZT+Qy@g>)X9qhj5dfsYsKYq@;5dh*H zDFRn@7?XDgRdro zQ8|^ohiH7Ksfpx(v)^V@x zf?&MWt1-P!CKFT7ev{%wq>kZP#7sFmW^q!T4bL>>vXM*Ky}+L+CS+XWk~(x0(ghgD z%;wmnQ~auFY&{x56nzU$yZuberekH z|4a)-Cwn(b6H_NrRZoY%ZAGpLdNKe()UaKtzC;^s>))C+*KcYiH3n<2b;)`dErdT( z*rD`GZOciR5?IlGYeYuY!@h%lC{5+E#9V|*8_aUC+`MPAWSsQ%{Q-IjV?%-H#gyE) zMu_5;O;%%tUXjj8gI@qv;IzawWaF?@>2-WW1;p20b)lm-^b%xzhm_&l*ad+ z6Q<5&E{d9V8<{ct=UmZ~W7APQpZZhc;$|<-!<8HEM7~1jWhVMas-aiXU%pB+Wb}ImIo4+6Lb&FHxETsVYk)tRklm zqbq`X=hCIpTPp))e*ARUv>Yt zsU@yQen=28#2n=l3=oefEF=Mq${ryqCW;b49Yj3-dp&zlEUn2Tk3^pa4H^7fzX;J& zwj?SmPgl{6*>kTye;<&n1Aal&5@Hded58l|m3B%PqjvR(da-u8T4!?#bCtKSzkcQh zj4?|A&iYU~;&igoQ{a40=PcAtw@*sQfH2nUvW=5g&ktRhG!1lN^Fn1i{`6d56*j}I zYcB;3;WO6F@BN#Frt7MqKB@>Y-~0~dG5K&Ek3Y>r_IJ1EUbWFv_Y@MlOd@4mUh07M zLGXQk29zNPU+*Dnkz6aQpS*AoT$zdRWIgIph6W zD(0_x!1`xB{7(z=U+d+nI3+(Qh{~rTZEcMNCggB}z}Vmj5FZjoQ7;#Tdj}@xEN(7F zE%Gmk7#$8J*ptAzX{HptFuKm+a>jQ*{!5$eM|!e3rPLYEH!@lkT@j5LNWW8jK@urp z*?0fg$#FXCz<^~)bV12M1gO3-TQQlO$M6UH;YWjs^pf~GcBCVSdJIA06OG6-9_r_X zE9a!;<8M!LiFj^*&|>nrpx9f}7G66ASoPfPLjCj+t6EvovSRPTpdBo*kU`6NpXE~Z zfyAlD#bm^iruuUApq_he5p-z;M_?i+e{aM13nr40(J*^x!rDmUP|K31cNOQ` z^a1xSj0uyg6oe!-(|N40kA1^V}r|8+9Cg4Ixm-*l#qA4e@sgcr1N>Lu1Vpg>~;ZeyKKq5fNXSX|@ zM8@Zfr3fBC-WDOU=)gJ#OnKXzneR+nJ)hLs3jo>dU&Ep5ayTHc!NUg!;beDA)DP58 z7%;J7wI*vUkDaH6ZGw1Jad_A~U&RKTi|*tGtj7Qh7Gt|fp^*a{yKeZNW2-?KqG@X- zE2E#mn`5swM6RdZ-ssFFvBqq#E*;2M+cw?el+XKHy+z|7+`bE9g{lBAlmuNdB9whQ zE&f?^gWNKv02=7Y5gojnhW*RKm3;{U#M3!?NoI#S88T5 z_Ea~03%#rUIabAL3A-kSSqb~Ak+5AOOw28r*Z)H_ zwggAfX0-z2E^K#)HPzZ31-G6I*PgV?L{&Jhw_3TrWVpF;z8KjtRJL>hcdlDANVS`2 zdY|$(OYUBqm8C{M`E%0Db=!s3ahI`jhmIz|MN?>xOfvH#%?L9VL=eHX%t~b&JzRtp z?)TGe`1kTxj5Q+`2Vgg&6}+Kw(7E zdflen-N^Dg_UhCl^&XhBtZd`Y?N>)xy2TKhDTW7}5|!t-IUD%)R7^Ijyw(?X4Pq@3 z%SNJA!VWvzdWk?fq(X>pt6S*q4>%VA20}LAdCU3*Qjc)vByZMF32YQ`kA?gn*V;7E zFIQ;V-`iAT{$!4kM~<{%bK^#4UwBZ^hWo~b(bPKKjj9TVX0dHbZURS2Z-VIA{Nd7j zFsivu_8dUAZ=~p0|CNwla6oCk15|wQ;Wnm1IQr5hXA{FL<^Z5}6=M$}fnJ6)> z$mws@KTOW%i3&Z~K$|LEWb#s6piy|{;`mhEsHiaBPHQR_1d9L-K}H6(ASD8;)+-`5 zypF7Vx-zr5oM2M3sxi3W#}S;?afW$G==HmayY8KqQTGSp6|=1`aC6=hu@E)E_@=XO&+x~ zzkJq&`B4qb0O{vmYnFw46KU_plqDoqYB^TwL1ZD4C=p|9 z2rUlzrrcQ8SxM|&7?@B?RUhmWO6+y05{3M{oO4M)bnzWAz1V#D3+q!VbH^d@+t>eY z*jka3#S1fyE|({alcljGcg#Bo7TILw)W?jw0re7ZXbAv0#Kw*nV0pJuhX_VpayXai zdame(SH!S8pdn85a^|G2pkYQ_0|O6OH55@b!jfQi=EN%>!XWi=^L zaeJG;kh-|3i?PKQZa1^EF_m&L{oAh`qqOG!SuA#x9kP%MH6PSobsz~v{H=1HMH8owprdyh{|Fj@O=A75KtS_)mA%b#rItBoFQx@Za1vS&rT&c zZa6$|xDm7u>dIyhM%x7Dz6$2UPeMRIFR^Uju;Oh_IgH@Fd$Ck@C&VN0gAkf?<9!wS!G@rMCuMu|F>kSn^s*d94vwura5Md>t3q|Et8<{Ra|Mn6ur&U3G`uf5J@1izhcfCGS0 zU0DHYcua8A7n&qBtJt@l+;D7rF<>y<*bcOThL8NU#0r#AX%yhBI`my2@8Wft1nIAh zmUAZ(spf}?)@qlAf#?$IbWOZeRS0-Dy}s&#*%%ho>NaC+w(g6xt0tElyK$@G>VHmA zeh{?TOp)2KF7Ze`7@4ZWT;jLbaH;ELr>;OdcgiYQH8YE7ChhS;%FpQ4;|7Z8GfcgT zEm5DyEILkmPUY@yt@KWpx{Ym9*M+Nb?Nc7wYJjZAhbWHX!{}IMq+MgCRO~`En|rw< zQVr}CYB?YN%#R4QIuaR~(Qu+Mk|6I6mjOZQkY(Bi=Q5gW4A8mDLSK8A4dfm;EtEzC zi{V@n-9dLQW#^!%inejGlED?hQzWQcu4MT|CnJ~d+qLx@hAM)+nc|LIo~nu_V%q}g z)ayDsaXbiT0evR|2<++G#aS~Qp2lqHQBrsF5$eMzsXRaySpsc17cu4Q*^pB3Mw|@A z757ZBEnV$IX-yKF1h++m?GKmC*9EbcBB17{A~Y)Gb%5tHu~3%u-MY{m^xHT}SK|eu zRzui$XkK@}JbxC_Q4MT9A%EEMVC1^7YN4Cv6^;V!r3whRQbx?ZFi68fV=kJtjluJ)vCO)&O@mc4DFJ zH$gH$g#OYuBuxE{wXx0ZvE{74Jpr@ck1@|$7O2aNg*)%G6! zs8y-H89#!6xZ{I)34DJcnFWwPpP`dGX6ZPM0XWAmL7L#4RArdZ>SLG&33_K=vd3D( z(cUNcCc(M2Pky^39`?8U&*B6F%;g6DQHscL9us= zltLwP6jLs}8*^ivD)Y{AhVtSYj4!Ele%LbAnuS-{E}4wq4svZoKY)z(eeIhAB%biQ z0Jy`|=XrGfFLQyAE9PVk)P0(&xsJ*L>D*D3%AdQcAuR?hYYy=Pc= zfCM#WB38{6YJlJSy#{{_{vI&82PYK2LgbjhE~vNbPN>bRX@kQv$V0E}_k$K75naMP zUq96#O{ck@N7=0U_9Y?GM+Gyz)@R^gW-{gBGOcpA2I{h zmc}%vp>9{hwwb~@_@T)h&Ae}WTKJ}=g6E7bP<;znFA1OF`(5rDzpPrMxueCOclf-o zxpuiux=yb9{=Bz!0r5u*l-6S?P&7bt9Nk9a_L7D(P~6ex${cuhcmaKvQhHMBc+14? ztp$Xl_6FKZ-_db(Q-<50y|{twN*Utx(&Y7}4HEX&0U(|J6eNF8hNj&%#u8k-M8tlL zamwgV<*L%OORmXe>D#FXi_XxVv65Gl-E6f9^jOiatx*Rbjuss3+|jI|(;?%hzuivp zDluULcbnE{Tb;f@QESr8NLL?}0?vWBbm}3mU;6CbldeGYZ`Y;a83QBESdal(sPKva zdNZG5qv_MuYs|bqRt`M&uS`n8TCo|Dpu$LO0{I%67D>TW7bI3vlBW3O#+ zn6=z^gsL46$x^hR?`kE-aiL~u`QX?$d#79>#dcmSug9PbAC6;#S643E{2X!>zvJ4Z z>g4KXE<7V$Lg%tmi&5lHiGuuRAU0C|34}{fXN(4|k87p^w%GgBdW4v!g>(!ItKbQm zR8B+4iEOdldCSP%i1!Vj@dgE}eZK2W6R0m`gB-ryG9^4?_-ml7DNaqcr8YU-Df%FkK zXgjtnmB0->@N0Sug;*=BiOdB0O)`+ki&pLxjlPxJ_?8Y|Q?pBHGnGz_CoXlbRCijswIi?j+shfzEo)?nS$ER% zRP1~5({f;q8!Y!Tio@adzr*7WL&D(>Lb`UF?YVyFjxoS}AeX_*9vFi5C02b0usU!1 zD!P1(_T#+N1gfO7$EOWR+$sf%;5qWpJSz9fcXD7qmKvvQY$x?N+;73Hp3l~AFD7s@ zV0+-^vEA~}HhK(5%f#&BP!<*gzCqOP&&WsXFYm}d+vMCM==Lexbgvhiy!h#f>;=-J z<*IzAJyV>7vAHlpiL&E)EJY)95Sk?C5ut1M+W6o?P*E}2f#!NMqORVIRZGd~TxVU4 zdW7gmd*ndnIGxBqOd$3z)U4w&>oD8Bh*q)R?UBUje$%!g(EAa4J7vPqPN4K>oYxOW zjO=w;_D@9y>LKqS8npBkZ5}^-42=P$HzYBRCr&0VvDO`Xq0^7w5e#gHoYz9x#wnW& zBoT9lG!YG;G;4C}n7f#@MA3kHr?i2PlS6bmQBH#EBhsv-D&JpX*X##v1@0dFqW=Bb zKTfPaQoCjaSI-`$LXFlQ4-4XHuzD3~GBD+c-s8hBsq@%o-)};v!%YNSV&}pLJ!2(v zHJ~8$qHMw5)ehF>UOV3MPuzw1f}iY3p42yebfLdLl&~CUM!|cjO~lkysp_2 zNEqMt1zi}&)G)Sc;ha5c@8U(4llVjcSkO9=%5S^SGo#9kIlF&G(m84KBA@g=q$kF9 zEHY7*MAQJJx#>$pdM{<~n{W@5NQWKaexR(;$s1{A4+7s|%15$rl9(l6m@`rQ@(|7z zk<#stOb@1m@le(smUDz=_%TJ@mFEO_h)gy(i``F}9s#o3Q>tZ6T^?|(CFYd6LOI{c zE-;B~#KgH{nv~FF^0!+r0`2gP_Exh~DlDNq0nSMM@Gz;4pNX+IxFGLnoq9f?8Xkrx z9a%cX;6VFX-Bl-74m`crY%~UhG~?tB=gV1D|F&@0HJ{x@koku&Q{%_6TA^o*h5qN~ z!mWSr2s6Pe2O}b3--`^#E6=npVSygY*r{M{^D@txo9Fuz&)QvFK#l+VtZ^kgXNmNh zC*`psl;p7^6Jf`&**euLT$f;(Nr6oGs&zh;g26)69#Y*qX~vJ74*25TOE^KEJy^nZ z1VU&O8DNg?B2YV8-McN?R;%9#5DX{R1{(Z4z4oA89M(N*>~dGUi5uV#*3NwAmtHAV zraQFQj;A)hM}j$Z2e3qP@~~m8sLCgl)ZH>68hRWYcbEEZM{?yiaL~Wg9;wJ@nO|`kW{^BipEYj;XaN!qla) z1FO(JFGNP%lHDwjmr{{jIxwcv1jFDD_(qnSfeOAk)A6~>m0foervOy8HZ?RVj)2ad zvhGxWWe`3P`69`vsx86~@Eb1*+?6uIf}h2_#QIjYJe@ryNsa**{&>`IBuzqidDN~j zX(S_F$cN`D<}=q-pwD`J$GF#^`dVl~rrYV1|1VaM-cI}L=!pt=C_I$sXu7&69*XK)R5hG zflvV~k`|oEJ_w0Zp;d4lR4)B6YKJG?oi%(PZ_cpSszRn!SU6wmDbs{QbByk1d1Kxr zB?AbzvUPgwGI8($@?;bnzvoI*4+kbg-)%I#8|%CrB)Z_+n{>nL_m6gE-4&IV|A4=L z1z@yNAj#t^0P|k~Apd6o)XdWEKdz*PCd$ZwG9ivpxVhR|w^;eA z)O59?-h#dq3~PzeOa+C@G55XB(PTZxt#SZy zhS?IZ`>y>e7|7p}z`;i1DL@O}7}#I=5$8$Rfem469)g|AsL87)&68_2>(GyKh6x0! za0i8@TD=63CC-CqC1qva-q^ryH`pyo4mozM5GTTrN&X)5pUc4)J0Vwy0N2#J(|BGos5FC154wDOmU_1G@7^kv5Mr< zj#XGhy<|*}LS3I$$CHLx;FObwDRt?JpLqi3cHcthLRx}C_57K@+Jd?d3;p}&w%o}t z?wL$+UPvT(>_hpfd~PYPO&mi>_wFPeb0_fkXuoY#UvMutu{g5;%SN+tYRy~dX=I>{ zC@l#p*hwwMH1HJK^tmAL@;?FebSm{PE%XD-S6MEV3Em~JaE53<4ft9R&+G4?|4m)~ zik*i4c?R%T>_)%76#qYB=lri?3QdsvD|lhM6*@(aRbENNegR?(^tpV{>WI~;SJaXU zXUwU|HmxpABY)Vw{Q>e%=F}U|NB0^(gukEW$vAvJxrgm%LqL5(&4hUmd6V4?ffrI?nDtQN2oV>cDTUs}p%JT*rtZ^zK}0AT^i29yH8C^) ztHwEFl}wP6+B;OeOR4-5#jv`J97D}u{Ni97^Y>6(ZC%dI|Fy0V)mG39x z4+QNBjEouq9)x#*^MXG7xCTR(Tqv33eY52~+hP9k`=o3R==vZQ7>|P@|3DpA%|#V{ zSurk74X+JrSrQC1Y(zY-?;!kV08cF%4E`El71gJqsA zm5R+LOOi`TB^Q0A{3HbK-hA)+O{p?X49-hqJlU{9`S)(nMu3D{oZ-{A9v)&iPmOAg z?~Ihe^;3+lKiRHm^btB_8cUNrr;hYjy>`xEd8A8!%M0kA*2#oLOBgxx;Xff0Bul$y z4OqMl^`q;^cQ<9&wW7ymjT_I1BA}2TE1IRhm!WXeqG;4x9AK+sqR+AjAum~@j*=~g z7cZ`Ynw&~hqox?{fk>uR%L^BA#)0IBRoYC*_m}&ERjmjR-pfCwoOVNn&O(N?3rT)+ zjA+a##!*R!FkuyOfB2C;a)i2+$d$jcLvrs1mX=}G6c)^EPxpM@cE9F3 z$$jqq{Nn_*hn{+HI;JbY>^N;KB=K|i#O3gJOa2fdrdx{fgqaps?MiE2Y9z=(VE>-g zrW>E7x9R$2`Dxs9itNGBoI6MZPpYja4anKFwn%S+xXOmB@scxbS1<2(^dHr&*3yJ6 zX6sf(OO@2-GU{2=(bX+-$Wn`r1mq+;u}3h|U_EXzsm+;TRmH~Fm=}|-rg|xnI+K=k zu%bG4+m)}rv$t>Ii!AP7qbw9Wp>(MyG})0hXDB7^?sAWlfaz*<^uELZahSjceLAT8 z*@Y|pL#D@0lB{ciT;59d(OHf7| z!9f+WI(PGKFe5!}nBPEYknk)%V{N?Q8{uekJi{y1RMp5HAqWul#Aj*q3O;}qCS2>t zUH*P8an(XNEshR33>CaIK5k9-9o!~|P&!^`f$@lyDK|jhOgGLRixS*JE+N5xCn0ZXwjFCNJQ zGNJa#J~hXxt6=-+Er+(1JX1?_*rutS2=rWJz3$A4QHxDhp}7cKz>4@yn5ZbtS_pQ zPN(a40iw=e(*~hx#8@HcyIev;3tVMx4j;*i`XY?yP>Zkqy_QsreO6V?}WA zI7;^3e);OA<@j6Y5{HJPiA3JE)!n4HHoxMx;T zByWdi9UeK&?hrMHMV%!bbH+$~W?6pG8>9Oxq)|&Cmi$tX^f9OBpFC;i(l(!jXe{4n zx}JrvLwSPkuXe#QR5x#zcIXLcB6*?qf7GgcAVJ=Z4O}9Bi3N5E!w?S$8gjBr{s5IB zd)!skGA9_^;1%?m!dCSYnZ(wlflYbeCH!7VtII8HMNo0L2P=d7@w<$TF&;~pLINCP z0^udTK_}WzG>V^mmHf(L0Zwc*Z;yB*n_p}ePvnwWN{;E1HGq;f;(p z3br~`DDV}$C>Mnn88K#>F2!HyjYh8XgJm%btrCm6@tLV8Mxf;zk7odBhCsc=tmLzy zaonl*TuzYdSvugWC(U#s%(F?;_}mWeW74ja_aIZn51%%re+$YMHM z&toO40dz`LF*Gq?Qf*=-#KmE(l~`Pz7QA75!?9l2cn>Ia-qz|@E+|Jnw<1a^8(tRo zS)b?ZyN{3iBboqfO_unvP-0bGRtM-bS6wDW5j}}up_6Sp%EBLpohtx_*Dpy}Z*D`f ziUV^p0ZQ+>MGUhe@YCd-9<*!D!HMOzDE-|r%Nw*{=F{u`b#J6?7w$Ey_Ga_~&bb8; z@W>wAiRA)5q&oFDG9=VTGN`w6SFUUc&fapc9RE{GDF!d?k}hVEctB*6E9g41UO_&_ z7s(#CB%@{}Zm#Ij(}w4>xlQ7Zvjh3DkOeDlzb0yCs_%_&Lt229VIhfs*Hf3M|>}YIw>!m&-OF=dFPed9sjGv@#abLMR?Ri zGokX{|3B=7f1zS*%=IgoFJ1xjm1h6NE&fKuD*p!@|5vv&G+s^~L8!OrOf)(K9p}p zb_$_Rwsc~9vX?@nJsl)BBKpNrl&d6JS1|TA-v$Le0i_Y7wx|BNP(Sa$Lq<`t_%Hrbomi(8+;i)RS%BGPU4(pKKYO& z5x8nm5Jx92-_CUS!ph3{xZ#hOxsozt^{(p;F2x@>P*ewW6L4uE|}E z8|{2GtEJm?yKnQ0%|I(BE%tAD$PJc1oN(HYP(dv1JIJA3cD1vFl(+MeR_2K|l`rBd zu+(5!;fna#P^df36$y{QL2#%S>sWCNOq_?4d)4#qrLC41@Lr@BgAI{kbsT4dLgi70 z&}WTB|3A9kDKO7{+a7Lg>y2&Owrx9UY}>ZcIE`&Iwr!_z(llz&w+*v{;4nT|OhjX$0*4kKF%DPEwH5=14c!GEEB&ev z?#&w3y?|Y^liv9_hg1t(p3R37H^rZ*V9fqh6ds$mV4XtjEpBkATMpt#t9H$Lh0}X3 z#rj&I^>+@)J{9-@N1f7yaV$riB~D2df%@_umqLsM9>&;(9)4@%QtlB3)A!;6gH55o zaT>5_qf$0JwJDpk5tT&@gfF9l4I9+>-e4vp<{gaX=!m?=t^|}OVnmTcEq6CbzBs`%-$b2@ggE3S zzVq>1zL9WD4aPDODI86rx>=t$F*$u%=YJeQyJvmz98ww|XN~ zrp;*1NaEKvzY-Ba?>8nEWy)2(N}38|D?pk3fuEE3@*fb{U#aj{{kSeAFb($qpVd~? z&E&JW>3=*tKNVRARAm4^7NAUACo%n?7-{!s;}Cn ztVg+pI)>$ecx0n}A-!75F1qV<R zBB)utr+HRQZBns$hqrObcx>u2{s~Oi$V-Ek9+GWf?|fP4F*qRj#yUZV=vusf>%LT| z@(jUOcH5(9Y(2^-2ZbvRf-d`OiSjT4P$-39QLDeKZzG^Qbp&SxLc=ofK9d93{)ot`S+up_L~byn;yJgsi^a683hnrS2wPRcQ7 zX;s^}GgNtpF1Ijo1i8>ndJ<*Cp1kqULwF|ms>m^^N!Lx1?NG$B1Jl8v^8+A?*qCS^ zk3KiD+9n2JCBME?GAF^hUb+!ed{d`gZo=zec8~5=N}yHAsQK=QO-s8p3-E;ZFg8`J zTrYP_8{4)4jz$r27#fp(jZM#2-WL;z+Wl8$frPK!eRA;iGW0KaJE)8uue}q zLi22QNXxSDny3Jg412A$p>`lBFp?G(F#J)Fj}40%HbfV1xMrCZ2Kv9q>O9;q@!N2pG= zt(lf7*$PTmGoF<8vp~mizZAg6rstcXiVwr6MH|zv8fYuGauOz20`TQ)B{b&N&4in@ zNe)_1JT*p~#_w;((}O1JX?li%78q5Q%Wa4d1Kd@{8B2}(9W0*ikJfbp!3OtXO!&f> z9$L;b02Fvr38TvZ0|};ZTu`(;w;JvDR292&wC?C==L|na3Dog`cBe-Ig`eZ}0y25C zNXYH6_V$eLF6&CjAN@sy#~Z4b4R+ry^7F2CK%;2b?Ccue@IRy?E}?-zzL zoGX(*pgsh|1%hnaXFl(5E6cuxq@&E=Yo0pr&*zi&f3G0*6VS`5rBS(R?m*=)jWo$! z;M25!@k{wrGmE@?3H%Betm;6mZ=!!3LBxz*&Ho*yZYr{WL09kgynagM^q680YC=Qq zIu*Y_!3hhOp+VwMa{8iys224Ve5>kE9$W?kJnu6YMR*tmNfd=d+dH`C2%!nz(+ty+ z2G-NRXm1_{Pp>zMhM!{h-Jwxp-HAfku&}@YaKZ!R3=A$#VKG&DdT>U$#lxn-HfSJn zEK=gj3jm&z$@8*odo6GBJn~8OtaBZCOTif)YY35MYGUYb4!HJ5r@b5X# z>kq~ECT4m4f;G6EZYhPl0-F=*W6EW*+9h)HUfXlmoRwZRtzW;>nng|LKui>?aCq}d zjMJRCh5Pq6r`1-9sjn{S6p{h3T6EGr!(&XHLqe>`hg9a6LswgCXt<)sP;U6ZrtmJJ zAH-2ojcKaah(s0A?r1!*%wtw?UP+7ADDjWtNr|(sEFk?fuQ7s2T%F4BqO?N__@m5@3ga>1go-yBQDgG~~!N@@zbi03LgA`d?a==Z{I zW15=3U94Y;U$N74*iU($Al6B!4~b2b`4M!aW5Sq~qh{ zWE&%kBFbmmU*DmGS+KOu<9i& zNv*MP*Mx_ZL+VfxcZ7ak6Z}Fj*~w*&abcV1hA8WsGmG z^>q&ee%?G`JBs(WU2bvK-TvH(%S%h{GR?RH^i`kavah%mvH1EnY>|vJq2!i~PHS(} zr~HMLHmi%-?AF?LFN|!R;Gg2BHFNvAik%lYSPn$CCn;wMVVXLtkKNXG#vUisL7hMT zkj3{dSxjaGJ{4$SUZ?)Yr}Fo-{%2~B`+L=J$mPUbW-m&}CsU9rLO>4LDonH#tOi|g zl`KAFaS)pwg@x_J6DT_y1&*|x?^3skAdVhaflGo1ymC3=ix)qo zZG~|QzYH9;PcZKA%w#05Oxu9ZJ{nyrse=~3v@P#9$R_Ft=me`x9g1@aG5t3+XB0L>j-DdVO6|xqX4Ko;*&qeC#Z0jqH%g z{Fz*#Zg6eqc?Ssu-b${`zy z&4eM9IM6H`Q%NSg&)KvVRWeH77D~OIsiBF5n7Q7}xDXW#mG)Z@#``DUgEjeL8S9MK zo>`BX^4GiFwwq7(h1sD&w9|m>dM$1CX&E#O_LEMI3t(Tl>C!4i*OWl;fjLYg z^NA3oh9;3FAJ4Z^UqkmL?}}jyck^PC7REeY5Y$xKgK|LOMww)ZBiMsn zC=JQN?zB*}@~)Zkgxpd!b8=~IDJQL?KqVw0;!b0A8qjx|tr!r&Nb&9+7)*^nPvQOX2FM#4o?J>;Eb$QN(d(nMLYKx>37IBC&i1kN& zX1>%NaoX@brZw>pAZ@6LgKbEdYf;YfIViSLp=7t~b|5e68sFk*a#PtMSs$(D-=C2f zDwLbTe*9AUHBsJwfFi*hJ+gvTz-;g^e%+P@aoLPUupl5(O6@TTAU`xC;YhFIIRY_T zY%U8$nu39?w}+O#j=_|Uh7BMi=&VcOz$v@_}Ka-oE>bO1d8ol~4*3M*v zON>|ulPGk!L39e|Q5=>C8&!w}d@QQLdL3=uG&756h$5)nQAlKK00yQ|j|3bwW(cG| zO>l33^9O{Gn~zkmDc97+b=y*v=Jwsg$*AHd_dP98n4=BkL3eX^vU;?x)OGw(f|huy zCe18Ar%S9z!=?}+?^>bJwN$^s8Fjn1Tw3t_!*nEAvfM`9r=zbxNP=VY7LRAT;NTbN1>4HB-n4rqx8a6C1*%DYhCy6+myTyv!!?a@|^VdBdlq=5-4u3W(%m&2|-9>J+8N(Z)3AxWd=r%9<000In#3K z6~p#3xtM{z|+-jzb(u~;6>(9EtU5q^PN%AtH7Zl(SpO}aTytN)4@qs zM;;c0i2@oO0ZZSW0;09KqW$4?>z73^MQecc%tm(H&+9wYV3ObWjst1P`L(};VQXef z%hYr5XBk%N3e=fdIh-~Vb*#^})+>= zG7hk(J%36X?-eC8?G3q=psXvqGU9QJeq`HVk{ENUE-bH74sWsj)T3$_26+S1&&WFZ z3%9!s;upjQOt2x@FLH$5LgiL)y{jcPlxv@Ptk!WS^#-f&^dxmB{iYjU;$R%n#l%Db zP}L5~wo~jFy!6rXjTcBUUsx37nUejGRNYRTAL^Y->YgAV8(|w1z2cbe3FfiIraL0S zGk-t$DYw}ld}5#ZuF}gB?ub9QbrW8PZMH@pHoX=JQZqHy%|g0X@=VS=_A5{$Jb~rt ziKRPGmX}Qv-a*pbKQQnI6F*ZZ;EdVImWh_t>Y_iE`;ReI+PpRm^g2qQxvZm@p|)mociWY#c!mZGdac$T*gzm;jEd|eqBcI zea0Un*mZ9(=Pol0!bt;t`3XAmIh1wp>z|n77n!Zb#BZH&ivS7435rEl8U2dI zzv#kKxX2@5f+8JOtMdEiIPYjzt?fmZDd;AikQEDvt{(7EJ{=|#p7L*=*$n&1sm$kH0`XnIF2n$$j!EF^< z?LOSdz*#2m>NTQQ2b|^CrAdvGFkcTA>}TN9MBk`9Rr`>t6+a(>Mm#N6KYIn4eI|4u z6W{-lb9e&R%&_?`Vszn1(^J=wRC$~+0qS@2%XR*d&t^SeE`Yv3v&TFre>?uH>9^lt zC2|#K`dkQUdW2$}qeuX!f;*&0O9Ejtk`ECdX#P7+SAN~p z6lR?_S^dlXU&JJMmd1N{G5MB3-09x}4I~6%Cz#5Sl&bvkNFwzR980O!JfUB~Y{uSD zAab^$9Um5>E=O)o)BB=qNesKIq67`UZBZ}@J@#Q3^vcMKgEH(M@(QM|!Xxds+X9C3e?QBQtEQVmEW*#rRix6h zo{D?OGnIU&lcb|MFgIv`Im>gAC;2X>=ns7^y!;cp(S`jzRFHnD!yL=EpT9|miaSUP z%V54nunce4Ej>*0iGxj8U2Z zj9LzGDmfs8g$jT6fw$gAoy)-#4-!5f!kyQDjxq59pvI?sCT&(_=0PBiA~j+{--rWj zm&}QdF^gOym(Ax-Tm>J8dmxX;T?)OH1p8QDl{y+FuTU3t#TRFeIEhH)SaSsl2<2G` zk)%;-bBUa!0H7z)tuj33w=AtT>3?Q|T4EH=!$ZShLn6t?Un&~#k!hC~MhqT(LB}uj zQ>6${t2yYPA;J!XUsrF$ZqzlaGMlNly~96vfjZr2{kh}rS;yO5gLvZ?@nkV;gX@!P z0If9uuHlH#<`iN^bx5%C;}ZeF0YrOt<+pXOi#Sf^qMgj~1eBRJ6xhs}fQWZkWjo#v zgqJt)G<%NhiDM5GzmC-r0b}|XdUg^&v4IV{fihk3MJ`c5@vCqw3Pl*cgSCtJvycjA zu^_tcHe=#0g;HbbwKj&^^?x*Se}Rx&i=yXb!065a)|!7FR{!QDDY)60m^=SxWd9Ei zS$E}H(0UK1qo$-L_EM;}3e8YS5e5p^0&uT;D9y9r0b^AiSlHbsbX?4ApQ9McYgz{-|>5z={VVPIr;tO_m1C(#;4FX^cnQ2!QwzTvpR<=yuqx9F7YXIwKpN{V5Msijz+A z3h9OZxF?-HCrxkAE=4mr@3|cS*O|^(zj8XR>ZNfdJ6Zc8<9%iCruf`@`F5;i5RhUL zKf|S>-*-A$u#KTbXK+o>W|tlxStMc*P`$Bmre>Jivg{U+Vm>Xi_!*tP~^GslB6(d`7jr`^K>tRH6CmTf4#bcqu4EmM@_8gk}0 zlO;0Pudvncqru7TVVj^Ai*uc5U*ms%w*Sa{ebT24U9@PZ{m{1ehVg~Q$9N+ZZW~tl zeIQAAOOEZ!8rUa4Wt7g`PZw+x`7?h2Z#jViLPPp()lXK+;QypPnHZi2(D7GJF0rw!Gz!t^JPCa|TLV z$5t?Ub&7F1r&XsA&joq0Cf6o01~6$lRe=HC44(8|a{|Py+PA=45XfO#(xC`6MVIW_ z@pUBXACJj(_hKY*7+dqb*XO-Hf3g_jIan*jfnoL;*wXxQ`TRHD{l6>CKZgh4Vp9># z7@ePR(cLN!wkQ(mN7RBs6^7y0Jv4S<;bJ~iw?id?P2wwbOUU6kr~QQ*IK58e#jp{m zD7Ye8w2x3(taqq~sa254K`H1(hii|Uj+0y;>Ro?7olkRdRWP=Fw_GM%Nqy4yr(76f z3Kv`{LX0oL8NGY199((JP6|W^f?3HtGjL=MlimF0vZI8?QhfkNytBs)y4jTczTST6 zizN0GT3vT)PBQ*knz0#k@*dFXd{?_FHVXaOTCQTS42U6ikta>O**3g@DH{37(-=Yz z1%CP7HwNU3Cj3pxxcsG$eRYXiGw!gh`kM`fLQZ}Okl$%AjdnQA_+F-+d<@$tHr+!~ zlSbrX%Y9!aJ{#Y82no^pKm^g-2t$)?4d ztlJ1W++6wb;23CbM9TnRnyWr63X(m=TI&wi0rTnS=c%uaI%_u}3aJhvJ;hx6)=8!I z-X>-=`!UioklT4>qpd&TR%ZyyG_J{OPzT?N)p#vFJb5sMtX$eJEa$I;FIPkE=fazUk5q^-g z5_O5(o~vB1i~Ov9r6=jW&#p6VJ38+rW{DD~_Ql5J`bn{-lISorJ`@3oR+R!k%S4kj z1jg21MxA0M9yK+28XUql%dLjqa7dPB_S@ezSqhgLzfZWd*GJlqvr6R>^Mn;awc_MF z4D@YIkM$0sK@;R`%5o^YQB75~WVUF0YO2@?)7uOYg~hP>tGILkIDSHuz@Ro?#oex+ ziO~V_GR#g}idUCOUk?)Y{Z|hn?F%fk8KU`HJV$yo16VNupjoXRVNVGj{u2jUQ&r}-B{5{%NVY; zX_l^nJT`tYn*Ta(-X28Eq?%P|Y`URGb{4T7FFQcQ@rqvm0LA|RYTF7X(mO99)zgewf zv$k@kp}JK|n{Ex#jchqHAsVF3mK$USdy~H{75)ijl$dc++`dqj4|aXm6{C%twaS&EFZB4)zLEKfo)ijqkHytPDqmj4F(eCil6a%Dpy z56u9AynclKE0X?t(VeGraFL!J&EUg2d)LOjMSkZIx}w!mM<%x(N);4Ya+ z`^w;(V=zOtj@bS3e3)x*9|t5_qv3rMt|#9Raq{w0Kk93@q*+?YRTrz`$;)^8sR{FE zC?S=wR+%ON791fLbDrN_-z2ohSyus~XUmrmLz>^LgLaunf4~c0?n5f#4sy_uK>jKx zACf-EOHVRt+mo=5vl3)MVxnN#Wm0_$Hj=)u3=mm;v7P{b5l|{;wIgf$-bLT|7`}{( zpK!QT<|pYRU?;HG=PaUR@nG<#o|ksjsE7?3X$ zEc2eub`}PBVY{D((<2fa#Lzt&q(y>!1ne*V;F{(}h(-XK4UG{x{mA~>lx=4j=ffxGLkhJs`JUU0Tiw&(-GVORQ*p(db zzG5nQj_p*iJg<4Cf;KalUg;yTaN z;#&Heaz7I{%@oXZjXltct@at7a`87C`Sq(s8WxKOwn(d?ITtgu z1t5LXA;&<7_?0SD@!C?2wCR+Zg~~m|*p^Vei9ibhMYct4t4vf3)`2;fH#d>Sz)Ibd zw7_1~v(klNl0BOC_j^>YOD$@l`JI2JGE9_cS~Aa@|6=tk)ROl4+Ckcku*mhu$~%L* zaQJEV<~_|@8M!O=ncGKlC7<8;dmj zbS>^mqprTe>i9NPtg##T((pG1$LCAv({n*!EOPG-g4pp$rxb&~=6f!KLnswTH$5Yo zx$x$>%OVSVwf&>0CN~lMhiVFXC9C)fXfYfm5w$H6KcQfgmQ$wA%#{p}5r00*{jJuS zd6v-~fqt5hSnvuzXY2?{-DrAWx<{s_lj3?WAexW;liDnzvBT0xa3T}NTe9>Cav*b< ztY(BqnJdO6P%m#3;=qXPqDsHk=C_`VPl8RPqtPvN{^}2&{pidRM5I>`;t9CRqvXO9 zB@Dj)vn`iUYy*?8sUH~oO1wD%kTrR-5}hEL-XMdeZ>nOJB8#78^4ZV=2->ouGI7|0*u_s+!;iH(}h%jD}h$QI1wiK!oA6glw%J4E?K~&3hg$wBf z2@2^Q48ZDX1;Nq&kmRCpGKOHN?hCtOv(6I(6%dF2GJnn>eb0ThR$>*;cWsQLj;=Jw zN7qTH+uS9QWSHC*PjRhEj@UXb5Ev6-Mpzg$`onDTTY;c|v_dikM;Mu42z(#sUe=`< z5kqUdQ#oCuH#cTJWwtp8xC;mv8h~7yE{dbrAgS8U($Nttf{7PErT40h!fEs-@6KV92j4S>1QJs$Q`@Gh9At0i9=~cSV z4ubRKO|p5Rf+aNXU2ZFyml2ibJ{FxP(>o+LTt!l#KVA$+4yNYO@T7xHLat=DgQ7je ztQO3xsIhf<_n>FWFg(V5;4wh;*U5SlRVamySsjioansCs7cX zGzpq^)Qq=jy%9ephX9u$5X7qw?7aWQHvt}@7!G?VealJ@|Fk{zJR9)J;Nt)B+X>zX z(}ft&jyu3l22a*AnHrSpQHCG~2hTOZVeY289&f$emYxqCX&y9Ir0$`o?a^l5Qh0CK z^-4(C^Mw;47-_2W%mP9J?K#?)5{ZS~T7xy=>CyI>3vS#lsIRD{9K6V@sdfdYCAg8( zyl`U5Xom(>1~u`?onbxK>ZQ(M9u?SuRgDIk~kGPF8 z;SEF7sShIJ82Vp;6cd_!n3HJGLWC+~EcKatyr|sM{9B&E$b#KIIRN$+7NAo|2tb;N z(Y~?W&t$(>CiLbjne%N`%>Kk}@g>>WrT6E&SYym1LxOPxlG2GP*cf8Z=^^$(4OB(} za~X?&@swHC#Xfef48E}Moe$(Mgy;2$t>j^I3DOz{coXO!#l}PJqV+5rI}d4HV0`7O zyYo%nk$c%Iav#C9>@Bu@es2&B6|TP5&_RlGVADw1TyIa3HqL<1vtvg%?{Kmp^Y0p2 z`ozzCtQVo43N(z45V-Ae@^UN+#*^iov)2MM2@RD=2LN+JQ!y6&iA8{9t`!ezdpwLg z+|5n%cwKW`WSPIn$7RwZ9t;O>{Qc{N!Tj=S=m!6>OfwkDFuls1UdQ3A{QDov%azmR zbZKBj!bAU`Q3=$J{C89WTLD!(pvaQFARv=Xlng#pGIkzd83==eK{^B=M~>n{g;bLA zy^qBzb1I9F!-o0XkQX6ve&n{@7hMd2AK5cy1e9{ z@b9kv-pu>r0OAQ>H|#_>!$uTzlIkgdh$hOM8)ph2J>SnoWu#)R9P%PJh&84QzXeb% zEta5SnY2?C_$*){-+_J?nK!rx&mK*`Y`d)TBj2QcjQiRo9P~TCn#v+De4rB&iHNdjPao6T* zQ6HO`Z_Hqno*T|IrA+(##v>wp+jDHKJvYg3rhOJsa?#O{$!+vkej(kb*HJm^0n*@y zn(yDLJ6rN)s(dnR1r3p{Hkr@b@A-U`5i6nhe{fFh1_yqpA7UB~QWFQUS#mQs|7zuv zZ?+ne@j077Jvk3z8%o5(aNZs3wb6gr2@L7RqrH_gZ&35jdHrMns;!owOrfT|S2cOr zzURm(H@&A;i0vp1qiYN#xuTLLrGq@{DFpZYcxwUkCvR@|4^U2Z!}=Z(Xh6n@`cTtx znv6j_7i{hbJ#>7PFI?W3j+O9&2rHsi<_J7YvkxQll#VAdlC~!dqi*J4cO!##d#q;a zLuFs#$99y^Xb&eU_mf3*Sh?fE05#uW%SyO8SSe^nJ^wy@s}N$&v&njz$9Sua+jNVO zW7>1$#b&$@RvbRMx)qt!!XDDaXlE+Q;NfCLQpR>@-V>|R+ z6xmnMoE3foW~VUELiEByJl zdrW5^J63ATK>gS1K4m_!BvW@ zrKse*xp}EY0rmp+=~+NBuoqvMaq$igm2>Ib+n$tpN7fNtXqQM@6%K2sIXtrgu^9GO zVkX}xLi`&>)Uz7~Gb@l5t#|lIm*N!vD2s&R8|6ImU_a{|wsR4)ZCe1ohM6_t<@XH_ zb-jz&4J$7EF-xah9tA^2&UE3|fd6hsXy%gqWq=b2IdCHRLqz*;gi7&05YRByzu5MF zC85Yr=;#7yVe*MgD4ZyVC>{0#FgQY1VaypiTN5m6xrOZOU#(jO?~vPC$0K2M^`D1m zs!Cih7#+_>Xf)qL=WllGMWdi0{0L9-eR@avpMQMhczp`t!V3$x1@Fp6={G{>zKkyr zhkO#N=ZyASV~hX;Epu3<$?y9fAW>d@u`+Et>^z}8+xmG}rL~}p*#aJ>`t~y0G;Q=M z`=ostj&u<8ptKT zpLI+tT(`={b#L>5+Bj`AbBPVfZ4zp2vJpQ3+gq}z__pj4zb4$U)q6o-SsIy*zXDN` zUOx`db@WZ**E47pgU-%bW9#fxuc59?k2G~;!2bBWT3eyc+ z!zx{K6F11GCi5zuEPhUAbFANct-Q?Sc`wI_FM85#W?rRzM*LYtkfM;_MG$QUv>TLo zXV$WNTMF7_;VoQL$c74<@XF2g$0l5%g@Bht@#-z-R#PB2(Oq7B?Uvk640ioupFQqRo=xNOTueuM-r z+x#JNvXC4f25+a{Ses?{JSp;NmGQiRb4M`!xPuw$TBXZG%}) zk$gcFvt~QQ&K5$b%C`9vnf@i5C1u}twgPcZ>Sgq^R>p5q8u}QgcR)TeF1#A z*KUvCkJE+EDhAq5rIrnDi(C9gaC~N#{6zP~;ck#o@Ab8eC56nUfy~z1h%LL%`2YP1 zYep04&VU1f5bz~Z{NqsYPn)*CaH&NhKyFK33Bq+qvv@OlcDg132Bsbtx)V%c39Puf zDB>1}g*YBJ$6xnu`$KWEWTByrJUNNvh!c;N#hpYNNuoOf5(PljKJr7;p7IZYRw z(w1(ad4vc?^P^#7qI#UFu@rwz@dhkNMO`E-w^ZG4Hs3y+9#hByX5qSzdIPm9+##wZ ze(AwfH}?qPCxr83xS7pbmM$Ucw;JnCmy6S$`84zy_z)S6ug)lW_oC5aclebvPtGaN z{|J;gw;x8Tx0FA_ zpxw_>ctZ-q@gM3x@30Mu;0}=;jPY@sULZ1u@FH*MHSqky1YR~MBateOk_A4RJ)t&z zH_<>C4x@Wz*Mz-Znj~9#>3JU_Rw$>eP*5q6(#MqH z5Dvn@2W3sbmvy}(eFOr}HEa(ChJXb6{@wi*Pm6+3sY8qFuBUC6Yi^I7S>Qe$WNknL zK)i);NN^pI_?RpQt``!0XB8 z=BfCQHE7Rtk!70_l=jS|f?jY;WS5;cO#iI%N=}}r-jp*{sM$=Xa^Yr0{YGeox0)`) zHpGRjoS6^<%zn}pTt#5fx{y}-m};F>C#q?|cY4OLqch%m$r$MYOe|6mzBN1CtRjNj!Ghqt&Z_mowz(20?pC1pZU%m3 zd^si6Sq3Kg>2{7jo9~&SykmqF?IMDGw>?Zu0a}}TtWOagQiZ!-i%?ue~ z)xX6xFCEh}g*RWlJ3;>PyG-1FFt$$>{1#r8uQc3FO9K9fB5h>K5N{1hzkR>F9`1ZT zGZ4RYHe^zL4>c0UJqi$7h18CRf%h#?FyFA!ThP?CxWcHypxG&3StYA-ek)`omYvXk ztTW!mN&&=3@A23ts#=nBqYj2840W4bXGMMQ75zAk8OtN(0{H0vIE$y=M}X>nh^Rp% zK15O88lp#q-FkHL_|F55znB4CiJC~pz}SNWPA-3-7yl{XOZIOCUq97N;53b{U*495 zNSfi?)O>(oLoG7g6->3X!e+feQA1`Gi#>r7E>~^_h)oc9J*av)qO@8{mO6m?r99H3 zNNEuGYp!Q?ecPv|>2d1q*Yg!`pcfw#Q*;*Bi=*^lbr6$9JBuYz!lZBRs+0JrdiW~a z)*Q2i(w%&Md#P#gogF^)jE8FpH=~sn`drNNvPr21Bdpj&uPt1r`D&U$e}lWnac!TO z`KGsV&r}=z=6FWQ?nb3g-bpKIdAncG3tY?RCM`PwT1{DY6YEq$H0@?JZU41`Vw;vy zA(4h7{K@SpPTyH~PHUD{tFG2>WK7xoFHiS02v|J0Ynas6%s^@$awv7YkSw6L605N-C`vyXKlulr`bdUa&ixy(8`n8onTWy z4mjpAC!)A*DdE;XX(h6b69`SK*KP0a9BzszPvW zP+wH9uoO>u5{FaR#d8ww%6fX?n4Wm2p+Ap$b#{s(w}F+E0hk>B53eAWzXi8c^c@zN z(E05}2U(ijt~em!0o6jQ@#do42*icVCDQn!G#gzxS~=xQ6?j-z4#cXj2!*_s)Eboth4KWLu!>O*k%ou!Yl>TD7<)Mq z3q($O(y3u0nJa(QyIFjPD^2qocWly4t9P3~#yhGo)54>o-&GhTwcd$QmXNYZq$J_R zkmzuOfvhD41N=%_S->+Zq9P-%!g$NGBqJVkPGYH^1|OnHNVqrq9I+zB{0RFw-l^0% zhnS~Z?q~>A7v+GtCgORC>}Q0?TPM9yJjqZ3 zNy1IyeCOr{xmtB=3oCExtU1fu@lz3s^tV^uMH}3?h7w~d!!v=7WSQ^3XQ%4-sy)-n z!UIj23*Sqrd(+w$a8+(P9mtYHQF(p3*mkeZpQk6v)9XDbzDSv-(LGLv{EjgVVNeZ` zzzSy1nL+C`W%nkX>Izc1&s`xndk_qH=q-AjKiMj%s}h?V0v+BOR%?sI+%hNPq@HB% zX2ABmL0jWodNo9T+mGBbm>ck&d*rKX+DaZ3rwvWoMu)mL6vc1zeX!fQUE{en8E0kY zi3|ACSfSBQO8EycC?5YBbpE?y{>xZF)Yiep-0Y7#@3`cDsUU@asPZ~pWHzUkDcRe# z18+@HY-qGXH9#@MayU>?QRNnu0Y__N?npgj~5-`_8e0QZ*TT8tkc!!X{!=vUJ4=i3#0TYsJ-Q)^TEy6_r0vO#9wBU`^Y z&rF%KtzPKMgNHZ%O9&5w!f)wNEO_zOgJI*$CJi|ot=b)#{HNz@3FU5?9ze5GCwY#l zMkv$|(*)yD9%e>}BI*>2{==Ba_BWQ59CwY#VpK=mg6e>)VOgH-2As`>`JFrOJk#|! zercB>jm<-R?{Q&#xPiU5BU4SWZs>7r=pQYT=xjU7X&bOu|C8^{-PTYa|BL^G5~uk_S-_XVmK)oSclpoh&W%ge*5l33 zGX4%ZUAQBylFhRSMs`Z_TkD-Yce!A=~&!cNh=OX7+?_bAQD_l z8om}|U=6Xb@@#}*=1wPW5HB&T&$}jDzxLHn*`ioMkcsNjm#lYNn|DkmX5RYsX51b2 zqItxaj@~`OZF*UcDxz?stlk1-c_5j|hz!*0r;tAgKUh-7YPL!2D&f8Lf7&;C!r@8!3qM}g6N##Mw?sEOa^9L@f&YD>Hq$OMNxWfVIXZ~(BBdkr z3x$Ft68!~y6M|gDT?!lZKIu{jh^9TVoPi9D6QaHnDI$4cj$sj1ki!~91c&`7y!ICD@m<`6QP_!o~+2$eNggP$Zz;$zGJyU#E1qQ#^m zdPFgZEyyT%)eqI76a&OObgmN+)f+rP?^+z-H!^)s27qV+r$g%LbzdOu@>) z=J5~ig}6I#Tv2v2cQYsZ*KcuKb35Q){#No+mX`&3d-*LQEsj{(*etKWlJGClgy&;0 zmIfwjErOXeqH7TN+xN^l+y5eR%qT&5dNo(b0IB z)t3x5hE;~)5Ytk!M8Z7mD9H^K^P*08$j|VbtSwt*FtH|uaK%ECtDaCWXLwPRD?X_e z9QcWJJ!ecQo|j3Exen+`Q{Af(C8Q`DN}Lqk$l75bhTcR;o!!)#QS@q>2D@aBiMji6 zvuyK52on{@Gme;!m&ctk#I{j8$fdN~z0%1Q1@S5AwExg=D_%#mt>(!LIwp$f4&yOC z4A2&tmphBuo8do0@=_4#tbnR{n;79SluW;&8jjg6Amlib>b9NwdCla#7tMCFyaM-C zd{*i#(caFwdHQrba>}W?0oieU0E_O(m_U>25Qnzi7`~NFgsQ;ovT`I7eqn{$e^SB@ z1+EO{{dS6hX0Xk^BE6fx>RCR=_V}ZE6g(A^M;15~r#UJa$FS>)LKr zqTMB`Au1}cL(zCsU?UR~6(N&467|*Fpru>CPT$sL?|laIz3U$eF!JpaW4rAq+)H4| zU#~6gqJv?y{63S%YI!|%{pH&?f3$f%{xRkF@0}Gn@ZmY|ckpch`;$)|fNP60gY;{- z^V=g~)t3op_f>jwh`8#@oI3fzqzNrZx|PrQ_rD{Orr1|igNGUmg5nEKXxh#e&Ip7wOBp}M+<{F#C2M)kC>=lNlR+0t9B6JNFVZ}o*x#zWS_k{=+&(x zS$4z|)ur-99jDas%9d=ct2R<(FUo)IV+)4yVBcV!W*aDc0E#v?SyvrKJ>1AV@U;%l zt2{UJODyVE4OKTx?Vrl)`kV$doJv3)p4F6+ypZjffb=hZ=hNrev~s?%U#yxSr(N?m zt8$r|T_i#{KEpe{bIteuxg_i7b#4hTqWWnUX2F!Z*o){}I(p;V+Qe8T^JQo^dGK2r zMV!sxV!N+VA@bV$93psY4tN_V-pF_$##G%K*)6>kE{H|&o@(c(sWw!rRM>vM2Kk+l zsGDdECovsy-Xe4#9?@)K7rlnaY%$!gO;O=(b6apr>k`wz8-!t{(gcPDt*<{}Ffw_= zFq_h_HE>KzwKZr?>C~k}tA2)bB5rzTP{B1zm-FOb8j&&NZwozuWfL*Z=~*o!u&?7H zy=H=bgGyV=5#p@q>w;HA>X!Djz7Ghi%?BKLEFhYO_+~JT5vOJ;5S90ijNPD(ubz5? zYA4VJNRefrj-PQoo04?oO3e(7e?c4L3D_romXKNz%Y7~lsR)w`@)ekV|HEMGtH*(Z zAutI=0mJ+c#UCYO7Z(o)XS4qZ_5bx34Ex)J#=^sm-`3hf(jl5*fnKMR0hF~9nt2el z6VGiv$&GWR#k)F~?6e5#w6G{Zf?2BYZxfn-Y4eU!l^_r5phB*guQ4@Po5T<^<8&Iw zA?bzdwagNB96EiwU@KDkwT;FTus67`itG+JC?CL@#~$=|BH$LJX2*_|nIk@yQ~zae z$7a>BPw(J0L2KnwH!e#2dNvp7Z8BD0-khHYf|alOWg|mUdG>*H{(BO%uMXX|TXEO= z^|Oif{3EK`7k#2-XbI!Z9`uFkdaY-vN-ZgqO%c4ZFmSo>?Ep@bvG*6lwikO|lew5u zik==}MI@^+Y4J*DmDEN=2?^?G>+@@vLe-hI8>7d5K(-&(|D)@j!Ypl;b?xr5ZQHhO z+qP|Ulx^F#tIM|8Wp^1}u3g`r^WST&xvu|o9E~e8-pq)|xSt2`Sy`T1h>0?ZG8>`R z&qP-*l9U4(^9qwsWjUxq8pBfAq>-_~k$j{%QK+V1V8Hpz}Zk5@BNX%(qcU+|^W%KfiM>7=-uw^P~K9#sEZ={%@}LRnN&( zPTXvp`ww&r?Xe<75x6cY7S%Q82K)Vh{&=1njLHvE|NYw8qb*$Wg!p@DfDYC@C#z;$ zJv~qY!(m+r$~dcV(Y<@gDtAu23A;~mjg!8_H63iJ-a}tmFB_!!R^E+7xtA=~xX=(x zXaaheB@6LLZ^}YcCtsX#92f27{U0!$=PL$SWWPIJY5V38tZj%A)3c|J%r?V=IY2~E z3=s`BsRmgrM&?)L_lqbUmQ333=&NbBCCQW>X^v9)sl~r${mGDor9LinHOx6du#s6R zpez-~)-%-U&aFZtmUZ#2=Oa)f(5y@p%GF6U3;}`OiP#J05Zo9=Le;`FkOom07RAvS zViR0N2~6w|tIcM(o5{4969u7Ek^29Y4gb?}l(bcEAp72swePmif85^xvType*JKOpN5Lmpe+hut+l(W*BcOn zYy*j`^J$|84h)^ae#`M);cLKcv#mH54qR6Ni@kI+Md0dnZ+_Dd;6ZP1Kkzm*@m5@Q z3u{z(SMk1K{CmN^hsT+VYzuuDW2P>!dHbehP?E{;B?d6&TN=|+sA;wK4t^3u;rJ~eDLSU6Bn_nf zHJW~!t*vYjsXVJA`(7e=MsXAvUHu$*F2;NxK?VNFa4I>uN3E0Tr0?!o7K>%(lI##z zwaJ44Wc}4^8+Zgcp9>@GEl^9oa)Ft_5x_}n{kl*uHvcEEn<~tCg|LcBj}@;$caVG0<1k(ALCj1&;SA5F2W3a&e%spYE2Ep!2XNSU9N&q z{y@2qhZwmlatWi#7)jkmnZk_Ntd{`xx;nE4@h)Rdn8{frs|%`=DV2QA3g+mXsdi3o zL_g-1Ub4oKqRG`9gf?lX$oqWJuHyMvBk$%hq;Axw7R@o{=}uC*f*=d0IK?quUQmv5 zY?D$DgFaCL#{_fL*oWJ*yKc-^u1|E?C-239J=yB$zs*Sg6Kk#+n6P?KKYkda{;v*> zij$$8vxB|UzjMPDbxQ~BWz^4^Bpch=L>g^Ly!Ah3O{Uy{A8=#w@n(c{k`Rs#SV$XG zchc1a(qf4@7)VM`w9OzBxnv3}N}yV3Z3MuSkjX2Qa|;E`Qw)o?opWwdh7)mD$_v+g zqD$kiOJM}~n@tusow$I1R9za`lNJ@5V((0>B zrY$)|8U4QQuW6U1)mKxhb>DSs+1VT6*{X2aDM{^Gc8UZ3%jGB#sISNaj>~ZJB+~*-MITOTltCI) z3KrGf)xs|1RhA()ni%nc^RV%^mb>`MtM^cK|1C7(X%BwjC0>kU!P7Np!$~Z@fFD&};V%e4F{+%Q)x9jd4Wx_c1wBbT*t7%W(p2<# z5iyR$t=Y{?sbMIV34?m&!;)E5MxRo3_fJ&uVpk&NYwzd7C7e+EUD{X`wgj&!#Sn3%3;1VGi%cz2^Mnx=Q+QV?7Y9 z)_I6fX|W_n)aS$nJzUAZCMw$%oe`v9M7J142aRr8f=Rq+KAuFjJ*qBc#;f&>Ax=8; zxe(NuY>gBPqDhk7LGT%+sT5inr`N2?2|*Ef!+POd&@m%+*&g7a&?84&Y2@%d8@0`5VV>sSUX?L^DfLuxuV(y_ z7oApRTqfuiy%Ta(8qMI49u;cly2+0XyQz;AzbTJhZr5PASTY^vYogOkV=8Ls#ZX;F zofMP&$jmR5si0UG1o|2Rt2kiv(G^DvbLEL8ckuzvp@k7n6*u4pe>QNB=Sw9<<-R zfLnRO#zC3o-eodGQelZK+qMxEW_#(5VslJUKj|YCdia+ghQd}Z4tEN}~%+)uvi+dPl z#*J_xOH?@1URKZ>X>Wco_d4~W!BW(Ri8%squ4Q6YqdqXVaMa0l`DC_*1Qe_h$eXi? z9*nc-I%K{qF_4V3$4A@G_BVp~^*@L#SSL|Bn<_#v_hH?VOl@Zvt&FB=Gn&s>G}_k_ zCrCD)u-H)QV|+GeXqK78Y%f}t$i>ERmb3yK|BTI6o09IJ4!On5)FHhuDf;-OrYIPd z#U7+Dd^sXez*pTdmt$1_2Hbgm`orS>UH&lpW!b{muW3s5M=R*1f%yfxycY8PT~o@gz6j%lfSol> z@s?ygm+0L^(#A&=m9M&QB8a&P!V)=IS4W{Wh2t%qd79RgrAI7w^=t||wNxS3Kam+q z%g|COe!-G@{!9%Y(=!Kkwy!^4z`MZ`WTvzzOu-c-B?~y#kRuK^(E6TX%kT}+1LAZq zQZe5N#bIqDTQJufL>JIQd8(5vtP1x#xSZPau?I$e&9wav!XM39JT8tf>JNZA>|BT7_^) zQtOTHd#u@)NzFR8!}_l!g^u1}eBzw5S3DZ;SrvJKG}+h&8uXRZNz}lB(Nz2-Rc)B2 z98}}Xu(jhb0HJBkG>Ad0U&9e2&@gUTrf40s7~lVsw4nl_Qv;=Q+2Fu{-)`_!)E4|o zXo?;Dt;h>^1&)|huRg#B`4%HZgeOqbQg!NSnWru~t4P2RY3O=5sHI4tf&$^kC5L@p z&6F-5jNv!P9}PMR*d5Y-{(;}v%Ri*QOt;xB3EO5J-4=xW~L zmP%g#K@)B^WWOl)JM!{=?)1RCyVmz;-20P1cE1j{Ur|>MR>ODM*CKWb(SHs8@Qd?( z2DT&quzQF6yXWgSUzlR~>i%oOum=459H^TDyy#DwyzbtYLbgVeiN zt~Sl9L-Tm-GTA`@ZR}%#K+`gr@M>^@M!ZB+FD3M@w0VMi%bzgnP?uBtlj3Ad|4@gM z@WcXjp_J3K;&@MwG>Y|Cb{!~b^>jRRbB9wwYd~{6&HTm@k!=LcDwk$r|A+DKJS zTSK6>Qx$qQXXfw>Sathjx#hdSwaaV1nbwa#w>9NMMwehxHm27-@>wzRnxDNyUwvhq z!m6}9($l&(^+W)S5?ck=Tae3hv1JYXwy4(wR=aQG3T`(PvsW~&g4Zt>HmOUF?gF93 zBMWs5HleRI2gq_kBJbV!9+(YR4&kR1naQ(ZM*f_FtAZe}p~%RUL~%z|>IUL$J9mVu%EU23*H0M%6Y|xrRLm>Ods zoyz!z#5(YI?5}^gHROn6VY9K>F4@>1N;O0$-+(hks$%Hm;vt_#E1ZT1R*U9?56GJw zdtQGkd+W;zJqdtH;Ug_PjszIE3dtiy>Y|R_n{Xw6Uu(W*6Wb0$twGZ--2}A0HAX@u z+=%Y`{W(xaUE;au;~aL#e;SrPMzL2^&tZujeG#L#b7NH)%mn4a?s-S!+ahk(tF*pK zx-sMqCEBpnLwx9E3KMt~n|fyoC9TO^<42Le-}3^?Zdaq4Fr-55W?`gwr+bYq35J6Y z@oy^$gK3JUk>v=@IqdqE4M$8#Mr7_$AB;#qYc++hj5Dg3(euNR3=q{6*xEb$pelXj zHJIyG{}ZFtoA3h}WiS$C z8W0aH_$@?LVcJAA$JkPPG_Cm4pQwWZ0fXIX$TDjoYD1=_zAy!SDWyBq#$@@u zP;2F=sRxr`)dec5)3L0|Q<;9buLyP8C3m*Gl*?XaQj-jhlt=lTa8N0F?j;N522~2^ zcGI+8L9>Wz7BhEk%!*W*JrZTLvoho03d@x=QBT#XdB55xHK=-e3xnAy&9nf-3n@vm zEhvXQQH}n%8I~!fCCE|I`NYGFBu%p;5q189KmN0Eq)iAcF|EWx&ADR}n7MxSEd>=)P-rV&p zS*^@i+_XBVi-BaWcXbX5458=)ihDjIsJGw<1!o|Ku$rnn6rREZVHA}oBn*`YFp65e z$APPAe^zV*9>?l!82vG&io+i7FcPj_x!&?DXIPA&+s~zUB*_a!j^Mm0SEaI~`Z^4X zxgMxvDAlbpI#ravixUY26HP_2R~W=Z1+|Z1GT*(`t&Dhq(L{Yw9YHJYX63XZ>V3Mq zDR7|ju*&I5{*S)gV4^!p|@7148270X5#P!Avc)X#n*SEO5{#)2MhCN7h!j z*siaw8TN||s3I013sQF*1Mlwq#{jK<>K3xu5Num#$GAXqy&WBLCM-cD5)r}W@aUfV3cU!K@tRgUbqUzQLfOa zp)`C;a)l)}UX*Y3`RJSvr=%3ZD`8I?KUUK`jXU_RckN`xA$0;|)ia$RFBvC;#IdFY~YD{m($YW{X1BA7vzr*#?9|bOT8qLu4%B1dL#~ z17k|!qikHX0}p7OVhcvl+rW=aqM9hX$ccVZ_11q@%w5(_&^)`rj^p9?6=9N^8LcKg22&IGPPZ1HxV%KDHmuX^C2w&J?eB(moWH;`_fn-*HV{)=3c1Km9i>%Ns#i}PkG6h@H4dZbA2SeDi7Z*S)caZ=%RmX z2XCD_ko@Ex{~~zFdxv`$P5cG_CrT%0%~u`>$T)R4P7{3~j5)O#GW)TeyT|(~*5av~ z`{a4OoOBW}$pxZ(Ci}25Jjw5c;A?^KQELT?+b?)=PZ~j9lTH5hAC2uadRXp@Z)4X9 z!vA$UsVd3H8QT84TbiQ*?UB5k;WwKx$|IQ}YeCCpW$G!JncP9z`(`^^>2lG-WpG_Yk{lsk{3%%rhBTJpceIB^s$!El$h?{>hu)L;`Q4&oh*wR zd6BGZbTVX`hqX>9Jh+fX1S?_KJ0+=k1q#0Hi=rB_%_SDQvFZ({*NwmOn!g7yAl zUpC>1H9;h6>QWT`x|azPF@_^4YomNN0dUzmL5ui1Zltmd)uVr}1la4il5-+KYEG?V z)K38d&QWyzN^)e88Ba-zEg4*6{4^ErfFN|#w^p*HSp<12c@a_4MeL39Ww>ledq@_g zd!c1GvuM*qMtalOyjryLR?}v2f|EOU4M~#j_X^6TMC-8e;WcujTvm_xTG{pt^>3pK zsg~QP%lUK(WA4j+4BjQH7_wQ`&m#)jqOhYeo`dDPN1FpDyI8gG)$xVIW_9Ogu7gJa z!@+aob~))>UE5FFH>O5+t;%TcqO@Y7%beh;`ff+(W=hVo=%2gc>~?%?K$me)T&`4E zV=$H`OGHIzvDt_th_bfQS&+R0HlDGt{IsulX{5G)j39*wXIEOet;9Ey3%boH$Q5PZ zZ*8oF`78G6(|>QE)m7`}PV2MV?gK*KZx=cl2abcV0Hdj6t(lXF^E1vx5usT`kc!e$ zQ!D9KRe!8wOHChIhM$*l z#=FeI)ke9LarYg7F^@6MxUt8Bv1D7wVd1&%?@~b z^sM3JNYmPuhLjtQXKXNabI#IlrfjX+l5leTWk*N=(~Lh`nR2CAL>Ciw+mvNO|2z_h zo_wr@u<^4U81Wk|ums^3+Nel`epKqn-WTbX9#sy+(cZDrp}-r&;mb1FrXE|ji#_XJ zj5s7o^LsxZfe&HE=FsJb}tv+p*;`Si0j7U{e8fm{^@(+>$dMGIlo)gW|B{I z3@hD#oXfbT>eDK)`Zeb-%j@eGE4-IDo`{3f-Bt~s+wkL|)s!r8ez1@`d4(#HKe_DH zi!^IosOu}9JTEKp)G-)^$3IkYWopnWKc;G3sh?EdzgvZBNe+jRzugM+5L4-vFc=Dy zv|L`!uSmQFiC9}nv#>cphbqUin`?VFg&bLAm501iOP)j=CrXzPsHcTzSH)N}w3pdXi|oR8~>h70@S+k~}<3 z3UrTjMMm}rI{r|ChJ_+IC$K^uKu%Ke`9;J$?n)e18N?#diLu%`vLA6OBs7GK^Xm#D z3oC!5W@Z1?`P@pKjuXwf^cNI@)X2rYw&pLGozK^d9&-s~Pt74~x+-=CVizN7T>W`m z5*cb2-OhuaD5`AcVcpW8Mtee^q6A$Y(dT=$jCbPEWXX;hDBy~f1TtlB z-iH%W+ZtQR%`2mm)|pO=1s~VDXV?7!@^Ys|xdmZaF~o5D2eb3P3Oq5{wF}Tzhv%AC zI>>Qt;>0j4d2@f|ak{BT?rYituY+|sN_ZTLOV%=a$FH(3`K{z^&2 zju_%_Mkd1ax7cO1!Wf9Dz2KnMgD+(gqn1~O&ubmA zp0(akdjs7eSN(+Xec-!pfA)sKH{j#XL*XA#`Uu(O?W6jn&imsP^sk;p?VH-Kr8+>- z$X@L1_+n22ku^5^V}0)1-AENRAr+gGY?Y=DEop33jqC}k2Jx{X%2!EpRFfUBvV#6nD|r@B-F4!FHSy6<&$e?!Li-Xs}uaRX|%%ZILf zV|?hwxYa!ml=Wm?ZI@`1v%m5&9#-UXN2#j5OXjz{q=LkrWm0vBX>#&QDk)ze%^Ytn zDMEj|L%}-w`SSrRt0i%D31O(VCperPPSR&He&~1qP*xbp=PF@@GZ->?7|Ay@X7tx! zpZfc^HkjKCHpe-Y1;fOUH---A)Mzl~H!-v(1Hd}2{s0aAAdNjklQzJlHTY2r+l=+h zmx3pp61D(O=BO_D7t^Q4_CWB>K9Os<<}pKS`ALIp zPr&4|^jd{pzwWs#Pq81MY)RWg5O-L9iT;h23-1xPN+sL^N3J}co)gy0cG;SmyIRzag>R#4roM+*(Awje} zFo~rzy+N@aHbx2k>Z?!5y|UVkksR9?j|8< zd}<=>f(pLEIQ~GLUliiGyUf`y^Uha@qjTda)jWfOS759q{EUgO5V%Lm)=K^Zu1ECJ z+u6pO6*%pPl9274l1vmuEA$2nu0Fe#+Z9V5y)soM=Q^DW1|6$96dadm?A_)R+MDsPFFc7ZztP<3BE#nY3f^uDoc|4gVJDCNviDq=vjWk3Dq?$)w zpB<2O%hqzd7w}BlUD&My1|X~m9A|N6t3g!SaK&w=rM zxsa+Z*_uH5X4e9WbGQ`ipwtMpPHEuVZ4bNEExPS`3bOEM5?tkkAQi2pj|Ph9Th)_ z`0!o5a97SBHR{;&C6j`Ghs$yWxowBH+lfhuJGR*MyLO_wpH8op(2sn0LF273@)R6! z6m#Dc%I%hIxvP-h!p(Zf+cT?O2*BYNpy9KWhY~n+_De=rnS&s4g5QAO_MvCyeOVso$;bin#tE^k9>op&lHzYc6NYC-=3lq zDsI0aDEuP*s!-+L;Bj^7-_3CxBf0q*iLmW5@V*b;&TrL?oD2*@NI*kh=#Woh`(Cm) zhfyf&sysZOV-8hYmSt_S5?bkhZi`GSwiCdPI{Ob<6RPS=+__?QlCx-DK_ zg)1^GtN2<_;(CPW1D9s`Z-L&9d=sBYlV6^h?~k1&_ye#WboPsn_MErtg`RftuK+UM z0N+`((`!Ot*ube~);u2* zk~Fj)2DiUV3iBz=Z`rI+kOcXBcSU)@liW)=t9Rd?GQDd?nW&d?ZhT`)i?b%=1;qA; zsIg^w!)8BBW6s=SeN!bbSmnnHvFaC;?*wtn;-)G};)yI+p)7G$j}KiG-W0Q7(x$-F zWlhd-_7*bTZAmEDCNL`}t}kzAF3gqNu%VC>H@ivO3jv)CMt$i*G|oVcfXQ5C_s$#9 zAann~o%eC`ahN<1R7cl+>)fSw2CsV}!sFiStZe-QtgEix+scV|hp~H8qA(KL=CXPh zrW#aEXLz3V-H8=h8k6jT0a=>UtTC^M`qVe&p%*H<%-kS{4;AsL#)}MD3bpl|*&!u& zID`qC{p>tC;cQXnCw+R*n$-gp!R_b>rQeh;d${*|uI7i8 zp_`!xy{)084ZXtuYo7b6tlJ?oqV(8FKQ)uuQv8In)np1>Fxuiw$uescaQS18NURqP6W-wJFj6?LCW#?E9I7sKHJ} z%VHx#%Z7#{D(N9l5O!jF)!2#N8PrDxu%Jk%2IC(o-(aP3)MVy4bqJg06csL0>7AP9 zyEFI$szWA1pb(&ObS5+oGkWX9$7uaKpyv0lm z&T#}ErK2)O<{HL!4~avwrktb|BwsFLA%@ZT5yeP75j>ZrM@{a!Ynw{ zZgbjudoNXJ(^pzfNt?uxylF<>42rL;Kc%_jOSjgi-Ehd`RnU$RZc@_FMph)O>BMQr zuYW)%!qu*Ys_&i&7bdMbV;;+HILQ!ax@6;x2iABvoGcs|!@4zR_-O-3?+)04LtVjq ztpynslPUQ6OHnAk>dcxYvjgoLHNF}8=r^L7D*+9poxmxb-q+emtD;O;?s`1+l(AbI zBOlY}=ORi2aSFj)i$@livut`vWeJtX#Q^`OKJ9-Vn+DHqft0jv!wd<^Jn7M;>|bWdnwrY`JI%f` z(~bWRlXU|D&#WONncm3Yg+-|nvW{rR9@>Kf14ur~&T3sY9m{3=oq2LRcAAxH%X94p zzIFeExp3Dzj+IBFOKVXoCJlGO)D8~m?bxB@d`Y7b{XY2g}mgi%Xo?i>YM>>H!h^rn9v5Z zVj4jt?)y?ahj{JH3&6ln$i_o&f=fj);`p%XRrws1yZ5IGQk_|@UXNbmzwLmo9LAF(?Hq=cIVqjOHAubX^C5wR(zWu5)Udsf=QM7InN6y|pK;zva_1c0O z35qXlupsQA`T$dN0DUN>h&4>Pk+C51&S8ohXTF2OP;o*Aymh8d<{s}ThAcsm3YdGlp|et z`;nDUBE*DfTOeT}=*?V=i_9gd2W|1V4T;i|FLPQ39RZn$?(0N?UJtolM#u7^6MHB`{@%`H?y!{NnQ>ET<9=eD)cem4dkZo~qpX13Fww%kX zp_l>)*OaA5HW}rW1#`82`uWCCv^N~{0y4yb3YPYAxo}N#Xb`*YF_U5TRrZ*Je>vkt zEJn{M!RMX+o)0EL>RPCWyc61yp?j<^D%2=b!u>#4Z@BU-2Y-&H|H%^#LSf7)08Cx1 zhNupREJ1K~MY(d97fDXAqbH^b}O!BHZ)>@NN z6RZkeWGI_03P-xAL5q2`-dodCM3QbM7iP&ctd|;okhxGUtb@txE;6ZE-1c}sKDVzw z#!s%bl@TB}{W$|VG6okdt7(6OX10c$UQ7{u!z)g~Zr`W&HQ)($Gac+4fp{_zv~;&0 zM=(-p6xnBG()ExB2*%9fjpDq>8U><4i+CD2-u-Vr!T+384_?PgfbZ>Z|30n$0|k_{ zu`x9_v{84mbTR!8d^9vcR(?PL0kG2`fU1Zvd=39VRM^0X$79g_oM12)Oo2BYl+{_< zTuM9g>u?@90^C2~w(c1{x~W95h(yoK%zVf5c>B-A=sk1*Elo+nP&J%0*Ho4ULxaQ^ z=z{uyr3Al1uD2pD!5pKZ$&PcdLc5_b2X4lermy!_2bM2+v0F;j0B?|@mNf#>+wT?< z6YGhTvK%+%*OS6C2Xg&;t!Px36Xz|N5Oykp>Lt739*_DBAx^br$70%SY5mZrx0uH$2s*{-Fa-vxf_1<5U0FA{2Y5X5kvOS-nI~z?Tcqx&*J8z_1;gm zM-#BYvD5g~0s)H8zcd2_@Z%9MK!#1zb>H2J{yg9tyIdoJ zsrOOFYAMs0+0%EgV(26GYnbrM#2O9cZ$TN1GU`d`My!ThnYk|@|MSjKh^lN0{ocu< z@16V)Iqv@kq5Y$|W@+~i>hynq{MVNqlc*~{z<>hS0cvCnBY^Uw_CuJ5Mz~mP_bo3hkuJ!R$SgDVMzI{$}b(_TZ5y z8;XO8u!o#W<%RLOdQiW|_w(KQ7Qpe~fdmCSzQX=Ga+gc{_8v=!k`OVnl~6Zk*kn4r zpSxs0scM+GZTG*-ZnF!)UU7*kB@b4J@3A{a?>EqWB07pBuHc^XRo`5o5%$wC8Wa(O z2L(38p44b)h>Q+o1x);UHB0~Khs<%3qr|cKEMGgN=--6VWLJu0`?Zp^9P`Q`Dn2g3 zk0K@N>qPmv4mBaMIDAeo$e$B(wNYpRE*bg5`yTYqIbwu3$+fXnvKVz~93@|1O@%y~ z=Aoq-hPdHwlYEm|40$mg1Cx!T)X}U_)B-tM{oFhVnXx0|N^*RZ>ce4u0Au=pWDtCe zlgfYpIhOx7l%Qm4Xd-WCU#@bjzg|BM$OE+7 z?TSJs*(Nk97!9V4& zCLQuO>j6ZP&jPC-)O`-uUlPhQiuh2o5P#6Fm{h=sY>$-Pv8_X$+uREkw~%Qo0QDYI zG4_>7a8?e>PRoIz$Wpq-8ZUplG3ew%TOT-1<&@v-iagx(0{y2*>Sg?OGW-THeUvT} zxZ)CK3_LGvV4hUN5Z?V155p8$IvGuo!H=+vml2)w0Ldj zay^6ppGU!qZ5jvLckuB3QxyHrf=E?T^~?>jwVQf@#11@N_}CTK?$>9H=kU}vM# zrIZ{3Rs?wtSk{PbDQ+%h#_(W8=L>)@!HXyOX|s_1z`Zl|?)>`l`1x}eMjY%3b_oUt zA~~ygJFSbu>j~KE8xKF!Hk5EAj+aV6V%R{>c?(-f32*>`ilI=^0=z1M2}}9U;sq9p zXVQ-N&8`{;7F#ytb>Ve9RQl?f?keODZNO5J@^<3LyVqpKE?-Tub2fr6!2i+wo89!$ zVMVqoGuqI3@tC>((U$fi%g$+=!yvm60cenx%>~{89GRg!Q1IoP0;Pni-s6d98*s-L znD6jCjxPf}x*m_8r^l%~Jr}U&sR2e~K)&dD(U}<9?QYb8G>esivc{Mx86+KPnJ5do zMOweL4c$^DK)a$s{_bSuDv4%V$7&|-pfvLT*J}ThLCNd+PkVo_H2wFdiuONO`~N~+ z|6b{TF{Qk1-iGU@CE;k*YLr0`+66)3U@-I~B&0*|3?x+WdJ`?*Sn0$Sn&ti~@H>RQ z?`;Oikj0;Gho8Q@qM2P7qeK!2Bt{9yJa;I3+DDVa?lZ9R54QoC#Xat*b0H;QsqafBI10vRL!S_GoO3kE zo%+ZWlLuw8Rwd`7&;ea^x4b>!aJ~{5ubgWuNvkD{iR+Z-BpFv}$5Uoeb2)|cffgZ; zd_rXNaOK;ql@JjE%$cw>!%;<<`HG=BoyKLiGn9>lw)ucX_;qLx)n#Zvl*Bb!t38kr zI&H4zpfuERi>OCj8oQ!%!+X-YQ6jPVXGz;dyWqa$M%*za=_>UAEHvpX{9!Z15#*-- zyS*!Gv`L0uEd-Dv?dxn6%+p?DXW{q&W5vKOkym~!fYNBrngBvuAoHlg=7=NF0m zz;fx!z}*%$Bo{52U>hv%w z&BXQv)e9~gx`BQp&Pm)AR~m|In_bpEvGTh}pI6z(1%0|BZf=KgUBcw=Tw~MldYC@H z5rw~$4YFfK>M^6`C2};2{5_UFr-*%->f)~hnRpcgTrQwQoI-5G#w>V1u4t#JW`vguEM<(adFX))KmT35?ALtZzIq& zM=CvZT~1Bt5&QocuC7q~xrl^6eq>7huW=e>Q)lP@2Zok#Lwca7E~wUdmvSeOg#`ZC zgK-}lrW|k>BMg*4iUlFrr4nWeIW-}hkqIE^+z)I!twpc>i>gB}Ah{+AsymE|3VQqd z@wckGZk_9+yX#|}*Y@HfbHZ*0ItAn5T{$CtFq7m&)1^9j+6o^-W zuk5SAUOxszYGb}@`)!r&ec;W>jsd@W#N)$Twoe1=%G|j5{h7Np1n_*%d9IDbxsi26 zjryep{u0q=yVvse@Sx|xx|G1DnDq7Zp=rMm4)5ef0D;5 zALO@wZjHV6FhJ_9+VjRs57Kt^$=if?d5_=x#jxmqOxt7eyXcyDgovA*4-illMv*nT%%_AkN|F_3 zk#%RD&TQj#jup^`=VqP`U-z&kTp;?2=o{%iEQ5zPW)4-x3Xn4R$@5(2^t zIx$M4_GDZ_={Uk!|N#2#pN5~ff?jRJX(2|0rUTwDM*9|zoRI2@E)IFIS5CRXR`b>N)1TB2KH zodY3mM65PkB?{DxYq(<@nnByrqt(KKBYJV#Oeg)&p@pr z8tYDC3k6ObkE8^KlbYCjwy)sp?8mX(bb+F@G`HCua|!yF`z3E-I~I(nvB!t-Oi6c; zYLn)nk5$7DO$g1W^Q%aMNPT&eE!uaLBMar^dq+ee%LbCA&ld%597_mSgBH{o%d4U_ z58&Tri3x0qAMsKn?1jV{$S}1l^#Jn-@9! zP94tHw}b-^*~j(sxjBZWT&IN5Q|@*gV$`eTQ8SFn_KnjUn~rF>h~6L1fzqSKH3ukD zdg|B~kqKsnrMpNznnBW}1fsbbp(XmFBZAFdhve4T1?dTIQ}p_>pX(#0$TZ#@2}cV6J%~K*g3KoMaakIiHKr^MQ4^%lQG$61l}! zY07d6-=2A#!W%f;h<;2xXS}-7{V`;Q7g=Gcul%wOW)$W1KRQFHAR8r)8C01V^iy6X zs)sXlICn5jhbiM!IcX+i>dePgA+=htFxbZ6f@m>eom>nJ*Yf-g&IKR}R2AH}TcW{= z5Y4O!k2H*|oLsyVj2bD~lV!Kj7<3X1(Rrd-(#DQm;xvkcDeY}WOC{NBW-cK|lC?$z z-~cn-D(rB=C&k(w2$i1PpWEz_Sv6@Wq@ssLP5U@ z3pf5emCT4cI5kFvo!ya7Oo!F+P82wkBh8CUD$k|Xh$7BW!a>A{-89=Z+uPbY9MzKZ z3L`0YgEAqxld|*t1~X7$(5nNIbnNAKJj)rgd7|7Er4I8bOli?zlheXg;*#W3k_2d@ zh72>#i&Ja{r3AP(R_s)`_YtDyL+%JtYC7~yc6xH+40JMEJ&rUNae`d1%y>iSizJ@| zYSy@bck+1IeKCeX7=@_?19lY9yn}NH?2gy_?qOSw)VNaZRU?+^b6k;;5)oBt7BmYN z1)Rj0zb@(LgzBh~_I?_EcMj%nCjRN=Fvv!7>MUOG$!KCl!s2mwIhn^p)&+9B(HiWT z_{K;oBQA0!%4yZ|gjHAg$;HopP^-KScW|JeS~!a z0D<8H0kgZ#vN{&wvin4Z9!QFZT>(6k?8iB*uQn6WqschxOe+ZJQPMDu741`fiw>cI z7mlDg(al~3m*XwKFqDwh#KA|n;giFtD2hlv%6>z!iSZOQjq$tOjwL_8g6t7qanDMF zp1B;KriPti{zR_xSTkc*`@(~`( zB7`NTN1JIHaMN2Nk-07a2;kQFW#aZbe46xxMGhCYRxq*V))k-($MMEeLV|~4HOzh1lb=wW^C*jCW+EiVhQb# z*p(ls6Xxd;+QPMA9kbfU5Za=+PwO)sN@<&7y8Ai-7BrbB@bg}Vm766BFplJPDY}?5 zQRr2kRRak;k$+;(x&2M_ND!=JL&BqYI*=OJC-JfR7osIgFV6t&QJ5XtTgKsPVl1+f zYUZT3F;d=a4DjIO)Z0>&nn2o~9^rwUYf0WOfcF2x*E>d6x-M;_>Daby+qOHlZ95&? zwrv|7+qSI^J4r`puD##yd-qyrpY!AXJIAP+<)`Yp)ZbSSpNXL8yNHN5oxf*CD_4u0 z(teDA$EnyU`B*|OhmHqY8+)c={-T&15T-4}lODO29`Ap*z?BG$tFFx9bhCLc=Rp8*kS#9Flp3pe99qNJVJqc=GVk)n+@f$BG;B=3{ z@@LC}(Rl5{)%uYDwVC=XC4ChwUW(m;SUZ&AS$QmHDu?5N-dMX>l?AKfsCg8b#AwYh zx^6RN9oIx-GkMY+{^4R7JF8RcTH2N=RL3N82hgDO1hpA$J?uK4z(F0{MA2P)03E0Q zJJ6vbCBfYIP^FVKeF~G@p%R9H#(3Z>%!sBWJ-ADLYF}dooUE{c3`0d_x!zvAI0i_> z(%xgb=tRJl#LklV!$4K>5O9RD9P0g5B}rZO76#mm&3F=c+Gy;6M68t{cQRP31X&i3 z)yOPU&kmyZ3ufXhlJ_u5a*Kf&UREH_E&TCet>oQlT${fSVoPBfSDP3uwtqBve|vIO+JXfdOo9y5ruQ5Xw( zC{8kiaRx1Fs^5vPYyBj;i|_Ey`$9SW!G(n?JGA+u7?oo9@GGejvevt;R0)yGoy!UF ze^o;dF%?E&z}+Dys$Ub>rq27Iy>_OyH&heb$dE#yL})r?peSf@)7Xz$2M;i9E@zO! zy`z0*R#R*jBGJVC&H$k8xMPhn-f9)UA9xiP3l`mya}CpZkYJ@dPoqY1QupYMS{}p` z>7j?!EY*kz#sApwaKov)9a7Ihc8c^HVp<^&^^oh%{gHC$k;1VMCnt%(pIg>#c|M9= zmCxkI2Q^%fx09obKdP1=?@*f7DAI@GBg1wu5*`JeZ-=p;bZf9=H3e^j+W#QBg2W&hsCY^dr)^q#LBpu z(%7F77yI0Az+aRc?rI}5VrI0svvA%=Wj_yS=&G`(cS(wL2r>v5-dyeY-@z1g$?VIk zdBiTU^(_zTTu>I%2br+LkuZup_uVd-wpBm2w6%IEju2SxNuOnUDI|NqT~t+P^+kyn z#;in!tewsc^lMF37&5QWc zR{Ny(H%&Cv(-;FL{|bjR;VS6c7#am6*J**Ah<1{Ik=sncM(x~$ z_swvoIcg zP=)Fg&yCG^@^WWO%ix3EfBcW$`?}TlWtJs5F-?4m=(8oU5l2o5j$2uJEa3!7VOGc@ zKypHRb2xAxR_ZmSh&l7{Tui>3}fzjxYHxJYPc%fb{B}C%f76CT6M-fP&&+(R2HVkn0+YLm~ zAEgMw&|l#IsWvb<2U;fts}}}$OKuY^&`i9!42UA=T^;EHI$(NE$&X z>G@s33e+^tmDu7_5XPQ%w;{7JxFcVxn!h=qfUTSA7vn~=c+dVdqY=fU?A3q>UEf7>^rqnvdsd|O%pWzSGfN}Ql|jA}G%~t0F>Bs( zr%)*vo(19Ue!1)w$=*NBl)MV48r(GQg8eLv1{kPn@#Jg^CJEEKgNk#|i%|PW%%R?W z+t7zoX}_XzxT!S=z_7_&k73_FZld zU@`q!3=wl7LpX7y>rv4Uq!eS&9H{BzyT(Z5`Q|{_Hqa)`N&wuptu|Y&HZMB2wcB9r zFeAkiCH+JgZDQt#X8EI;JxdEpzXE%yPWaU_y@en2`0d-j>3Fc$_`yF8IOF}fwAI$N z_uQ#yAChIQRu%s~iQB$beWPG_X9N*NA2mgI6{xv#q%@F9J|N+W+mvoV9hDNfI^TU6 zQGt^UZpw0$5F3Vd5xI^&oq;a0J~Y>EF1Y#au+7n38~T_>aFB-x<(J!Sy6wXnTn~Cr z2zneXp8^i8S>$FLzoE%glBXQo^?dewjr}f zDc7ADd#4neo<5K4P7qqN%IY>_h|Y$}uV!}607dy*`7#NdDZ)H8&29vF#wYG3I5XRT z{r3gKfrv-SScObEO7NbPn-C};6&*3!{HX!XV0a{FL<;6nVqxbDvQs0^nc)*;c)U(# z?~KA=7c*h@>y&pIev$h%1@zy*xN#5$%)OA#cVwI(2!mQaa5Dp|`!+r>^!;u7&^{2Y z2j2B4yI~?P1<4ixR5Y7F@Wu>Ra>&k-+G?zEpK1dpBv^FdA6#A2L*?@y*<9 zCu&jt_94kJR4{lvZgs54!SGI)&ao%Z98|clr1<3I6bTI)g;tkxG*qJnrxUYScN_7h zw0Z6^-CGFks3Wu$v&eHyw*ol2?Qd-E+Te|{*pi0dd1!ZG%518V`;@UHO}qvPF=2l? zU>R^2fV)E4a{DRi5XYG=R6xOYQg7}iMCfE!Ocw7@m4aZ5dZ5l8d*Fo`%O z&4AVOAoGTKT$#`*pMm-f-rkUbB{&Wd?kt3YBlUVJ#Nqf277-&+kzJ^_eXOA5JGwLW z(cv0AIS2MA-gLft$wr^+sLfoFJp8jmxDJ*5PlbU{`M}9$BU0(@ZNB#(h|j@(RR+*8-Z$v%>m!xUi_R zgN%2;(HIa0g&s(y5ox$?9+A^uR35zYq`hwgu-QXK(%hLv^Q*7(yd>B2u=s=XK5?-p zZ!WA~(rPbAc++uTVMSCg4>jY(oJcN>a{hH!^$TMr3sby35!s7n ztxD&}zlvsCV1)VIYrP2`_biHzI^BiVPOZSw6eeByKy>BGt%Ra{?ZB@BA%DU>TB^nW z7I$u84`&jX`sRG(1)FJ|d=sy)TI3ccrrI1yv$_p#?Sl&mFqwz?L*7g!C9qWo9aXvO0jp5HE!UL(v-tH+XO<6Pq(m7HH@>KazkjYUoN8 zF_e-Xv(!W|;UHi<@*4%Uu3_v!h?9|HK_bXcMJL0M1sFAI-+aAunD1l+E0iCGIn0>s z)FgYrrjRyDq5W(V4()POfq2qPS8C$@O%oQJ<+u=GDGj%k%<%jwBZC-`SXg%X#J0p~ zs>yv-E*BL?#i)8gPM86UToq-))d>A&h&Fhh#TiS^ivif-O_VL}$_c9|=E_cW{Z09Y zxY;tDe#@ErW;pdVr!<>hz05Tbq5Uu#;$i{76azu%5YBu2*%BpLH0P9Q%IgMZ`QHZ2 zs;*>KmQq;zJMFkKB2m^E4x-7(($r757j>Q*{bZngf5*blC)+%_MJHhl-ai{VN=yXvHKW3Spa{Xj2; zd@h-#pbR;QMwaE2yb`f`WH|9*ryW$G)e6b{JdDk=k}MfES62A06uEtfC;>KW7nWD`q&(2C&t%)tM~ZxqZ8dwlz994>w~6LJ z{&%+St&CGW&z{ZaepxOgmrhCC&RPe{Am|L0ED zxyv37&V2IOMlZ^=Y+J(_T+^W#+s1sRjXjP#$rRQfNnE+-xVtkUEIH@nibhl>P)G5? zwSln5;FwkK;N;Y8@qQgprIZ{Z8BRQ}fW-;%4hX9hHAw2`0ndpKhoE~z-tsH|vgDlG z(#ELwVdGl@Q-scx9!?!kWSNw*YwL^#l|OGK<8lR*Kas6XUpXjhU9w3SjN7yGLR~Qp zCinC9HRlTxd?YY>1u3_}lH3QU*^*7R241&n*izmcOd6hB+1q_#+O_@uz?yOj=Hd8a z|9RYYkdSM5o^flROiRd`2Y0s*2y5>tgVXZO)roVr#@XT_O5*;RLfU!k<;1*&$l3CsRVDC74O8y+y27Cb%?rgR zEZCfE&+Ag*!FkztPGGeqj*+t6)f|HH4t?yXUO2`6xm`*?mVCSHX_R3tbWQH4lM6Qi z>XjF)!(=r}+mAQ<)-z2h9pYH?-t(;>%E_O1REANJ3o^UnH=NuAPraTe2EEEo(DcNcL(l!Uty&+*XG*`2u#~txsAFRf`B%^# z#ZPboO24q#WWT<&35@ibca%4puL0g;ZQL@SxTItPhsgUP)_9unI9*BAQ!8dfkdwih zH98 z$%3#YN=FStzBukEqYYW43V2HBtz{9ym2F9~Bdr~CNJM-xJ**0(*Idk})fTu$I;TB? z74XWC?yxx*tG(TKD1Rv-A3I8KS6Ss(aUYdqF^WF*S+FhcgO9G+IYgtufPDoo8tqeD z-WQp2G&kVb)KT8vFmIhgt?nua)3opa0QtJ$m91ZBC zoAbbXHkFx)gl@oeR`?RC;{mZO3o)wWK|d_@E7rmXV7qcIRgw^vpA2%h^tnN^*p?~g zIzZ1EMdg#-pyrP|K?mK^Zp}%hp9a4((M*wqy-qAK*2x2_J_)sQgZ(L2=7D-JpWGYd zYeGkQZ(??q`YtA`d;niZWI7Y4T=+ALZ+^$kqp-33#r?L}zn$?*aO#n22Lc=FsX}dS zLVjO9FVkOVG``BWap(`tC~NU@^WWG;{H-Z8}5EH6q{Nv z^prmCd4H4r@%PU-Lp1cwE3N(iXEvVJXhkYdMO)=xRg*6n`-^rbbzmaSN`r#3; zR9z!jgPu%=4^51`>9Hn6FKmY%$~iVeb3nyBdarWq2kFT%wQHai*6P!0afE=`rXpy&(ko|d%jar(~Z!eIAM6_=Fzi*mtrm(k{Ao(2`!KuMMv zv4l{t`ZG*GtHvR*^ON@;Abb7yqM&+J`0xOSLw#0(9LT)Fw=JOhb?gJ+fwrV;s z;>Cqol<7lg*TiDxQYD=R4RG4xjB1rp0w&SHwZ^6&nJJg#Jp!YZWBD@={1_5n?kP}O@T!e* zyWi@LIsx1m{CK`tj;g(VDdu@Pz8JWBwB`h`v@_H3zYFCRZIcotk8ThBF{U-Ks;^)x zuF_{0rNJ6Up|tz!kCVmM%nl8k91UcRqopJU&PFkNd@|(IqwdS6_%JNi{w$8Eo#k4k zab3jB&GtrmQteMfMpA9qmId!CwS(7EcvqJ0$Q`NJ1=Kj?J@v+H^wbmR)$brA`1T^? z4VUez|hc41pD)`MrKR2QHP=|<7tihT7g&{nxF2=C&lK5b6{#YdoDpY(;u6$Y1_ zt4HBB4)T+#|0n6o>c#XeTz{{+y_llCh;9#J(~@_6mKTPb`mYh83qWS_1yWEXNHjMR zc=RV~o{hRgZhWFM$xBPD@s{K-#d+)lVYh+EiJdh0C5Gd+#?6HP8E!i;XZi#SkFRo| zCvR7SnwxA+92EGKADH)XMQ>^5Zi_vynipMl+cX>pNNIG0mkqvWKbvAs1TBj<8(jIUn|Z0X@$+;#?C|R z2ehv%Mt3WQ-tNfqNS62hIp2Msdx(w4pk`2&LJ}6Q1lHVxo7Q|xIu}7*g6z=&tr3>V zuccy|pSkKW3CmBv74@ax{mie(nY`0pH#z5UULa-ZfP7O?`2(NWC&mA%f#Hn zf5Z>A;q0APUgXPI1sqi#^`s(x;@kD((4A)+mGt$v4|d6(^T}`?hsf`nBzPnSA0p2! zmx#2|44!apBFB2t_5c0`p8)g;ZZGW&#zY!osIE3j6K;cNKcY<=>brs#oMlSYN--Pi z76!TPQFXks?V;_2CWvZ3%Ck@(RFQYLnY6|Pb>UI=@eugw6g-L_8hAY(3h7s@=!k(b z)U^+?XYbG5O*8N6v1zs2xS?MCJAb(~;MF{6-2jo?fW+keKem4UTAXEGMmGM7b_EEq z_4AL#*?%us{eSST{KaYqzznX*N#`V|qmwV_UbvUeL5FELYJrRag$`F5t5nJ$7h(L@ zcAoX`cNBEO0OE!{h}$AWcXBoC3h{a@f;_H=ZJyQ7r?*iBpf<-vaVT}0LkHnzKmia+#av@a6tvgvQ5WiGvWy^ zV%*6EtC#bc(>u2)$LB!GF?_^}Y2Y2RID^*108(1FAW43lIC#^0CEU;}TK7YKb!45m zUFXHA9dIhcL(*!zkqX=^+^6HWXzfG2EHSc{<1k|EKi-AfCp`8~IK>MFx z2`AZy{HVE@fXzH)YLN`r`;4yX>4Az(?>o-(N%?&7dNq$-?ThRnY@HSzcZ2<8B@W0K zzv)N^OZt12xWHd5ZNJ!~PEXKY{4#)7UiE1n5Ze9YD!J6G%lp6!Ds>^qFR{@*b&XDm zVBNk=TF-+%s)o(nT3LIC8RF44RVo;3^lJhZ^C;k)o!98iVSlLg)Igzkuef85_GRvP z&3s%lzlVgfm)>DDXNsg$8mA~wzjxsNoV85Ki*0M+3(y=B*bCKvuq=4pVHG&!Vd+hJ zNa3DkVP5O;kMbnb*N3I_+%@pYNTIZ5nX@p*9-Du6biKI$$5JPwS{hj_U{mZ1U^D-K z|NbA|6%l(o7gLY_!Ta(BEZqOaE@tk9#f{gI+!gL0nM|d0_aiC-(KDWy6mx0RG9$U) zt<(}i`5oM^k72KcJaPo0h#~z2<}<2u<{UJVj(;knX?4f@y5*T);9rz0-=1O9)8z=E zCifENnaU0$V?99}P2hBf1BdFc!uLC4ak%ZEMQPmF5YHyB*XpjlT5Y;YuDA={fbSq` zPr(tuz!z+H*5yj+U$tWe6=t5Y%es!cm3_@lWki*@ej22)UsuvxBSwR7+Q}JIr&ujl zEMFBi9eD>Rr;$AsqEyoeeVnhuC&K<2Bn>D?A|jfhoUVY8ZGO|Kdui8mpboh7hRr&k zTcHYmjqEe1vY+4GfMK&V4rifLszu{^nQ@AS z^J~*`NY&+9{Y(>H%=L)#{nhC_Qt`j+d|Hy2Q;o-iS_^Kx*U~@!D z0~J@$trDzzG?i&ppQ=4}&jv1#)auO_b>5DZFgePzZJlz+M~S8CHBCau!->ziM?dU= z=;3{{phH=G;iy(XR68MQer{$h_HZK^ct9%D5CxVwD`Q)V9svUX=9*N!MaVZuWUjVe zZQ|>{!dVza;~+MlKJ6bbK86%BZY@n6pFEz2WO*bi0(N;;n5bqt8_}KLm?klS{61qO zJ4_+sBtoCoPUGx@$DHvd97C0|lC>sYy?7g$kZI$fxGUCMc&i1I$`C%pOQ|VMMg1YBJ9EsW6$}eC#Rta!Zjt>J{^UT$ zLiz#Gj{*<^{{fnA`WNL1!~cb|mbG+tF|{-OA8HL(1wMptLWsVH4*Vz)!4_gd#ziZI z$fTk_)5j({lX_hD>!{v=1f;LVkz$NaOwD$(JRdxEZh*kc|4_bCzLg_dNyHL&oFZAH zHSOaSEau>w&@voQrl8|G8w^j35psunhdX`@_JIH7M4IMQ6x7dJ>-`F>=ir0%cV zcowpvVDF|VqiMpgJtkEJ|Nc58C~eA#4^HjZo8o}j(Gq^x=GLb0&U%l302LkyIn8}; z45oGRAM}a*5oo99z!h`=^LI6jGY{0V13VfP;L(7cy8k>q{I?qZMZxtStM&k&wnG-e z{0x0C)JC*b^}1C=m^6y&sbyjchYD?#irVrBhlyr{yIR>Uup}5C0(>iv&cv+q1=a6s zWBg>P77TebI}!M?`}M&h@a6LXZ-A0THDpMRBqD^ThC9qk+>SBog^L3_FVQlgmlL3h zbuv+VD6^RW*Tu1Ccwr9PkhAU8qVruZoQPNf9sndd>$`gspHhXlCgE0L&Xcpy`xv~q zZZ!613&pLjpHIJirs=|Xzz=)+>&NqD%ey#b1H=H*JyDS5#qUFD=5tTck9(=p%^!@GIy%LsR5j0!ImWDe8%0p`zaV&k9Z! z@Ijxj$?JldPBlDsnC6lt&MAj++9@r;Lb`Vm?bc3Mm=n={y9fWa;+3Q`D1E0eZ*zA{ z6~yUYo?ET=2t_C6!wL?SngFnBtaOP5L2%8`<#lfBZ(#w*H!QR{O>m*_DsEX*gqEDO zsP>|hsgH%QtJBUL+7^4@AFZ6enUuA}0i==%e}pBI>}6k^A9180){)3UZg}YlIVSXr zIc<@mT=YsMvy6~Bo7C=D(p!8Y<6C}2-b(2DhRkHo2vD401m7hp>LXDYz`a5GLCvi& zt3j%2S_Q_pF2Nc`)*fi}X%uR!iq$AU_7Kbuxztw`#25+z$z2k?E>7`<9IXA_D< z8c$r)UbcWwn8%?J)Fdv9n@1p8YzY>SShW-SR+_TY<#7R39#eV}Q{sWupe0+UI9T}cT{aMJN1#{6c^`!$`l{_*YwV1x+F0d8Dt z{ND7vt${B7r(!R28u0pwp+a9Ld?=}+Q;I^)da*($%^SWtwH;%;o`MzHvD7@X0yXNI z`=}FrUQUEcu88w}%;NF_LRkR2x(F9r@h0#wR7e5tJe;SMd}b&x#I#>}+xLywRAky^ zNik>@ln{A?R8hC2i=ZWOsabE$3pD(o4E(vA$l8hzoj;t3w8UY&mu0zQ7~+_tNuOgK zzv3(nK!1Ohc2Kh(CADIY-Im>2-y>*VX~xw|XAJ7q&*Jq6bvwoPLvQ-%@D5XN9sv6T zudKn$tfDy4j2v>@(UPxVOb26%;ZP2H9X}$~BqL>=lgucKs~Gt_;ru<^8s0_u<^wE# z8SwtA<^L<({ypQ^#xlVSFd~NRE^k=4B4ThjE)DNpRV()w?BP#RQLzPNqWfh93G@+= zk%!p9yYt@kKHu=~uHy8;qXZ=MX%Ldh#<>2eggI_z3tr}?QLW0ouXQ2oFg-N6v6&7d ze9mGanzmKO@L57bIoW1jL>LXdw7o@6{UY&-WQ6grPVN|AEIArLLfB;P3=QSTxRcY%qLPra1MbUO1p0sO z?*PylP@!Yzr#qgry?dQ|-*R{!K33D}fW#e0putXwEk-;I=^>rJr#l*w540~uGt$F2 zi=|f?77w(K)Z26COqSRc|B@?d$`JPA=Ns;0hNVj~U36nzq_P;{epW^qnbTCr&6u_a z87hb?sQba0mN{##w0?D+L-ixn|G^=KMU*z&Lyqo4?hRSwcN1EqZVB()X`%x>LlU1u!3YYX~E4^Q{))oGk& z=v=Vf#f)jFQg?&k&VsCWjSbf!mIC`1!DC?x<=imEq*&+6PPN^A#?u0E+x3W&MS=jC z9Oc0qj{}Cqvsw}>5X-*iMX6Hu>`;s3!kdo>b>4lx+R{S1I?I^_=-Ql1~!gY!fM~HDo_@F*;j*C7&jbsXIUxL31}q2w`-hJwl?Olw$b8 z2KlXWUbd<+Mo@uS8rBBwEcN?Mg%mu;MO$ukhSij00xNIL(QF+&R>lo|aak9LcSU7W z@xbk+BdAy@}ycRnfp<4s-3Oq0tqj`P9erLbm#CeAY4K``^BUVYW zj_VrPN;xWO!FY2tfLT@ei7psVvus!sG2op7D7y zXAeJ~r=OqFJcvS!NGy!C4_=A!Vtm1g5xEH!UMF3{sqYtreZYMARx^G?@ws`A1pck?$Qip z#&*2uaD%8zQQx&(4~7nz`>X~QJk;Pkw^~T& zL{nt*Q6LJ5I+^MD!MexSBCUpV#p{u_{L=dIv~H&Pw>skK;2rIrSo%ja>k@BL5MELK6Q)!ydZJ(yHXC6rO5$XfjqGU;ZkooOCZ7qjh;$UA~v^yy9pfXvX%8BllU zK4iyn{Z-oUSCjyjURjGbfEwOpy*^^`e>8d=G{nKKv3G!&#RG86ysI>w%ZPw?7$%5MpIHaJxG zHlh7I`fC-n*|f{eA+A8t>Lx3!bU*#3cK+sHMW%09 z@_MN`(mE;sdIBcGZ=1XVN<)SikVQAxA7k5n`RqD@N@%Wz_DXiUIB~R6+$otv9g{(| zS43*mi?~W4n*^BwEu-;Y3N?jG$;NNr++V|qwiB)(S}Cn=^0usrwM4#&!C}OkX>b*7 zm<=rfgd5a#tR6Jb;I9)44N<1&af!iKwU^xbHfVMJZW-~LHPavMf>^c%clH!Sr_5A( zUO~YCUs*DUhy)!Ndwm_{H|shJ#TD*Bp?4>P0Xhc7AKV(^YY_T*&y3{J;)s%ovy@qb zKL-?)1jUEEIg9s}VTo;!%jBr_xSfa4=-)iMBFO?HvLwsrKCnGQJc4=;=nDLT?|%TR zm8>NR(z%5DM|0DQ_uG$Y7yN34j3ppae~nH51ak!Yl@G(@NJ}1^j#20pY(rWJ9owZ@ z_#IfmGJ7_D)VcBv%q4wIkU+cMgein^zqre`dh7<%PIBf#|L>M~j(~~S2yj3!fCK*H zsQKTP_VM0ihMZ56KEuMHTDylZZ%a%_4N$>< zpxXSuMgLpT8T0*LN1c3wRgr|@k#=%E`7k&|)r{o9XO&ikp&xTQd-43TJglFoG$Q_rI+>1>DueEAc^2@ILI9a}h>JELb$Qv5=+ z*FmixXh;k=)i~D3LQ)*YHt+Z4!*FNe|Ab~>HuQE&hmmWE6+c5t2T=eyr)FQlj&(lm=iOKxu{OejAnA8Y)$vd8+G ze}jXT;lz*@EU0Vg6)zS<*9|k8n6wap;gWL3o)XM48K)q&)~xmjpiw^_%UT`gIeRC% z(!t9Wvcgx7=E)8mNRqh^fEow7n?{sTKhS?^;hIzur|uzPe^J~it?;wGnq^Q9-03n6~PqVV&P*A9l@c`GNCk$|qEr&$H9SDIV1Fn-@ew8+1{t3Bogs zZPA)fTdn^52l@ml>>mFKz`hp%I61`sP1*m>um7R$80G&db$NUjq`|b4ZxPXK%R-r0(;?Yr1>Yd8Cydw; zZY%8k%;VDPokG3!MC@pGEf^6--Pe<9jbQs9rsvN5?t7l^b%mBir;{Qc+Q>k zEA9|KH2S{zF18h4^ZbF^L77EJACmCG%p=X{%&Z7qp^BEN!LlVj+4?6v3;t-LXAZzi zUI9bK|2k{^&m{OaUy=K(E##}qX-$>~)21p2B#wL(DW{~4WFl%NWfMalqIWoK_Dv;P z#JZBr>U1~O=@>j47!u{6XKi5WWUT#w`-E#7dDAPCwD?%-cHi}V-g3Ul;Mo1~;}h5b ze-#{QNCy#QEd01z;{>D~F%SV`xDm0h1c;vHCADc?CpF+0Yk(%zk|*;Vm9411XDNaS zl-jOyW)wxpS4+?&OwIkj`jVOrYau3R6m#7Y#SxJY1Bf7 zV9{KXcCD7AyL&5AU?)VO)iNO23QL-@RI+VzRC2l2VmLa^UA${G;1&T0E)lIg>S()`T z4^GBrJNM1mhGhxM6}JT%-nK56r@dCvk3>JovQQ9GkHo7mMaM@Lg_nmPU=BX&_fWPs zQ`Z`NA6BJhmi^e|3-z!^3b`?DKk01LsetSO-rQt-wl3BO*AS*YuW#3_5?G}TIen8%kX5eO_9*}N?# z-?%LuNoG%eMrNVEF;$IGOLEZ|YLoFLFbHgf$${q#Nb-*+m*PlDm^(^HP&`gam@Aq4 zK$Y*JW^Ru1(!T)VwSSiSU|vrowJPf)E0Bmi=QsFeczf8p*OYz^qPBwvEN~4YPk0{q z>w62Pozj?^9sr3e1=}}pH;4nWE6g9_r)~7yULU^ik~sju=i)`!X^7kRH(jy?WTNv7zo0|N+(&KruU*!h}2Nwaia|4HW1DAIL zrxyqB-C8<07wd{@5Ct!u?okT<8giTiv!@!QUG`U z|1IqPE$e?ev=V@q9KgS{_$v;~DkU;JkI%z7<~6Kmx(B96sY*pkb-g#&J)RLK|v;AM{A4ShU z`5A}sq10dEu%f$(83Fxa2G0|`{mbRCRJK=4a#RmF)vU(Aaf)Hv41~Aac7g251)JnF zxttfoc=#?l{@}eOd+)67S9;SL`S%^#aolO#2d_aPk%kldTxcjeL#~=sQm5%HokIWo~M{MKyhUih)X7TfkF{FbN zep^}r{-JE?ure5$@PqHK?9f36F3+&RLbLidr(SUGXHg^P`eKf7P^3b=#|$EwI~x_x zsJ@2x5_b}osW+ZF!frZ0WnHysoLuxuWRskbI$6Z`anc*S{No!O{BJRq`6SHMmffXZ zxg5I*SEwz4M<6BMSHGdr?SVH;NXjEBC1exHu4lEQQD(YK)|TI)?JF2(q)YdzEp3z& z<(sw3{hkdH$@}`YN)h2CZUk|bYCiq{o$^SO@f9onjzRSrB0>&Dfr4b`m*2`zh4CVN+g-=RI z#b;D!Lg&6ow4G$zbW&RH+PRd z4dJr6%N1ot%1KMt~;P?LAofc#&9;Tndo+NL%Lu0kU2Z*oZ^2Xlwm%cKx}5e(J`^A zh#`LTn@FMOv!^6C{A->hB}VoLEQ4wJY}CW!kS5V9V?NvY%!I~8gh6N!!upRMp4E@zdm%vJalpg-yWq+$PNs&ovi621|K~duUrawVU|KI~-omcs zjmUdOaW=fS-V~^KRhBh!!Mv z!B6B=Ln02QFCCRUS?l7F_w_x9g~oZ48`R1zu+C{Li)m;sY0Y2BfA84o0~KmYe%?GGpv zwU#18fCmT#3wVD`2<607gy^K?#Tou;*Z+c`r8hA(GX(Is0kVaO698X@-qz58Mp~wo zk-3p>hK_0v_&>74Uq6^^II=_lNP(y^fcKw2C@Uo*Ca)|;@8aPy?W^fbtl4c!!tmaF1%{^PsifE1se8L-CPyt%ay?!# zsZQD4q+@zL2~GTrX4wf}75-t<<}o>)Oke_rtI0?6jQLgZ-r?qT>dwj3aca$>6s}ns z=MB}34$p8K76l~^XnyR|aT4F=*wS@CG3dM)(dsE&2f)~L3(*vR@I_TG<&;wUo_(Xh z^Y~K+zxK}xxgK`+aM$LDX9lg?C1+i{IK~%Jlpi~noUyu*`VZthd@bq~MuD0c>O6Y+ zO}B386;VY*j#3mEf-GZk2C3I2pIUa2#0gFMgMm4Ms3*IKvQ|xcoU#h%q?)UfA6McZ z0#ionBM&W52*tgou(F^rYMQ+f%+bIbC66EU`g?aJ4aT2KG2jN=T5lnp z-6pz6DFPoRF8CU~%hT}FS^}i{9GvdcIt@{X+h?ww~y=79CfvFp|4&eq{o-QrPPp{`b><&-)M&0k*=OOwh6q;sMdVwVu zY}t#@+l8Go&Z**Qn-dRDtEwl?D% zv2=;`O1ceaz$;XzEoKZO9);Qe#-gfyOZWV6!lS?$H5S(RGzwslhfe%s`5W1kp<)iW z8@sL^arQuu^&r%|i&={ztJoya-NNLL4OB=Ho$U8;^oTZ>AC6LGgAd{LaAwbKm)r5POv%5Rn(;+2IBk0GKbn@cK z?&i{6x+bOavHf^b;U(vxA9Ma-*)?Img87|{@S<=6~>W%SbHCDVp&7Epha41 zztbiLO_zNkiC7E~&Z$s3H-3&z71s*r2v=Fz71CD=lIk@n=%mm}3!U-&9>{dQu~7V2 z(Nk`ESxAU+B}Z2e{tf!__$|#u>S(&jx10X?mwE>iBGtL~14M&v0xwP?x@@4J3=;vQ zeG7xQ{g9M@u8I@l^|?oy8Oo`?g0)j|gUv}PUaSBI>u;yFe7{D)wV>C?Ywl9NxgbPx zyg8ZGiK8M26*=5FVG26Ra8T;J@JLw6N$jiQ0zZFF%Iw%E5kj{B2w|mZx(aII9LTnb z2nxPFVp>T*cZ;6}s)Xpov|rB4p`8)Tf^m3z6bTV{M9b)H6yHi1{l|)IS_;9c87*M< zioI_$QHDsV95jsE7Ah~Fp{nEF@*xxq9 zX+72nEWfY511((3Jp21wpsUv|WFZD#*?VHgG$Qlv4@LB}tf9BEP>e-S8hdUt8y}S4 zX}dVNO`PuSf1@V>;UZzYL8H0U*=eb6GSnDdK-Uosq9D%QG}sFuN-AC!w=OH*g6&-t z13FF(K7!<-Y?--acc4W4%8L?dMI2mywFDS;Sz`GFzbSE(&QBEeV?=TCpo&GacU4+6lcT%&Hgh!o} zX0xYv1W;peC}D_92EsugrR)yeug z>eyd~X_@3)L_*fBrj$tVHdjk{S<8GF-KBB%@kq8i{IV#sFd$%$Cwz1BNlzZ8o=|TD zNsqp;AN`McarLNP1A^n&BRJEFj%1am6t^6_{v14CnA%Og*VhkXFpUt{#-j~+RgDITLbr@DTSbj}B<_2%E zpN|w3st}6&m0GHCG@jaGWBEy0G#b49?07y*m~5gY)}Xm_lMYGwMG`Sim+@`K=DeaV zOD{d3h8m(k6ln?+t<8`(I3fi?S$7!6j(`A3IR)uk167UB_X(omM(V8zb1+ud{*uiH z=3;A2c*LmVB7wXQ1EOK$I_r=N8IpBwRVM zi&T0Kw|x}}4*w5jX8{&f^EGggl#)goN$Hf54wY_DLM4{&P6=s5N=mTkPH8Ctm2M=Y zRk{QOLGhdQRsZkGg70^qXWiAu`3D>`)|Ij>bmwI z)T9bk_jBxkflv5b)*I{^Q+G^+sw|$f_G$){tP__?D9c}*vR0Zi!A|dPt)U7gYWj|j zJ^BG>yhCdN6OD~C!tB`v?b~0kX;YzRNf&)aa}C&&;nteTuQRMJeywnf zvqimJG_*~`zBhjAW zy%iptQ^vp7kkXXpE}l;Rs zBbIvdjcN2YIfT9V)k>l}XEcwT+bf}qw=TWV%^Vb<-Mv)(AxYxNXGS@O+6FF}1;}M9 zN$bjKM`{ynE}uGr)cYTplbHmi-&_+rs%gGO)Uu!AaTaXbRqybxM-^ayT3oX7oucf% zPwI%1Tnx&!z3Ju)cC=6H2X0;*S(md%5!0nhrYds!zQ7bGtSTu`Wbk3epM+nSmviuf zs1#STYBmFfh7Kwp)!d@P`>(4ZT~UGkO?DKKH1Sk+ijeH{a*38-PO}9JfzfCr&@~ZJ%(PB$TKT$nzU1qPf?UFm;?iIBv zflRcz{_H7dt~Hq_Xyp@IEnV1=7M|&x{kKrl^Oc9P?JSaxrq`LiEjn z&n@1%izj}SzAjru_&kj;X=D)c-TvGBi`X{8TsW>TqoR_B66a$~P@@!QYoh=jcJ8!wJ|GNa&JK% zh+KQzCW<`sy2<`=Ihx|60=2k|f**1$vy(JkX~?ygZM2a0Tei;U?$K3;Z+KqKbe4L` z%Hf6^QSkMecQaOCx{^f4yH(!FqDj>h6Sl|EUb6c;$wN94wN7SIZL)@rFZD)ziG$_o z!@Fozc^4Cc#X5|6&V25lcI&))hb19r2(*J}gAa%**Dm4i5l_6v-v1<%#(BLExzF9< z`3>U5z7+cxL~47F<6gwEzg*A0CdL~TYncC%e_!m{rbKX}QmYN-T>Z>f@(m_g8)J+W zy;wAy`f2$vjc!W4jg}prlHA8CN!aZ-R4l;DJzddou&y8*3p^jUYkrBtpnhTE2qBQr zPQvDHwyi8;jJ46tr1Qo$k=yGYmr2~{4d=}2bulz{ZP`j2f#DNyq8B(`|b^Uh7Oq0*0 z)#+$q`rXTqy)Q^OO_&iW<#`Z465Nqq-ZvGjUK(7F%6?pG`5!n zd|w`1bS^}~T_;yOUx`rPM@G7cmqjnZzlz>KBeMAx4FyxDzHSN|uV*e`f~rylb01aY z`G(=tg(mE07hiflmpX_DsUwXl7CRTrx3sYJp0nSXzo9W(M`FJ25KYlxk{pYg5esR< zvt=cuKl5IpUh|EB<%B#piG=t|+d~@BK|O|q*k_D<`swP{@X`*4URTjcT=Bb&crQ>Q z8_AIQswriSRjCFm(()VdXq0dvr{LM|4Cs!-8+e-;zHesxV$ssY#TCzMh+&z{)ULGe zb6mG^Bino?`{G+;cl9_Hn?t*q*s2feGdqjP^4u5eBytzs6z$^}$rOuG6&0kcjBhO3 z3mz5R9jHCDI5lyFfPhgZ^iu*e1t`i1o?TSzC04l=Q#YL6L#b*i+>Je9>s_zv= zb;_T2XVLK-S!M{v*`QURU|!1@iXE^PHURGnOjD;#A>}yAq5e*2;96W4$D#Q)q-t%NP_D6tx$Z$%WHBdV131m~YhAGW3|WCZt}m5V@a;EF<(i^RV+v$o8HY zhwFye0k`m%ZH`L`*KvCt%~xMQGKaI9sW8qD>$W+(`4(~B0PHMNpfh=@rC@Ynh$+cj z#JfBB;A{x}NZ6QzVZeLcSShA~Bq{lf*0=7HbQWH1-&gSMow14*)!2#+13ttOiVbOU zl}7pT_2yO3pnlLc!P*UJnaUBrV{c9IlrB+cW|_4rRcS>Mf%|=cb`t}_Lz!C1p(_t; zD~*i(W-}(FTH4MWnsw*7-p?d6iDXmkaxw4HI5Oz3aVo&NK$60kUUD^mRQ;}Fis1Bw zri8m}fSOh1Bl7a~`C9~i>gmfHbt23OVea9G6|GjSxeVbSbO{i3%j)X~nXWtHqG#W@ z97FiH_Kn``q{tg07yF=Gf}+CCsd=JEt%hFhjZ&nmFQhCRMgog2C8Us_@wQGfv8kMV zr%7RD;$6ZNP*HLawwi1ZZ}j^N-+GYW&lD=esjqSVm| zvJWOgv*PR%E}wabFSD5pLg{kr8CP`moNQwLoR9)Hm3)C60H~bIqYO zaK5YQLQAWV<#rEip5myOGJ9p;ZBZmj;!{e$w6n4L&G(`tX4O8A-@QY#Ve7dZBO7G4 zv!2<#lFloVdG7m;RY+raQS+*@%B{gxg<&F!g`=gn=B9qWX@@TNG#@gT7Ke%5`6^+` zo{J~q{x(7^^~s}0_2P&7vm`t?o>#B>WXMZ!4G3A!(p^;Od@ZGEg1wGX2_Uih2U z%v@_C$e^{(&3NEfm`X}&K4@(mhmE78H8w7_8{Kg(+B2!kNn%o(p6RT`9Arm&fg-v!6u`EV5YrtVM*K zg{cxZ(>ldSZJdaB3t6XaI=bT%GLv~jwqGG~rQT6jG8!w@!=bMP7(uI=WOuVA1#RvH z2@SEUt;7_F>2vzTd|QTWvOHF!D%`yA=@Txk%Dt>Zqi9Vsj@$JKizH&aI4wT1orss$ zV>5Z*dJ!b6?QwN(8lCO$zRJXs8byBzk-;XRP$ia8y^FwPvV`pnvr>nEezqzXO;3OI zKFckLVB9-F7e*CsRF38HJ}r(JanmtV#~${A#cwig=dNgbRz5bnb~U#$G2~J^qklT- zhux1+=jW=omv2AR&3ym)!)BCU(u-ROga`)@vm%m4jXznJ7wHFcX2{{5DcH0S-5YV@ zsV`lK7R~r%uL2@l5>>~0qBnn$tD(xG-Wb^ge(?bU7kIj|Q z!WR>#Zl+fi>cp+u8AeMWh1DP)5Pr?%)4tut*r#wwFFQeVTRP#8jai(!u%?P5R8SBF zwUL%{n#h%IS}Z`1ijX4&9eEQ8gE^D7y3()~p+FgC(M>LP_U?MXZ+S|0h zLbTR98ZR^ASr%ticc4hv@Jr?<*126@ol5WsLyN$`c64!oa@x|UR&umti$;)xWnYll zpo%3op&&7MH8Z?)lrh4flGWO_RXfnB>jMryo=CYUDkNrBqnSY?IX&ezT2gz9{Nsql zd~UsWsHu%87L`59TDVUYCrQ&>$sgljJSY_q=X-3(wpdta*{yT!J5qd=eT0~2W44$Q z+J}gdyf%xpk;k7=V&&L$wq+|(bqa7CV%@r~RU>^q!^xUZ`G z&$6donW_vh%bnsXx`Z7bz7Wa4rDC*VJCwJgYxh7m^W7A?9=QXuLVcsg+zk$gnN*D) za;aV_rYU9yzqkF>sjr3KosBaKEp_N@?7QN9Xx)ia(wS0=z^=^x(KWDgS%iUcfbWYt zvohh8U3)qQUPk36qed~g{-ywe4u8@w3c`sL@`K^y@r9xos75B)x~i!XUt$R@aQvJ2 zDJaO*Q47`#uUltYRMO3s#$a7tDfWqwa0*>6i46Em#lnw*w;BqF`c*R4ZM`<;w#;)DvFp;Esoo&J@WL5o>3e6T=ge%A(eBf zcS(YjjE%#an&t%vyD4fdSq|nj1IEa_-YEpUjy1d*N+IabWWR7tGQD!hLHdCYe^8c% zb|?Q9J{RV#dYpH16@FA-<7~fpt607adUWp1YL4P$q}W=AbT2`=ZGal9XsC>3s6h;2 zu@x$DOa+ggH>2@&1$KpVn2Gm2Z`V6Xb#cmeVVGi`ZNALr7uW4V7J=`^w%sN=n@8=T zSL1PSn}NyhOq@vna8MQz)9}5UtH?bbSiMIZ1MFH$tt>(1LiN=5V@%at-dC%pG8%Un zwee>!aL@{8FunSAhlN}Dd3M$o2OIWN2i%ItQU5P3`Lj6sBj;IkRU$u&Z2CC&Bg79X zQ%f>XCt)ipa%kJsb+}Zw2B?zVp)!4_fx~vCcg(Y@zuHaBR0yqkd->@3SO|gm_PdU{ z+b%afO5^*}UWhf^uUH|^DW+V`jm0E?^u$p^E3D^+_;ZUwUR!AiS!c#aDah!QFC`TU z9j$E=6mfH^BwDGi(J+5gt6qH~n-F1~cxf`Y2*v;DUSA(AZaw1ca<|^W#0wu1?>sxp z-j~a=O@!mbE^JRNZQn5QS!JX5FcM2BnsT3gA3J%QaXdwEVKlS~IiOORvaJszV1Uj1 zQQrQImvY2?#e0?66il1wg;GHz0W z={(bDyG*cmt`CWt60@5(hqE@JdTEu;&1?HqV|qG)_^#nIA%YKC8~XA}1BH*&YjNoY zUl!}68sBex*0jV`jl-xo$Bt1}F>;yt{MiFpUgH8I`${VhwvSO_oKi%S zwmVfMXCQ%X49n$4=t$>w#Dk+I+4M)RTwhu>8}gbXy!E&^ zsX!dQTPJ8j*5G=ERhPm|m?y@ZW8{qT(op#~#-q9{2?+Ci7r_{f_E(}Mn(=E1S zB7#fIMg0n;`WA=sOYa1qLC#*uM%)kcvhvkhtLXib3KWyyyZy@MMmb$L z@|0xa13x!D7euL%HPPX(m+oU(lIZgfv-YdG6j6#1?VER`QQfgu+Z)x@mTW9JKc3<0k^5jqRKgC=%SKsaFcSqL6l4Q1u+OxeH-f% zw)W90ri(PBR>;L;4`&ZZ*O7`u>^JzLsfM?`<~;SL6RoR=XBg$;<3G;L*5lawKSFLx zz30fQY~HT#tzb+M!t$`8|6E3^gJfI0jI&>(PHPs$#ybA7P*J+KRJINzgl~ zjrm9>aoHXM6B|0)|z_kCaBYB)O=r)^ONGo`Gj}UePZ4uP%X+XxP&?8Dl)}uJWRW8i%;2G3FlGF4uY{=C1F0CC6yTSvhgGa?Qm?`nK}-Ly9AjYFn*rNMEzt zGl|ZA92c;fzR48s9D{$|As2%MS?g>#;YaPz)hC5FA4V%wIH?fnrGxmcKEbWGG*Y8BZP^W4Hw)kQ zM6?9g3A|3ZhZoEc7#eASr>Qjd*>ga@Sl2y?gQxa|kPeMuelv#g(yOOpQjr)v(@y$-o~XlK8 z82h#_$B}UION*Ouzuj-UMmo`C))v9y@-|>gl5XiPZ?DXvw&U2PDean?OXt^g(_Qy% zlk?O|Y8DVyr_71@7U>%`VxBo4zPe&nPU*QC&`DJm*}TglgC;0$G>adc`5e(Re>}+X zwKDkx%??8ZRk^zXIu93krw;{_#MAe;5RotUA5M)gL|Ka}R&>d5y<&92MRMVZwedT+ zsztRPe-)43>OoWFtD;?E%7YsM2Sbgk&(ewaVw3LKG1k|;5qMYY7}?*aj%35x*A{SS zjY8*uW633vJ#sKhRbOGsOSU$cs7oDMWYfL-rBeJ;p?um>LC6AH`r@`pQz2sp&&E-w ziM`Y12;0{!`A30qhQ1}D%GO?Z6TU@d*~aUFZeKYqFYSe0k#Iw|Juey6{c2oI_A&NE zPyc>H;=88ZJ9SiDSNPhRiyXhpoU55RPhL3xa>I&pK0{VtuS($gSr4Zw0VCGuM`Zqz zeZ9yAZ-YmdGQPhJY0ii|TdmcB%}s_*`dEmp*gU;zx!Eo6+j53h$HD}6)!Izz0%yV{ z^D8NY1|QJVvdy}tvbis+E-4^6+EWuw@U^;4G!F@UQ}Ye5c3%xy!rI; z+q*ls6!+MCyE57hsz;v=s>JQ-mp{y(Dj?YkU-~Y-yS0-MB_`z^@0pl*j-Xb%VP28X z=V=80`SxeG8@*%D;#l1hlSB<7QdsWxcP)|yUP$f_K#F0?%C30K@93%a;nkfm+og-u zHA)-Hd(AsG^)~2^_ue-rWbCJ>r|ZdSEtkeKQ)wIpA+5cC;DmH@*aRhIV3jl8(bR^y z7Td`=pq4Y}Fb{|N!$Q}$Vn$xiD#3{6l<|IdbdEEhImNen9ZRkx4q;6^OJmuP?XHO> zHo?$(5ijXrlGLHqQ7rUSz3V`ylV_wP=Cvq?_(+;Z=) z^l9@XnL9GqBbX+mWaY#L%g3xn!+ckjXs%y+oe(m|9nSPQlFJ+(^Oy{9Gb zVkId#|0ijdN=z!RuQug|i#BP|8D#f0=D+lSC!Qe>c!L<))A6LES7X2^s#?hvB~OEajndg^47JS8*Nl9wcVjUdRcr_4tM=_vdfk4T8g1r8XEEl2 zqQLsS^3Ef&ZT0~9c)qteFNp`}LK-i>S9#K;D%a`0_VlHBTJ}2>u$2E+;H4(>wT-Xo zM8G=6<)Vsj{PYy)nXZ1$^uv8&68$;ejCoBee6nxbP+A60+=M|bEp~d$AwWri%?Ov% zjkILteSWxP4}HeM^)fB>4LtRcO>lrk2eMb4FOG`Fg}4 z&Th-?h$+36K6AE(^Fn3)ZN|Rss18x?Eni2;kDZsmuOQ>w>b3u5)wq$s!HkvJKo1VTdQ@yvsdYu$4*M>d;1 zp@2lBHx=YZ^4f6AX@Mf1)nG|wrQ><*Rqqep^;_E(q}X5XNMi1Ha0ExnxxHg6bpKBE zG7)>iDDm30VWL7S(xCPDxCvFA&Zrqn6E7RK4&8T|pOz=c`K05+O~@!d?u=L6luDxa z2;^+ZfBY2n!)T)A_2+&H)_N)~>3YV8jYJf$tI_Y&Aiu~ZLc3MwQ~7Q_@$!51m0pL@ zF!~FxIsJ-*W^Z-my{rF@m2^n?QsWaZ=YGFzkqSF)H4$jvxuw%USfjDR}saZ z-7e9)7&D0mnVI_{sX1PG%Azvzj^{3<@!Q;E;s>K=vZup*hAKQI(1oKyuGqe4M0`i^ zxX7I>phJ1VvP3yTgiwt8Wx7Z3C|4`yo-FzchKD!0J7b(~^u6RC$y}kb+v%ODGSzoA zFmyTq$BlDD_FIOb-?2AOewRtF&&0>6+T~7x@4K(R;Z3#dx$_ zQ??&lW=6EAA5g!*&ZB07$egzyEsh-?&HXUjNi-}IhakPpZiTht%djqiQT3Gq&+PMl zm!RyD>yFPponG;SCn%3_O15;9Lkbor%t*i1lBitRaQRNRoXI{PWi)h_Tq^hhh*Fr;8o>ELpR>;!kS!5gs+_U>Wg-*4)-`M9C}Q9HyEgU5st^SJ;g@ zJS#UiYw|WC&H9^^jiOgz{=pSIzGqQfJFWq%8KneRcP9g;*6He|N5Rn_;3pN0SKlbo zKR;=`Mn|Rp`3ZL1jne(|lg{hisPT`V$}x|?GsuP|dVLcFCMslJ0pMqJ0m+zf_y~je z;-j-+DdXg^uj!vf=;V*tZ;hvIS1t8C4K={<6p8zwkg%?;=A7ptpV_JW#HSM1w)V?f z_Q7&iXZ(}L^cNoVl-(M$Za6T!X}$eeN1w}m|HZ{`2=WW+E%7V(!Vg?&NW5-;tR;{S zvxzxhIZ+3qw^@(4a+AL*dq3K!Ys^hBerI1EFm|^v zeF9BC`IhXE>hRoMxhjn+-GwysB8;BPhLZT#+*uB)z58A9GynZ;8q|Si&y)Fn2G438 zf_?rl4rFF(?`UTPVF!P@T0oy*aJR7@)={z}7r?DQ)KT11C$G?U^<+LX;eR2w5^(~b zjY0PIc|cdnJuJimsKAtv{JbE`W=K>EvEi`9kOVdM4;oax*9 zY-b+ic2w)@U!gYh{d^QErcY_`bzp^(67d`M>rKJO&AZ>McaZ0q+{r}miAUb%dhC6t zwyx$;&17A(`SNGeDmRU4N`rG(RU8CGRX^x%%i7Kgiu${mEtqkQuo0mvn)+n=>mgZ- zEd=mJFa}#)XrktN+W+*Xk+yWVW1yy7MC|7w3hN&1KFNRq^ep)XBg>L z?QH2q%=3=MmsD6*l;4`a?!PVQ{5nd50U2-J+16+IS(-4Ta2TRkeg_hfHMaVVoKU$$ z(uS<-x-+pnobm(Lvd~%O+mVI^5mD3`MPudJ(vj}nf3QNMNshtR*Hg&eeR#+BLK3%= z?I*z&$k%xG8*Kfb6^a$7GdIa|H$Qys^hlkMLiWaHP-rYgS#D@TA^7H%_kG@(a6(5x zKPyyEr^gCKDUA8a_Rw8)MiL^)CaD+_hU9bdETjTO$getC+?(0UkGvSlYeSWKnhAVA zT)bel%S7lK_i%zJdG0}=f^7V7IDepRjL`F|5Q}Du2)1rfeS3n*$ww1!TI|N9+tJiB z&SRyPFr-UGdY@&E*t=8i>KhD}WXio~w0V@QS(=@FqQ+dDhor7hp_A*A=vh|0CpC>O zNFl$-Y3E5hC^R9+G>~nh<6JY5if@w3OCFcHDI)X`CvxT--^HBZXKWYJ>x4>TUnG~w zM89Y26#1O$U94S1f7YeTQlUfDf3T(&?TWf!1xMXx;oS7Ffo8EuLeHCYgPfaeH~f`@o=;v79O6{ttu!flF!1_g zMt9sgLl5IQfi(E_FTni-g!>V=E~M8NFW;FuA+3>B%52R%HH{R-DI-$lEpG5 zv*b6QZ#2Ja(cn}gu>FjykmJes#&$S7OLXi($k3zmDm$mheleu`1xh(+(M$iDrrzIM64M9vHJ`CXzs4l`EB`V*P+__sp0;96iCwT z;vS6@*6^_#ccmclO>*CMV`|^?SW<`OOyP8{S6n<#Vn~7Lp0O5}RRZa?WK@zX97WE; z+2BdLK#(H;3Wv@$W^2cgKe?h`M@$44nRGKJ@0>YSu`XUx{pRdU@qg3=C)!N$LxvFH9M6EGMW_?SvuJF4K zyMoryQB?TSnRD8M_6IfLccm}+kbf%Ibd4CBx-)rp|1rzPI|I#^1LD%3N?g6t?+|}+ zZC}%{SLuqfiJv6$TsuOAeI`naE8+gWJPmvX#FGY6KjS8DPg9b#$poz(psT>W@&c(9sc8Z}*e6?du+tTsTtsjw2pg5oI+=Q;ET2+X6VP6tmhtng1 zE!P=AbqF)VYHpZ(!^&uA7!?QgWsl5l=yBngOV&{PACx^=Ur zJ}Q;nQ7`8ZrD=}g&a(C`J)*M<4)z&jXI3U59!$>{yU){Tv(%^Yrbg>$f{jAP+~#+b zh1oFJqls0jXvC0>LZjnAIaf$LVEX~|lK2q_-S&9?GQ>2I)SXV-GO5?U(qRn-5vJ5D9;x_d--!o(c*FW*2wXaTha75sgj1HXPpV>X81 z*jUb!|1-t$|7>h$!{Ov&3*t5l>r?K89@qFsF)(-jI9LZ3f{ri<&e^Oqp%`xf+vhrf z6Lb7`h&>PsL;{a=tn4QE3BOr?$51|BLLZTtac+nEt!#9)Qt*pt_sMXYi{@cvW9k_+ z>aO<;zx#xoYj?zd-ubnieq;Wf*SU?%;EfFoN#cS5{dTwhJ1!1 zHG1=oMomQ>v^+t*d*{iFo3msOC*%7WXPyRH5}o&!-mY5~ia4Ac;IIp|#DuRh2g^f@D>+^GT6ng6&pdii zvV)hBD9|NS6BvmG3v^4^MpL>-<>L7i=M+D*cGWPd2Ihw28K^Xt4dJHSH-#E%&1Rf` zUFPUT-TU1>Sd6Egh2;%Ilt_djTLhxc`>EY5M1)R0oMxEy#MYP45*ASPkasn2e|*1NzQ-xK?g33yOb`(@uD;*V3L+z*MEEe;}kuE(SEr_&0dob4%o zU0TE2Qw}Ibn(rl*G6k4jo*XMAjz`FMs>8rVZ>uV7F}Peekud zz)(HSAHyNr31Ua!i09mdY*r|R#c(zGO{(RBs>k>lyNFO9rgWU#bIy~U>>nquqT6~! zzMO1&u*v7`hq=&`L@8p3nONc#vPd{AO?O#a!P%?t!C@bJxj_9`ME`xnh)Dl{(05va zkf<4}IAiODWs??z3t4a9&m4uzS329G52($II8Ou=4SJ-D?>bw4S)F)+|Aw+?{WjO~ zUPx$P?i@SKZrvLk#4f)8j--3cr)MZ zcV$)8ldmqWp4i<1IMqY1a4zO&ebHNURf)GF{@!fR_;%$|%M!O_75DWQ`(=9&&W6Do ze2$Vh{g)++)fxp-wemPr%J2?!3am&;9z+-ptV%Vxj-_Uyva;9@-I(X=vwKe6c<%{z zoas_MeI$7miz+@|hp^*fNc*eDB!`GJOoPq0(KZcmm!&Wb$7}9RfO805S|l8ex<2pU z;Ic<`akTf~QGBN@ZmxrYG~#E(uf9U-TGbjL>gLF?XN4RsPerud(aq=9_Q;-&3==!B zuzjpD$e$^W(&c?^ejl0d(7nB;tr^45&vu*I=xC@(J_o;S8VSv4m2tmKKlP>1hwS@T zH%wL>ukWj#LAKblQ3>asKX|-F&D?e|P|clC%;3=1olWb@*LL|@E|tB&+)q2v1?p@= zT?6~=9Zq}({@WWYmB=2~0wnIsD~+K|Ij&fX2%S$&^}S|VbD1o#RJF}K$jXYc(D1&6 zV4<1t$h13Y*L%$w1C*`95GxCjnbi^;48vh}kBdYPRTsz(3oW{XR&MU=zr<3SL~ zMjfd)e8nBQWpX{zIewhRWPk-LZZ|i+ZM1DK&IV-Sl2HZ=?taKH_N=#mlu39gZ_KD< zI<}tbF`Lkn;rMSHgYJ@-NiR2pt)ONB-7630iK52^IKtmotPOoKeG!cGmQO`7&{S|= z4o}4G@Y|J^y?JRQ+56^bH@{AyFJccO4DaIA&3_FEiO0s|F}yTBCP(4AH_NB^aP2BY z-}@Yjk8s_`kai#RXP=ZX9yZp_%G~z51u1A9M2lMNTbkI-D;>&Muwt)SGF@rr`*eo< ztRqi^>w5jNqMUEm))_-Oy^n@--$RhTD?g*P&odbJtEKT#OfeLkn#k_V`Tl!2MMwAo zMnb7HiD^?X0$PF3rT^bZ2!a-Sh@-Ow#7Vq9 zD-qT`LM)}id+ddZY(!`Dr3mj~VJTI2s7HkJZf{#-?<(%zs~(8>q<|@+VI8;av>UFl zz2iv0>r{;&AOvp{FR?tp%S z?7`0qTJR^p1rZ3)@&82q^A7Z1H~bJ4db~XJ4iN3Y+yy-i{P%wZKd^uQ1zL{qzwY`O zBmJ+yKX1i{xfSx~trj3Tc52b&F!#s9y&w33vz@UWG+6tug7o|eaX`BYuO`rQaD!3kpMXneZg!Ri_n z?U%BCR2=f-of`ks8#)5C{p#Gr5v2js#sJ{t&~EA1mEnI0+z#WmKiaR%KSz=LbEqOc zH;1vcp_9{}P)U8-U_<~#15k!vMDU&A{}A+_$DwjclB&OmJjapHj?Fe+P2e>^z5&P! zFvuxj?&C-mYmiOVggDy3$IXN^e8K`aSJ02rz~J746zy@GhMlAH$uy%Tz2sa#vjyHw z3q#`oCOJ-1hd6oI8p{|u8y=SqYLp{1B;h&Wj8))}A9@%b32?IGJgEMp>`XjV4IO{J z_vhahfvOKOXNNHj>RJtq3Oxk(*OlRa85rm|@pm_?Y-j^mbE zU|6 zH9FuwCC8MY&V4HJ=gDyzV1ehDs8D-}-F@466)3?4xS}A85*k3L^A{y(7&=)?f)NG0 z@y5c~(AmxrUaNwN-$2_$Ukm86Kq)*hrRZHgwUlEe9IpkGKQ=z;`3xvK1@t@62<_LE z;SUixmH$5iJ_U-B0E(jf#RuOR{x>8}E#f4T&fR4jo(K9E0CGbQ z!uxe)_zPb-6?g^WY-}#)41v=>Kn1<~={GM;)a|d8(T>%D!HQpi}JoLYVcwYF%TU*s@JqKC{7iiV=zug$x z^cWcbhJ;TfZat8Y0YoZ5q=O;4UOb8T;{{Lff-GpQ`=l1AAAnlt11M~*4_V*>!3e;QzehtvYodkbd|dT^Mhi3RipDaWf0?G@79-V0*_ z+vo!G!z#0z9UfNQ!pz*+iT=meaUxVuMK9(%0ifOjfCyW6GH!Upe_NdEI1(yk>LH^& zblL{Z!NA&Qnin4OhMfyIocV-_8&t-MC1#>T(Ebm>a4ZC4@CAN&K&XsA!*}{0V-6T9 zO)ab;rzjU%%+A~=&lxP72`rS@6cPO{7!VzfDR)icFGTJWrrD(e z?2LkE5fIkEBonqrsgynmDQ9c%;{4BGzV6XQ;NM4xg*Cm{U`zheR+r-K93`?3XQGK9*^PsP^G_toK z?M?-w46#S>i2wA9$5~M6(DCe$D1mgu$E4FwhsXMtbb|1SAyr3Z^2To3Q8sY%?+j|zC8*1kC(z1bH|e4qdG7$3+bQr&bxF5PIM{vzo8mFkd&*c<`eL8 z=sU|`Z6hiL7YN3dpUsE|&iDs)AhTfV5D8#z`C|^`2*Q@*nW29<&?Wdn=Hl@8J^%u` zfkBWF#=Up0z$5-NiJ}F_KO3IV!M(`rP5uljj(W@~yTF#BQ>Eku;Z&p$d}8ISdcFv#cpIoV>@282H z5tZyrEKDsRCK?tX^8kP41X}AU4cCt(04oTvu!1u9z{CE_+9z~8L`x!*HGp^vgr|H#ovNDUAkKpg**S~iCX$2X>hJ2ff%TS|=C+#mf@?nZ!IqI;oUno&#S$eR8jK5I`?b33@NsnQ=DGN$CIC z^*_i?{`yHD^j)9OK@7Gn?Gv3;02pb1mjPewVT7_>DnK*@dWUUGHY6uffm#2PQQxYS zrx}8jQ4I|O0*F$7Um5A<9;oT0 ztu4TM_Z359kc9Do4?oHiAp!G31a{Doi~SZ7+DmnF{y*UK{}c*xQ~x|*2X_IVvu>cu z5Daq5Agc&#MFgJzQWpFg5U4bwe*%L88c;Uuq#|1o9#u)^gxK)nbX4papo-hz1Dnzq zko*JmV{h4MYnh^V3peP2N=HFg4Uz`GuMB@&X?QFhM+;{|BWs8Tc)}H8as~9I@GDzJ z{6$6>$X5$x&RvsvvxN_rUD&Q*A{evhUq z0PkU!`cpnK1$e|?$xQgQCAegw0+RP|0_ByMzVb~6>C3xd>5vwt z#^-ELBA%8VvA^S|TnZd-8mJF8Zu=B)67SUXjgpz6X9O@wE@<$u27V9n5impK4=2=w z*w~-qF1Q&Iw{7r}7uU7cR^B2!OGU6gV!dOKi--gKKI12bU-*_K)EQ(mnv%fE|0R zz|!k+iKW#Qulzk49}b_fy$ST711ty|_$;i$qyE#qOL;g$Bpn?MJ^o(6EuoJ$lK~vM zj>8CJ#DqYv zVck>o0z9zVe_-+nX{$gtU*Z6_hh-+y!(&SQ2PQQ!gsUGg$$_k}wx?x;$5aAi0o0jJ znke@M-uTW57Fmp6{;5#ji|}~A9s_{-)U|*1^B;FAXnYcpOH}Ctti%IG8Q2+ke(-5v zX*+9c2sF&UV&`aM=zL<{_Y=J+f+J8Ybb~kS9y@pNB*<~6{UtbXv!DAfpw0H5$AnH& z&O*VvFfc7fpaG%2=x<+xMhRj`rm z>PXw!fZf*4f1$6xb#od8!6J0{=qLL+0Olk;PLFr4F&NbNvqiS?? z1-N+7c%jpth9Z<3@W?+j3!bO?O9TmVCJjjd4rmUv3)=%l zZo7oCq>F5Ho$Ny|RgRgo&LErZiKzfiY`D47kvjeXvm?^YHWKphZ#ve};vY9m0cZY5fOiM!jh^F7Uc0Q2mQA zo+o?;1&*YO7PkK(lzc;!-QWl6uMTDbu<=SXGCbY|4ly)=rjelC z1$=)cugCwC4@i691BSKVSBC!pICt&1Yr$(Z#_UmK+p%hKCD(u2u>{r9QFZUE4}CvLQBASTA;zf zI^6#?b}nF1Ra+b%U--USqWBhYK=X|nJ`jy(p@Pu_u+ zFF?!w4*OAfHNa0DnLbCCCT2Fc);X{v#C#EA@^oc`9!gAubrMO;N=-(=z5;jr!YONQ zvidPub$yh$l1I$SQ8LwSU2R@Fm?;#-=gkks5n$%P0w)uT>3>4kVJ^hn4VCiduM2cy z(n;FTq!a`WRD9`X9*RBLtOE7&np}K&YC3+XfE$v73u#<3=d{+`_jvi6d!fH_e0gem z{V)MYu?&e=i#pyKIS>t{wJRU8mkbxM>={}&P4(>T<4aAYq8Bb<{a^t#1glESe6yGpIa0uiQDRYR%R85ktw18_5XNL)@Udi+fMsv3t6&5h+^Nq9GnN}MAaU5v zSOH8q`A)F3k_!Wl!4B!@ciyaTq`xYFIg&fu8-_Y?MRDEEz8Aa_j6Xu;O_&)tH$7Lttt)bN(^qyDO<0iuE=tv$ zLWLD`1zcNiR)LZd8ce_YbsnH}LK?pA_~5`*fdGm_%-QOJG(igtqXG^BdI?aRJ#&04 z=06J?+3pB1AWrTdhsgkED6|UYLdzD`F1r6bwuKOKpt{2Gv6$}`F^<|^%l7%j6?9r4 z4iOfLQ5_$PxzkDpK_^z(g)Hk9-ex}j_!E4QWpR8g=AK9nTkk!P+GN|O3CY8joVcIt z_e(obi@E3knuZmk<6|*ba#UnSQkuf4$0p}>PZmSPr_nOLxN5!8Nt~Qn#*`RiPMm2D zRnVwbTafXxceiQw0$eu_0}MA_c?l!iji*qC7u5U6<7JTWKah}57~xwOC&q}nA ztN1Go^6w`v^=l1F_Qi69&yDT2GOAS89&6H>1V$i`G1z<0VW=Kwn>5}I6Hq*qh}4SA zp0OrlPLgCzl`XE#Wgkv4gR%u*K95b?$!OBz2t7!_JxH=?Tke#YA=M!l#dRoUESsm< z*5fLQBeQz-Y<&4Dh)GZ$_uuQg7*&4gz}0_Az#H?5E`EiE(h{5p(hojmsAsP5^*ejy z6Kq6Fn@-&48hyrycArzI-19uYX*N!MXiCt~5N6c*I8iDyscT~khS4)j^Dap zQ5^12SacANDnnP{Y0=^PT_0DsNiUm1v~|A~EBoV|Q@L24XqGo~&UK7F;Q9=Q@O4cR zW3T+#X>B1y_re4?fN9Ed#1-qb0VR`POrMwY!OIUI@M|a<;tM0gF(o=}N4o_FMGp;L z3Io%C&ex%(Uo)^Q--rpuZ9G73{r%(A-b1`Knkpn8c~r5lcj6!iK(=>x8FmewdQD~iV=67 z5)|S$=>{??|P<2u}6jG$sufH+xEQX@#t(;f551)vsQbsp3XJY;w zg%Le!_EmEjlzb8@;k&BMJv`){-(f#eiER+oPS7Rm=TO~~@&o?SdC%tw@apR>nkZ?a z@Bo`8tUCtczOsD9lk6IZybs#oeI>Y!m>QCutk<%s$$rS8zaT z)<=Y9VLh-P3qme++sWbwFiVQ1?(xg&%m9pUk~Co{&MRz}(r9fJzDK*aO-@>wbJo)~G35#2^`H~o6PIvK<8 z2}jYeHC0sUM7laR>!V}EXu}me$Cr8go_dXi6Rur7 z;@%S&+vmYD#03kne8rsQ_*l$24Hz#@mzAqmI!tPQnl#}Wq?!h)_);_QIVXxWH>FVa z9n|d19vlkS?0|*%ihpby#<3?hwBo>$E~EXSY{ezIfQ0%5Z&|;#j5Qe-dJ69xA$?!& z@V}}NAW)W`C%UG$V-&kPx~iF6!_=^}M_V8gpdg-MIqStRQg%v9|GI)mo?ezaCJXw> zN=$$49M+-?OV^GJq>@*8;pocf6trmy1meR`ZCA#?DOlTSZ+ZSgd}#u;@>tnBk7(_5 z2OXe06K;z)16wBv_c_mBqNm+E14-+<_*Jf!0qrRa!R-?y*vQ;rm0`$87i0H<`$C~V zPR3*7Ri*YnUiD;PD-!R@460SwQ@mj!gX-MB44OrgBm4qt8?s zK;w&Vy;l#+Qz5iJ`^`zOVGyz{yp8W-RCP;{a^Eih^Xat za^7A+BAzXZP!_Ob`^(j1U=b>E;8s~4ECO2ZE^`x=l*iPcj-xc1c(j@;vdbtDv~C41 zY&hBG;U}l2_JE8>T^hbVRD_H(%}hsqqqyOu$dPdbCR<3*~UyUnv8SxeAq25&>uinZkz>E zL}=Ss5o0pURJ%v(?Z81hB7jUs^ZBgz>r@fe(R0+SPV%OFKR=xU@0+AsW~X_H3SgZc zwSLMjO4i@-R@kC1K&*tg+?O;nMO2DE#5yIKZlmTHU8%7hU+zl{QbjcDSS03An_q05 zb}<2MmQI7SHk;B!JnG_N8cFxvPZ!^ff+Mv+a)Y@JN}~>+H&TqoFxJXpRSw zt1?BjaSE5Okz}POR`jWY&Rzn~pS81nmWcH%{=LAvRR!I=@-3KJ#*D}jF>!jC*6J!F z#eo&^t&%{b3kJA#kLEI>JdD#S$8mrCar2@d(CU7Wkcaa#^BK<`b}5t`?KZp;`ztuL zWDVBRJX};D%MMDxs`W^c%KS$LnOC-BAmwVNU{K@+*-^xhwo&0(QqT|X4sJRPV#Y#+ zyaWIKI%C#te`=*o(1;A3xNw8I$o9SaFK+`e+QkhwyuqllT@|I;=a2Gk8WSNQuC;Iq zC5jg?)_B}apJ&WUkuil!8&YLYi-$Mu>$L-v&j;P#Vo+(b7K+SPxK4;#8)b<9)E}Tr za6zua{fijPx}ZR?7>PS^+!bw^-s{kE2J#Kb*z)3zs9nmaZcdkHr;hM_8BL|N1dspA z)-sN2o^Zywzg1VEeTyLxmuAR1MsaM>ikATE`nL@F87q;~KF-o4Y+#&86Qb$hg)4>3 zr+d(&Zz43_5&i}BI6fA0{w_wLT%Rj~j8^z(*)9syBGH-nNYorx5X<}Lvz)Xip*EfI z+I#{^_HY?F_I~C>v?c-+%2#U&Dkm%i2e(8xb@M%Y7$*v6ZPJo5q*J3RLkG2X{L&r! z7J#`0OdbFf?_*3^H>X)fkFy-cEa{hGHI5AUGVTF2+Qs+B{)>UBBzRnAM!vNVxDoe} zVcpO`P=m?F4(rlNf5`zxb*$1|r6ZG!n^Am*Hl_PRI-W6jc#v_VZZ2k+n%&&^oR3EH z{%B{9-FBEUY!iYjg$yw8;`7Ng9ngVCK6c-}&L~#>xSbD(IbiZSzqir4r(p6y%(t8| zZS#TZ5tgwHPA)hK`FcP|K8RIUFqlqyvxsBRp`ATlrc%o8)WCo5qWir(AtH3>_*l#} zl>(|X7piz$@r?s-Q7A{zx7Gn8ztC3+a8_N0q$JJBQ4%oYjcvz6Kr921FI0cHB_KMQ ztqM)LyR>K%#Jh+u7c==60aR+Wx*nJR#jp_<7ibzIk;9{jh-v}RA*PBhTRxvr{y79} ziq>=F`CkP{t1i{0Tx}eei)#s`D;2qupS~+V$_f?9r^Fqns#W{eyCG&Hh{;E;i8TVI z!_{%=oVu`w%DxDtyIfKsa4$T-{;`7$7@Ag?C7gl zN!#N3NZR4~7Soh3qYZi}pxH)OWp#Evu`2)X;L+uCyqiyXEa1u2sUl^MV4o2mLb`kS z@)hxjCn{7F#;560)Xh|L`NY#95SZ3T+)O>6x<#vq+_1uPH4P;jz~+kBR$)UEw2^8fT>BHf zJ$QDMcPo^RYg*vTyZwEj9Iv;d0Entj`=wZ40o5YOa&OkH36Ypv16nH*=SoL@^_*RH0+Whhb;UQ+G+*UqnL zuKVjDL9)Mgw8^e$yF{}0Y`MOe5JgV5PixK7r+y=3K>K@<>s}b={2FCkJRtky39f&P zQg!)zl9fqyGbV|#%neBjs_pMhwnN2lPPPkZF`s*OsO>$ Date: Fri, 23 May 2014 16:24:43 +0100 Subject: [PATCH 49/50] 8042857: 14 stuck threads waiting for notification on LDAPRequest Reviewed-by: vinnie --- .../classes/com/sun/jndi/ldap/Connection.java | 4 +- .../com/sun/jndi/ldap/LdapTimeoutTest.java | 45 +++++++++++++++---- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java b/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java index 65a675ffdf5..a0643a6ad29 100644 --- a/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java +++ b/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -459,10 +459,10 @@ public final class Connection implements Runnable { // will be woken up before readTimeout only if reply is // available ldr.wait(readTimeout); - waited = true; } else { ldr.wait(15 * 1000); // 15 second timeout } + waited = true; } else { break; } diff --git a/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java b/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java index 0db3ab9239c..39270374488 100644 --- a/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java +++ b/jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -64,11 +64,12 @@ public class LdapTimeoutTest { env.put(Context.SECURITY_PRINCIPAL, "user"); env.put(Context.SECURITY_CREDENTIALS, "password"); - env.put("com.sun.jndi.ldap.connect.timeout", "10"); - env.put("com.sun.jndi.ldap.read.timeout", "3000"); - InitialContext ctx = null; try { + new LdapTimeoutTest().deadServerNoTimeout(env); + + env.put("com.sun.jndi.ldap.connect.timeout", "10"); + env.put("com.sun.jndi.ldap.read.timeout", "3000"); new LdapTimeoutTest().ldapReadTimeoutTest(env, false); new LdapTimeoutTest().ldapReadTimeoutTest(env, true); new LdapTimeoutTest().simpleAuthConnectTest(env); @@ -84,7 +85,7 @@ public class LdapTimeoutTest { void ldapReadTimeoutTest(Hashtable env, boolean ssl) { InitialContext ctx = null; if (ssl) env.put(Context.SECURITY_PROTOCOL, "ssl"); - ScheduledFuture killer = killSwitch(); + ScheduledFuture killer = killSwitch(5000); long start = System.nanoTime(); try { ctx = new InitialDirContext(env); @@ -112,7 +113,7 @@ public class LdapTimeoutTest { void simpleAuthConnectTest(Hashtable env) { InitialContext ctx = null; - ScheduledFuture killer = killSwitch(); + ScheduledFuture killer = killSwitch(5000); long start = System.nanoTime(); try { ctx = new InitialDirContext(env); @@ -139,6 +140,32 @@ public class LdapTimeoutTest { } } + void deadServerNoTimeout(Hashtable env) { + InitialContext ctx = null; + ScheduledFuture killer = killSwitch(30000); + long start = System.nanoTime(); + try { + ctx = new InitialDirContext(env); + SearchControls scl = new SearchControls(); + scl.setSearchScope(SearchControls.SUBTREE_SCOPE); + NamingEnumeration answer = ((InitialDirContext)ctx) + .search("ou=People,o=JNDITutorial", "(objectClass=*)", scl); + // shouldn't reach here + fail(); + } catch (NamingException e) { + long end = System.nanoTime(); + if (TimeUnit.NANOSECONDS.toMillis(end - start) < 14000) { + System.err.println("fail: timeout should be at least 15 seconds, actual time: " + + TimeUnit.NANOSECONDS.toMillis(end - start)); + fail(); + } else { + pass(); + } + } finally { + if (!shutItDown(killer, ctx)) fail(); + } + } + boolean shutItDown(ScheduledFuture killer, InitialContext ctx) { killer.cancel(true); try { @@ -149,15 +176,15 @@ public class LdapTimeoutTest { } } - ScheduledFuture killSwitch() { + ScheduledFuture killSwitch(int ms) { final Thread current = Thread.currentThread(); return LdapTimeoutTest.pool.schedule(new Callable() { public Void call() throws Exception { System.err.println("Fail: killSwitch()"); - current.interrupt(); + System.exit(0); return null; } - }, 5000, TimeUnit.MILLISECONDS); + }, ms, TimeUnit.MILLISECONDS); } static class Server extends Thread { From 7f334fe1a10fdc7b5a830f5740602ff3e63bfeca Mon Sep 17 00:00:00 2001 From: Rob McKenna Date: Fri, 23 May 2014 19:42:16 +0100 Subject: [PATCH 50/50] 8041451: com.sun.jndi.ldap.Connection:ReadTimeout should abandon ldap request Reviewed-by: vinnie --- jdk/src/share/classes/com/sun/jndi/ldap/Connection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java b/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java index a0643a6ad29..d41c94480e9 100644 --- a/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java +++ b/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java @@ -474,7 +474,7 @@ public final class Connection implements Runnable { } if ((rber == null) && waited) { - removeRequest(ldr); + abandonRequest(ldr, null); throw new NamingException("LDAP response read timed out, timeout used:" + readTimeout + "ms." );