From 5bd8c37c2d00bf0494762bd688f5695ecc266fb4 Mon Sep 17 00:00:00 2001 From: Shihab Uddin Date: Wed, 26 Sep 2012 11:51:25 +0200 Subject: [PATCH] fixed merge conflicts --- .../servlet/image/aoi/AreaOfInterest.java | 0 .../image/aoi/AreaOfInterestFactory.java | 0 .../image/aoi/AreaOfInterestWrapper.java | 0 .../image/aoi/DefaultAreaOfInterest.java | 0 .../image/aoi/PercentAreaOfInterest.java | 0 .../image/aoi/UniformAreaOfInterest.java | 0 .../ImageServletResponseImplTestCase.java | 25 ------------------- .../image/aoi/AreaOfInterestTestCase.java | 0 8 files changed, 25 deletions(-) rename {twelvemonkeys-servlet => servlet}/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterest.java (100%) rename {twelvemonkeys-servlet => servlet}/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestFactory.java (100%) rename {twelvemonkeys-servlet => servlet}/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestWrapper.java (100%) rename {twelvemonkeys-servlet => servlet}/src/main/java/com/twelvemonkeys/servlet/image/aoi/DefaultAreaOfInterest.java (100%) rename {twelvemonkeys-servlet => servlet}/src/main/java/com/twelvemonkeys/servlet/image/aoi/PercentAreaOfInterest.java (100%) rename {twelvemonkeys-servlet => servlet}/src/main/java/com/twelvemonkeys/servlet/image/aoi/UniformAreaOfInterest.java (100%) rename {twelvemonkeys-servlet => servlet}/src/test/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestTestCase.java (100%) diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterest.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterest.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterest.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestFactory.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestFactory.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestFactory.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestFactory.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestWrapper.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestWrapper.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestWrapper.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestWrapper.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/DefaultAreaOfInterest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/DefaultAreaOfInterest.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/DefaultAreaOfInterest.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/DefaultAreaOfInterest.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/PercentAreaOfInterest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/PercentAreaOfInterest.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/PercentAreaOfInterest.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/PercentAreaOfInterest.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/UniformAreaOfInterest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/UniformAreaOfInterest.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/UniformAreaOfInterest.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/aoi/UniformAreaOfInterest.java diff --git a/servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java b/servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java index fc3a7803..df1a9408 100755 --- a/servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java +++ b/servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java @@ -1,6 +1,5 @@ package com.twelvemonkeys.servlet.image; -import com.twelvemonkeys.image.BufferedImageIcon; import com.twelvemonkeys.image.ImageUtil; import com.twelvemonkeys.io.FileUtil; import com.twelvemonkeys.servlet.OutputStreamAdapter; @@ -12,14 +11,12 @@ import javax.servlet.ServletContext; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.swing.*; import java.awt.*; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; import java.util.Arrays; import static org.junit.Assert.*; @@ -274,28 +271,6 @@ public class ImageServletResponseImplTestCase { verify(response).getOutputStream(); } - private static void showIt(final BufferedImage expected, final BufferedImage actual, final BufferedImage diff) { - try { - SwingUtilities.invokeAndWait(new Runnable() { - public void run() { - JPanel panel = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0)); - panel.add(new BlackLabel("expected", expected)); - panel.add(new BlackLabel("actual", actual)); - if (diff != null) { - panel.add(new BlackLabel("diff", diff)); - } - JScrollPane scroll = new JScrollPane(panel); - scroll.setBorder(BorderFactory.createEmptyBorder()); - JOptionPane.showMessageDialog(null, scroll); - } - }); - } - catch (InterruptedException ignore) { - } - catch (InvocationTargetException ignore) { - } - } - @Test public void testTranscodeResponseIndexedCM() throws IOException { // Custom setup diff --git a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestTestCase.java b/servlet/src/test/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestTestCase.java similarity index 100% rename from twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestTestCase.java rename to servlet/src/test/java/com/twelvemonkeys/servlet/image/aoi/AreaOfInterestTestCase.java