svn commit: r947216 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java

[li...@apache.org]

Author: lindner
Date: Sat May 22 00:20:04 2010
New Revision: 947216

URL: http://svn.apache.org/viewvc?rev=947216&view=rev
Log:
SHINDIG-1339 | Patch from Henry Saputra | Change the modifier of the static member variables for BasicImageRewriter from public to private since they dont need to be public.

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

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java?rev=947216&r1=947215&r2=947216&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java Sat May 22 00:20:04 2010
@@ -61,6 +61,13 @@ import javax.imageio.ImageWriter;
  */
 public class BasicImageRewriter implements ImageRewriter {
 
+  static final String
+      CONTENT_TYPE_AND_EXTENSION_MISMATCH =
+        "Content is not an image but file extension asserts it is";
+  static final String
+      CONTENT_TYPE_AND_MIME_MISMATCH =
+          "Content is not an image but mime type asserts it is";
+    
   private static final String CONTENT_TYPE_IMAGE_PNG = "image/png";
   /** Returned as the output message if a huge image is submitted to be scaled */
   private static final String RESIZE_IMAGE_TOO_LARGE = "The image is too large to resize";
@@ -68,21 +75,15 @@ public class BasicImageRewriter implemen
   private static final String RESIZE_OUTPUT_FORMAT = "png";
 
   private static final String CONTENT_LENGTH = "Content-Length";
+
   /** Parameter used to request image rendering quality */
-  public static final String PARAM_RESIZE_QUALITY = Param.RESIZE_QUALITY.getKey();
+  private static final String PARAM_RESIZE_QUALITY = Param.RESIZE_QUALITY.getKey();
   /** Parameter used to request image width change */
-  public static final String PARAM_RESIZE_WIDTH = Param.RESIZE_WIDTH.getKey();
+  private static final String PARAM_RESIZE_WIDTH = Param.RESIZE_WIDTH.getKey();
   /** Parameter used to request image height change */
-  public static final String PARAM_RESIZE_HEIGHT = Param.RESIZE_HEIGHT.getKey();
+  private static final String PARAM_RESIZE_HEIGHT = Param.RESIZE_HEIGHT.getKey();
   /** Parameter used to request resizing will not expand image */
-  public static final String PARAM_NO_EXPAND = Param.NO_EXPAND.getKey();
-
-  public static final String
-      CONTENT_TYPE_AND_EXTENSION_MISMATCH =
-        "Content is not an image but file extension asserts it is";
-  public static final String
-      CONTENT_TYPE_AND_MIME_MISMATCH =
-          "Content is not an image but mime type asserts it is";
+  private static final String PARAM_NO_EXPAND = Param.NO_EXPAND.getKey();
 
   private static final int DEFAULT_QUALITY = 100;
   private static final int BITS_PER_BYTE = 8;

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java?rev=947216&r1=947215&r2=947216&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java Sat May 22 00:20:04 2010
@@ -21,15 +21,12 @@ import static
     org.apache.shindig.gadgets.rewrite.image.BasicImageRewriter.CONTENT_TYPE_AND_EXTENSION_MISMATCH;
 import static
     org.apache.shindig.gadgets.rewrite.image.BasicImageRewriter.CONTENT_TYPE_AND_MIME_MISMATCH;
-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;
-import static org.apache.shindig.gadgets.rewrite.image.BasicImageRewriter.PARAM_NO_EXPAND;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.createControl;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.shindig.common.uri.Uri;
+import org.apache.shindig.gadgets.uri.UriCommon.Param;
 import org.apache.shindig.gadgets.http.HttpRequest;
 import org.apache.shindig.gadgets.http.HttpResponse;
 import org.apache.shindig.gadgets.http.HttpResponseBuilder;
@@ -125,10 +122,10 @@ public class ImageRewriterTest extends A
   private HttpRequest getMockRequest(Integer width, Integer height, Integer quality, boolean noExpand) {
     HttpRequest request = mockControl.createMock(HttpRequest.class);
     expect(request.getUri()).andReturn(IMAGE_URL);
-    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 ? "1" : null).anyTimes();
+    expect(request.getParamAsInteger(Param.RESIZE_QUALITY.getKey())).andReturn(quality);
+    expect(request.getParamAsInteger(Param.RESIZE_WIDTH.getKey())).andReturn(width);
+    expect(request.getParamAsInteger(Param.RESIZE_HEIGHT.getKey())).andReturn(height);
+    expect(request.getParam(Param.NO_EXPAND.getKey())).andReturn(noExpand ? "1" : null).anyTimes();
     return request;
   }