svn commit: r1001633 - in /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src: main/java/org/apache/clerezza/tools/offline/ test/java/org/apache/clerezza/tools/offline/

[mir]

Author: mir
Date: Mon Sep 27 09:13:02 2010
New Revision: 1001633

URL: http://svn.apache.org/viewvc?rev=1001633&view=rev
Log:
CLEREZZA-232: adjusted to changed thumbnail service interface

Modified:
    
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/main/java/org/apache/clerezza/tools/offline/ThumbnailCondition.java
    
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/test/java/org/apache/clerezza/tools/offline/ThumbnailConditionTest.java

Modified: 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/main/java/org/apache/clerezza/tools/offline/ThumbnailCondition.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/main/java/org/apache/clerezza/tools/offline/ThumbnailCondition.java?rev=1001633&r1=1001632&r2=1001633&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/main/java/org/apache/clerezza/tools/offline/ThumbnailCondition.java
 (original)
+++ 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/main/java/org/apache/clerezza/tools/offline/ThumbnailCondition.java
 Mon Sep 27 09:13:02 2010
@@ -143,7 +143,7 @@ public class ThumbnailCondition implemen
        private byte[] getThumbnailUri() {
                ThumbnailServiceParams params = parseThumbnailServiceParams();
                UriRef thumbnailUri = 
thumbnailService.getThumbnailUri(params.getUri(),
-                               params.getWidth(), params.getHeight());
+                               params.getWidth(), params.getHeight(), 
params.getExact());
                return thumbnailUri.getUnicodeString().getBytes();
        }
 
@@ -160,6 +160,7 @@ public class ThumbnailCondition implemen
        private ThumbnailServiceParams parseThumbnailServiceParams() {
                Integer width = null, height = null;
                UriRef uri = null;
+               boolean extact = false;
                String queryParams = cachedQueryParams.toString();
                queryParams = queryParams.replace("&", "&");
                String[] nameValues = queryParams.split("&");
@@ -173,20 +174,25 @@ public class ThumbnailCondition implemen
                                        width = 
Integer.valueOf(nameValuePair[1]);
                                } else if (name.equals("height")) {
                                        height = 
Integer.valueOf(nameValuePair[1]);
+                               } else if (name.equals("exact")) {
+                                       extact = 
Boolean.valueOf(nameValuePair[1]);
                                }
                        }
                }
-               return new ThumbnailServiceParams(width, height, uri);
+               return new ThumbnailServiceParams(width, height, uri, extact);
        }
 
        private class ThumbnailServiceParams {
                 private Integer width, height;
                 private UriRef uri;
+                private boolean exact;
 
-               public ThumbnailServiceParams(Integer width, Integer height, 
UriRef uri) {
+               public ThumbnailServiceParams(Integer width, Integer height, 
UriRef uri,
+                               boolean exact) {
                        this.width = width;
                        this.height = height;
                        this.uri = uri;
+                       this.exact = exact;
                }
 
                public Integer getHeight() {
@@ -200,5 +206,9 @@ public class ThumbnailCondition implemen
                public Integer getWidth() {
                        return width;
                }
+
+               public boolean getExact() {
+                       return exact;
+               }
        }
 }

Modified: 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/test/java/org/apache/clerezza/tools/offline/ThumbnailConditionTest.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/test/java/org/apache/clerezza/tools/offline/ThumbnailConditionTest.java?rev=1001633&r1=1001632&r2=1001633&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/test/java/org/apache/clerezza/tools/offline/ThumbnailConditionTest.java
 (original)
+++ 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/test/java/org/apache/clerezza/tools/offline/ThumbnailConditionTest.java
 Mon Sep 27 09:13:02 2010
@@ -31,8 +31,10 @@ import org.junit.Test;
  * @author mir
  */
 public class ThumbnailConditionTest {
-       
-       private static final byte[] input = "<img 
href=\"/thumbnail-service?uri=http://localhost:8080/html_export/digital-assets/2010/08/30/770a7f14-74a7-4036-8341-f9e50e944e06&amp;width=700&height=300\";
 />".getBytes();
+
+       private UriRef uri = new UriRef 
("http://localhost:8080/html_export/digital-assets/2010/08/30/770a7f14-74a7-4036-8341-f9e50e944e06";);
+
+       private static final byte[] input = "<img 
href=\"/thumbnail-service?uri=http://localhost:8080/html_export/digital-assets/2010/08/30/770a7f14-74a7-4036-8341-f9e50e944e06&amp;width=700&height=300&exact=true\";
 />".getBytes();
        
        @Test
        public void thumbnailConditionTest() throws IOException {
@@ -41,7 +43,11 @@ public class ThumbnailConditionTest {
                                new ThumbnailCondition(new ThumbnailService() {
 
                        @Override
-                       public UriRef getThumbnailUri(UriRef infoBitUri, 
Integer width, Integer height) {
+                       public UriRef getThumbnailUri(UriRef infoBitUri, 
Integer width, Integer height, boolean exact) {
+                               Assert.assertEquals(uri, infoBitUri);
+                               Assert.assertEquals(Integer.valueOf(700), 
width);
+                               Assert.assertEquals(Integer.valueOf(300), 
height);
+                               Assert.assertEquals(true, exact);
                                return new UriRef("http://example.com/test";);
                        }                               
                }));