svn commit: r822533 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/rewrite/image/ main/java/org/apache/shindig/gadgets/servlet/ test/java/org/apache/shindig/gadgets/rewrite/image/

[johnh]

Author: johnh
Date: Tue Oct  6 23:11:09 2009
New Revision: 822533

URL: http://svn.apache.org/viewvc?rev=822533&view=rev
Log:
Fix for no_expand functionality: convert textual boolean to numeric; include in 
sanitizer.


Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java?rev=822533&r1=822532&r2=822533&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
 Tue Oct  6 23:11:09 2009
@@ -143,7 +143,7 @@
 
       ImageInfo imageInfo = Sanselan.getImageInfo(response.getResponse(), 
uri.getPath());
       
-      if ("true".equals(request.getParam(PARAM_NO_EXPAND)) &&
+      if ("1".equals(request.getParam(PARAM_NO_EXPAND)) &&
           imageInfo.getHeight() <= requestedHeight &&
           imageInfo.getWidth() <= requestedWidth) {
         // Don't do anything, since the current image fits within the bounding 
area.

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java?rev=822533&r1=822532&r2=822533&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
 Tue Oct  6 23:11:09 2009
@@ -18,6 +18,7 @@
  */
 package org.apache.shindig.gadgets.servlet;
 
+import static 
org.apache.shindig.gadgets.rewrite.image.BasicImageRewriter.PARAM_NO_EXPAND;
 import static 
org.apache.shindig.gadgets.rewrite.image.BasicImageRewriter.PARAM_RESIZE_HEIGHT;
 import static 
org.apache.shindig.gadgets.rewrite.image.BasicImageRewriter.PARAM_RESIZE_QUALITY;
 import static 
org.apache.shindig.gadgets.rewrite.image.BasicImageRewriter.PARAM_RESIZE_WIDTH;
@@ -52,7 +53,7 @@
   private static final Logger logger = 
Logger.getLogger(ProxyHandler.class.getName());
 
   private static final String[] INTEGER_RESIZE_PARAMS = new String[] {
-    PARAM_RESIZE_HEIGHT, PARAM_RESIZE_WIDTH, PARAM_RESIZE_QUALITY
+    PARAM_RESIZE_HEIGHT, PARAM_RESIZE_WIDTH, PARAM_RESIZE_QUALITY, 
PARAM_NO_EXPAND
   };
 
   private final RequestPipeline requestPipeline;

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java?rev=822533&r1=822532&r2=822533&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java
 Tue Oct  6 23:11:09 2009
@@ -124,7 +124,7 @@
     expect(request.getParamAsInteger(PARAM_RESIZE_QUALITY)).andReturn(quality);
     expect(request.getParamAsInteger(PARAM_RESIZE_WIDTH)).andReturn(width);
     expect(request.getParamAsInteger(PARAM_RESIZE_HEIGHT)).andReturn(height);
-    expect(request.getParam(PARAM_NO_EXPAND)).andReturn(noExpand ? "true" : 
null).anyTimes();
+    expect(request.getParam(PARAM_NO_EXPAND)).andReturn(noExpand ? "1" : 
null).anyTimes();
     return request;
   }