Mercurial > hg > release > icedtea-web-1.4
changeset 708:9f602cd4d895
AWTFramework - fixing return values of searching methods
author | Jana Fabrikova <jfabriko@redhat.com> |
---|---|
date | Mon, 29 Apr 2013 13:54:26 +0200 |
parents | c5e4fbd65bc0 |
children | fc98e8df7cee |
files | tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ImageSeeker.java |
diffstat | 3 files changed, 31 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Mon Apr 29 09:25:50 2013 +0200 +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Mon Apr 29 13:54:26 2013 +0200 @@ -346,14 +346,9 @@ * @param height * @param K * @throws ComponentNotFoundException - * @throws AWTFrameworkException */ - public void captureScreenAndFindAppletByIconTryKTimes(BufferedImage icon, Rectangle iconPosition, int width, int height, int K) throws ComponentNotFoundException, AWTFrameworkException { + public void captureScreenAndFindAppletByIconTryKTimes(BufferedImage icon, Rectangle iconPosition, int width, int height, int K) throws ComponentNotFoundException { - if(!markerGiven){ - throw new AWTFrameworkException("AWTFramework cannot find applet without marker!"); - } - int count = 0; appletFound = false; while ((count < K) && !appletFound) {
--- a/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Mon Apr 29 09:25:50 2013 +0200 +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Mon Apr 29 13:54:26 2013 +0200 @@ -43,7 +43,7 @@ import java.awt.image.BufferedImage; public class ComponentFinder { - + /** * method findColoredRectangle determines coordinates of a rectangle colored * by rectangleColor surrounded by a neighbourhood of surroundingColor @@ -56,7 +56,11 @@ public static Rectangle findColoredRectangle(Color rectangleColor, Color surroundingColor, BufferedImage screenshot) { Rectangle r = ImageSeeker.findColoredAreaGap(screenshot, rectangleColor, surroundingColor, 0, screenshot.getHeight(), 0); - return r; + if( ImageSeeker.isRectangleValid(r)){ + return r; + }else{ + return null; + } } /** @@ -73,7 +77,11 @@ public static Rectangle findColoredRectangle(Color rectangleColor, Color surroundingColor, BufferedImage screenshot, int gap) { Rectangle r = ImageSeeker.findColoredAreaGap(screenshot, rectangleColor, surroundingColor, 0, screenshot.getHeight(), gap); - return r; + if( ImageSeeker.isRectangleValid(r)){ + return r; + }else{ + return null; + } } @@ -92,16 +100,24 @@ */ public static Rectangle findWindowByIcon(BufferedImage icon, Rectangle iconPosition, int windowWidth, int windowHeight, BufferedImage screenshot) { Rectangle r = ImageSeeker.findExactImage(icon, screenshot); - return windowPositionFromIconPosition(r, iconPosition, windowWidth, windowHeight); + if( ImageSeeker.isRectangleValid(r)){ + return windowPositionFromIconPosition(r, iconPosition, windowWidth, windowHeight); + }else{ + return null; + } } public static Rectangle findWindowByIconBlurred(BufferedImage icon, Rectangle iconPosition, int windowWidth, int windowHeight, BufferedImage screenshot, double minCorrelation) { Rectangle r = ImageSeeker.findBlurredImage(icon, screenshot, minCorrelation); - return windowPositionFromIconPosition(r, iconPosition, windowWidth, windowHeight); + if( ImageSeeker.isRectangleValid(r)){ + return windowPositionFromIconPosition(r, iconPosition, windowWidth, windowHeight); + }else{ + return null; + } } public static Rectangle windowPositionFromIconPosition(Rectangle iconAbsolute, Rectangle iconRelative, int windowWidth, int windowHeight){ - return new Rectangle( iconAbsolute.x - iconRelative.x, iconAbsolute.y - iconRelative.y, - windowWidth, windowHeight); + return new Rectangle( iconAbsolute.x - iconRelative.x, iconAbsolute.y - iconRelative.y, + windowWidth, windowHeight); } }
--- a/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ImageSeeker.java Mon Apr 29 09:25:50 2013 +0200 +++ b/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ImageSeeker.java Mon Apr 29 13:54:26 2013 +0200 @@ -73,12 +73,15 @@ result.width = marker.getWidth(); }else{ ok = true; - } - + } } } - return result; + if(found){ + return result; + }else{ + return null; + } } public static Rectangle findBlurredImage(BufferedImage marker, BufferedImage testImage, double minCorrelation){ @@ -119,7 +122,7 @@ if(bestCorrelation > minCorrelation){ return new Rectangle(bestX, bestY, marker.getWidth(), marker.getHeight()); }else{ - return new Rectangle(0,0,0,0); + return null; } }