svn commit: r1044684 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java

[jdonnerstag]

Author: jdonnerstag
Date: Sat Dec 11 17:44:40 2010
New Revision: 1044684

URL: http://svn.apache.org/viewvc?rev=1044684&view=rev
Log:
In extensions CaptchaImageResource, instance variable challengeIdhashCode is 
never set
Issue: WICKET-3231

Modified:
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java?rev=1044684&r1=1044683&r2=1044684&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
 Sat Dec 11 17:44:40 2010
@@ -121,7 +121,6 @@ public final class CaptchaImageResource 
        }
 
        private final IModel<String> challengeId;
-       private Integer challengeIdhashCode;
 
        private final List<String> fontNames = Arrays.asList("Helvetica", 
"Arial", "Courier");
        private final int fontSize;
@@ -222,7 +221,6 @@ public final class CaptchaImageResource 
         */
        public final void invalidate()
        {
-               challengeIdhashCode = null;
                imageData = null;
        }
 
@@ -231,8 +229,7 @@ public final class CaptchaImageResource 
        {
                // get image data is always called in sync block
                byte[] data = null;
-               if (imageData != null && challengeIdhashCode != null &&
-                       
challengeIdhashCode.equals(challengeId.getObject().hashCode()))
+               if (imageData != null)
                {
                        data = imageData.get();
                }
@@ -275,15 +272,16 @@ public final class CaptchaImageResource 
                        double shearY = ran.nextDouble() * 0.2;
                        CharAttributes cf = new CharAttributes(ch, fontName, 
rotation, rise, shearX, shearY);
                        charAttsList.add(cf);
-                       text = new TextLayout(ch + "", getFont(fontName), new 
FontRenderContext(null, false, false));
+                       text = new TextLayout(ch + "", getFont(fontName), new 
FontRenderContext(null, false,
+                               false));
                        textAt = new AffineTransform();
                        textAt.rotate(rotation);
                        textAt.shear(shearX, shearY);
                        shape = text.getOutline(textAt);
-                       width += (int) shape.getBounds2D().getWidth();
-                       if (height < (int) shape.getBounds2D().getHeight() + 
rise)
+                       width += (int)shape.getBounds2D().getWidth();
+                       if (height < (int)shape.getBounds2D().getHeight() + 
rise)
                        {
-                               height = (int) shape.getBounds2D().getHeight() 
+ rise;
+                               height = (int)shape.getBounds2D().getHeight() + 
rise;
                        }
                }
 
@@ -293,7 +291,8 @@ public final class CaptchaImageResource 
                int curWidth = margin;
                for (CharAttributes cf : charAttsList)
                {
-                       text = new TextLayout(cf.getChar() + "", 
getFont(cf.getName()), gfx.getFontRenderContext());
+                       text = new TextLayout(cf.getChar() + "", 
getFont(cf.getName()),
+                               gfx.getFontRenderContext());
                        textAt = new AffineTransform();
                        textAt.translate(curWidth, height - cf.getRise());
                        textAt.rotate(cf.getRotation());