Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-10-04 11:26:44 -04:00
Code Issues Projects Releases Wiki Activity

Cleanup of AreaOfInterest

Browse Source 
- Extracted AreaOfInterest into an interface
- Added an AreaOfInterestFactory.
- Use AreaOfInterestFactory in ImageServletResponseImpl
- fixed version

Conflicts:
	servlet/pom.xml
	servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
This commit is contained in:
Erlend Hamnaberg
2010-04-20 17:04:48 +02:00
committed by Shihab Uddin
parent 3628f3b392
commit 8137165bac
10 changed files with 312 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java
View File

@@ -33,6 +33,8 @@ import com.twelvemonkeys.io.FastByteArrayOutputStream;
import com.twelvemonkeys.lang.StringUtil;
import com.twelvemonkeys.servlet.ServletResponseStreamDelegate;
import com.twelvemonkeys.servlet.ServletUtil;
import com.twelvemonkeys.servlet.image.aoi.AreaOfInterest;
import com.twelvemonkeys.servlet.image.aoi.AreaOfInterestFactory;
import javax.imageio.*;
import javax.imageio.stream.ImageInputStream;
@@ -583,7 +585,9 @@ class ImageServletResponseImpl extends HttpServletResponseWrapper implements Ima
if (aoiX >= 0 || aoiY >= 0 || aoiW >= 0 || aoiH >= 0) {
aoi = new AreaOfInterest(pDefaultWidth, pDefaultHeight, aoiPercent, aoiUniform).getAOI(aoiX, aoiY, aoiW, aoiH);
AreaOfInterest areaOfInterest = AreaOfInterestFactory.getDefault().
createAreaOfInterest(pDefaultWidth, pDefaultHeight, aoiPercent, aoiUniform);
aoi = areaOfInterest.getAOI(aoiX, aoiY, aoiW, aoiH);
return aoi;
}

2
servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
View File

@@ -66,7 +66,7 @@ public class ImageServletResponseImplTestCase {
when(context.getMimeType("file.txt")).thenReturn(CONTENT_TYPE_TEXT);
}
private void fakeResponse(HttpServletRequest pRequest, ImageServletResponseImpl pImageResponse) throws IOException {
private void fakeResponse(HttpServletRequest pRequest, DefaultImageServletResponse pImageResponse) throws IOException {
String uri = pRequest.getRequestURI();
int index = uri.lastIndexOf('/');
assertTrue(uri, index >= 0);