Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9B654E72E for ; Tue, 4 Dec 2012 15:17:09 +0000 (UTC) Received: (qmail 31104 invoked by uid 500); 4 Dec 2012 15:17:09 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 30971 invoked by uid 500); 4 Dec 2012 15:17:09 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 30962 invoked by uid 99); 4 Dec 2012 15:17:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2012 15:17:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2012 15:16:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B79EF23889B8; Tue, 4 Dec 2012 15:16:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1416984 [1/2] - in /commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging: ./ common/bytesource/ examples/ formats/bmp/ formats/dcx/ formats/gif/ formats/icns/ formats/ico/ formats/jpeg/ formats/jpeg/exif/ formats/jpeg/iptc... Date: Tue, 04 Dec 2012 15:16:15 -0000 To: commits@commons.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121204151635.B79EF23889B8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Tue Dec 4 15:16:02 2012 New Revision: 1416984 URL: http://svn.apache.org/viewvc?rev=1416984&view=rev Log: Convert control statement bodies to block. Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/test/util/FileSystemTraversal.java Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java Tue Dec 4 15:16:02 2012 @@ -36,8 +36,9 @@ public abstract class ImagingTest extend protected File createTempFile(String prefix, String suffix) throws IOException { File tempFolder = new File("tmp"); - if (!tempFolder.exists()) + if (!tempFolder.exists()) { tempFolder.mkdirs(); + } assertTrue(tempFolder.isDirectory()); File result = File.createTempFile(prefix, suffix, tempFolder); @@ -47,8 +48,9 @@ public abstract class ImagingTest extend public void compareByteArrays(byte a[], byte b[]) { assertTrue(a.length == b.length); - for (int i = 0; i < b.length; i++) + for (int i = 0; i < b.length; i++) { assertTrue(b[i] == a[i]); + } } protected void purgeMemory() { @@ -122,8 +124,9 @@ public abstract class ImagingTest extend FileSystemTraversal.Visitor visitor = new FileSystemTraversal.Visitor() { public boolean visit(File file, double progressEstimate) { - if (!Imaging.hasImageFileExtension(file)) + if (!Imaging.hasImageFileExtension(file)) { return true; + } ALL_IMAGES.add(file); return true; } @@ -139,22 +142,27 @@ public abstract class ImagingTest extend for (int i = 0; i < ALL_IMAGES.size(); i++) { File file = ALL_IMAGES.get(i); - if (!Imaging.hasImageFileExtension(file)) + if (!Imaging.hasImageFileExtension(file)) { continue; + } - if (counter++ % 10 == 0) + if (counter++ % 10 == 0) { Debug.purgeMemory(); + } - if (file.getParentFile().getName().toLowerCase().equals("@broken")) + if (file.getParentFile().getName().toLowerCase().equals("@broken")) { continue; + } - if (filter != null && !filter.accept(file)) + if (filter != null && !filter.accept(file)) { continue; + } images.add(file); - if (max > 0 && images.size() >= max) + if (max > 0 && images.size() >= max) { break; + } } assertTrue(images.size() > 0); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java Tue Dec 4 15:16:02 2012 @@ -81,8 +81,9 @@ public class ByteSourceDataTest extends int read = is.read(prefix); assertTrue(read <= src.length); - for (int i = 0; i < read; i++) + for (int i = 0; i < read; i++) { assertTrue(src[i] == prefix[i]); + } } finally { if (is != null) { try { @@ -118,8 +119,9 @@ public class ByteSourceDataTest extends byte dst[] = IoUtils.getInputStreamBytes(is); assertTrue(src.length == dst.length + start); - for (int i = 0; i < dst.length; i++) + for (int i = 0; i < dst.length; i++) { assertTrue(dst[i] == src[i + start]); + } } finally { if (is != null) { try { Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java Tue Dec 4 15:16:02 2012 @@ -40,8 +40,9 @@ public class ByteSourceImageTest extends public void test() throws Exception { List imageFiles = getTestImages(); for (int i = 0; i < imageFiles.size(); i++) { - if (i % 1 == 0) + if (i % 1 == 0) { Debug.purgeMemory(); + } File imageFile = imageFiles.get(i); Debug.debug("imageFile", imageFile); @@ -70,14 +71,16 @@ public class ByteSourceImageTest extends if (imageFile.getName().toLowerCase().endsWith(".png") && imageFile.getParentFile().getName() .equalsIgnoreCase("pngsuite") - && imageFile.getName().toLowerCase().startsWith("x")) + && imageFile.getName().toLowerCase().startsWith("x")) { continue; + } checkGetICCProfileBytes(imageFile, imageFileBytes); if (!imageFile.getParentFile().getName().toLowerCase() - .equals("@broken")) + .equals("@broken")) { checkGetImageInfo(imageFile, imageFileBytes); + } checkGetImageSize(imageFile, imageFileBytes); @@ -142,8 +145,9 @@ public class ByteSourceImageTest extends assertTrue((iccBytesFile != null) == (iccBytesBytes != null)); - if (iccBytesFile == null) + if (iccBytesFile == null) { return; + } compareByteArrays(iccBytesFile, iccBytesBytes); } @@ -155,8 +159,9 @@ public class ByteSourceImageTest extends boolean ignoreImageData = isPhilHarveyTestImage(imageFile); ImageFormat imageFormat = Imaging.guessFormat(imageFile); if (imageFormat.equals(ImageFormat.IMAGE_FORMAT_TIFF) - || imageFormat.equals(ImageFormat.IMAGE_FORMAT_JPEG)) + || imageFormat.equals(ImageFormat.IMAGE_FORMAT_JPEG)) { params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData)); + } ImageInfo imageInfoFile = Imaging.getImageInfo(imageFile, params); @@ -169,14 +174,18 @@ public class ByteSourceImageTest extends for (Method method2 : methods) { Method method = method2; method.getModifiers(); - if (!Modifier.isPublic(method.getModifiers())) + if (!Modifier.isPublic(method.getModifiers())) { continue; - if (!method.getName().startsWith("get")) + } + if (!method.getName().startsWith("get")) { continue; + } if (method.getName().equals("getClass")) + { continue; // if (method.getGenericParameterTypes().length > 0) // continue; + } Object valueFile = method.invoke(imageInfoFile, (Object[])null); Object valueBytes = method.invoke(imageInfoBytes, (Object[])null); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java Tue Dec 4 15:16:02 2012 @@ -46,16 +46,19 @@ public abstract class ByteSourceTest ext byte emptyArray[] = (new byte[0]); byte single[] = new byte[1]; - for (int i = 0; i < single.length; i++) + for (int i = 0; i < single.length; i++) { single[i] = (byte) i; + } byte simple[] = new byte[256]; - for (int i = 0; i < simple.length; i++) + for (int i = 0; i < simple.length; i++) { simple[i] = (byte) i; + } byte zeroes[] = new byte[256]; - for (int i = 0; i < zeroes.length; i++) + for (int i = 0; i < zeroes.length; i++) { zeroes[i] = 0; + } ByteArrayOutputStream baos = new ByteArrayOutputStream(); for (int i = 0; i < 256 * 256; i++) { Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java Tue Dec 4 15:16:02 2012 @@ -156,11 +156,12 @@ public class MetadataExample { private static void printTagValue(JpegImageMetadata jpegMetadata, TagInfo tagInfo) { TiffField field = jpegMetadata.findEXIFValueWithExactMatch(tagInfo); - if (field == null) + if (field == null) { System.out.println(tagInfo.name + ": " + "Not Found."); - else + } else { System.out.println(tagInfo.name + ": " + field.getValueDescription()); + } } } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java Tue Dec 4 15:16:02 2012 @@ -83,10 +83,12 @@ public class SampleUsage { // transparency, etc.) ImageInfo imageInfo = Imaging.getImageInfo(imageBytes); - if (imageInfo.getColorType() == ImageInfo.COLOR_TYPE_GRAYSCALE) + if (imageInfo.getColorType() == ImageInfo.COLOR_TYPE_GRAYSCALE) { System.out.println("Grayscale image."); - if (imageInfo.getHeight() > 1000) + } + if (imageInfo.getHeight() > 1000) { System.out.println("Large image."); + } // try to guess the image's format. ImageFormat image_format = Imaging.guessFormat(imageBytes); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java Tue Dec 4 15:16:02 2012 @@ -45,12 +45,13 @@ public class WriteExifMetadataExample { new ExifRewriter().removeExifMetadata(jpegImageFile, os); } finally { - if (os != null) + if (os != null) { try { os.close(); } catch (IOException e) { } + } } } @@ -94,8 +95,9 @@ public class WriteExifMetadataExample { // if file does not contain any exif metadata, we create an empty // set of exif metadata. Otherwise, we keep all of the other // existing tags. - if (null == outputSet) + if (null == outputSet) { outputSet = new TiffOutputSet(); + } { // Example of how to add a field/tag to the output set. @@ -146,12 +148,13 @@ public class WriteExifMetadataExample { os.close(); os = null; } finally { - if (os != null) + if (os != null) { try { os.close(); } catch (IOException e) { } + } } } @@ -223,9 +226,10 @@ public class WriteExifMetadataExample { // EXIF website. TiffOutputDirectory exifDirectory = outputSet .getExifDirectory(); - if (null != exifDirectory) + if (null != exifDirectory) { exifDirectory .removeField(ExifTagConstants.EXIF_TAG_APERTURE_VALUE); + } } os = new FileOutputStream(dst); @@ -237,12 +241,13 @@ public class WriteExifMetadataExample { os.close(); os = null; } finally { - if (os != null) + if (os != null) { try { os.close(); } catch (IOException e) { } + } } } @@ -286,8 +291,9 @@ public class WriteExifMetadataExample { // if file does not contain any exif metadata, we create an empty // set of exif metadata. Otherwise, we keep all of the other // existing tags. - if (null == outputSet) + if (null == outputSet) { outputSet = new TiffOutputSet(); + } { // Example of how to add/update GPS info to output set. @@ -309,12 +315,13 @@ public class WriteExifMetadataExample { os.close(); os = null; } finally { - if (os != null) + if (os != null) { try { os.close(); } catch (IOException e) { } + } } } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java Tue Dec 4 15:16:02 2012 @@ -35,8 +35,9 @@ public class BmpReadTest extends BmpBase List images = getBmpImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java Tue Dec 4 15:16:02 2012 @@ -35,15 +35,17 @@ public class BmpRoundtripTest extends Bm private int[][] getSimpleRawData(int width, int height, int value) { int[][] result = new int[height][width]; - for (int y = 0; y < height; y++) - for (int x = 0; x < width; x++) + for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) { result[y][x] = value; + } + } return result; } private int[][] getAscendingRawData(int width, int height) { int[][] result = new int[height][width]; - for (int y = 0; y < height; y++) + for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { int alpha = (x + y) % 256; int value = (x + y) % 256; @@ -52,17 +54,19 @@ public class BmpRoundtripTest extends Bm result[y][x] = argb; } + } return result; } private int[][] randomRawData(int width, int height) { Random random = new Random(); int[][] result = new int[height][width]; - for (int y = 0; y < height; y++) + for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { int argb = random.nextInt(); result[y][x] = argb; } + } return result; } @@ -101,10 +105,11 @@ public class BmpRoundtripTest extends Bm int height = rawData.length; BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); - for (int y = 0; y < height; y++) + for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { image.setRGB(x, y, rawData[y][x]); } + } return image; } @@ -113,10 +118,11 @@ public class BmpRoundtripTest extends Bm int height = image.getHeight(); int[][] result = new int[height][width]; - for (int y = 0; y < height; y++) + for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { result[y][x] = image.getRGB(x, y); } + } return result; } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java Tue Dec 4 15:16:02 2012 @@ -35,8 +35,9 @@ public class DcxReadTest extends DcxBase List images = getDcxImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java Tue Dec 4 15:16:02 2012 @@ -33,8 +33,9 @@ public class GifReadTest extends GifBase List images = getGifImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java Tue Dec 4 15:16:02 2012 @@ -35,8 +35,9 @@ public class IcnsReadTest extends IcnsBa List images = getIcnsImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java Tue Dec 4 15:16:02 2012 @@ -75,10 +75,11 @@ public class IcnsRoundTripTest extends I bos.write4Bytes(4 + 4 + 16 * 16); for (int y = 0; y < 16; y++) { for (int x = 0; x < 16; x++) { - if (image[y][x] != 0) + if (image[y][x] != 0) { bos.write(0xff); - else + } else { bos.write(0x00); + } } } bos.flush(); @@ -99,10 +100,11 @@ public class IcnsRoundTripTest extends I // 8 BPP image for (int y = 0; y < 16; y++) { for (int x = 0; x < 16; x++) { - if (image[y][x] != 0) + if (image[y][x] != 0) { bos.write(0xff); - else + } else { bos.write(43); + } } } // 8 BPP alpha mask @@ -110,10 +112,11 @@ public class IcnsRoundTripTest extends I bos.write4Bytes(4 + 4 + 16 * 16); for (int y = 0; y < 16; y++) { for (int x = 0; x < 16; x++) { - if (image[y][x] != 0) + if (image[y][x] != 0) { bos.write(0xff); - else + } else { bos.write(0x00); + } } } bos.flush(); @@ -135,10 +138,11 @@ public class IcnsRoundTripTest extends I // 8 BPP image for (int y = 0; y < 16; y++) { for (int x = 0; x < 16; x++) { - if (image[y][x] != 0) + if (image[y][x] != 0) { bos.write(0xff); - else + } else { bos.write(43); + } } } // 8 BPP alpha mask, some transparent @@ -146,10 +150,11 @@ public class IcnsRoundTripTest extends I bos.write4Bytes(4 + 4 + 16 * 16); for (int y = 0; y < 16; y++) { for (int x = 0; x < 16; x++) { - if (image[y][x] != 0) + if (image[y][x] != 0) { bos.write(0xff); - else + } else { bos.write(0x00); + } } } // 1 BPP mask @@ -160,8 +165,9 @@ public class IcnsRoundTripTest extends I for (int x = 0; x < 16; x += 8) { int eightBits = 0; for (int pos = 0; pos < 8; pos++) { - if (image[y][x + pos] != 0) + if (image[y][x + pos] != 0) { eightBits |= (1 << (7 - pos)); + } } bos.write(eightBits); } @@ -190,10 +196,11 @@ public class IcnsRoundTripTest extends I // 8 BPP image for (int y = 0; y < 16; y++) { for (int x = 0; x < 16; x++) { - if (image[y][x] != 0) + if (image[y][x] != 0) { bos.write(0xff); - else + } else { bos.write(43); + } } } // 1 BPP mask @@ -204,8 +211,9 @@ public class IcnsRoundTripTest extends I for (int x = 0; x < 16; x += 8) { int eightBits = 0; for (int pos = 0; pos < 8; pos++) { - if (image[y][x + pos] != 0) + if (image[y][x + pos] != 0) { eightBits |= (1 << (7 - pos)); + } } bos.write(eightBits); } @@ -220,10 +228,11 @@ public class IcnsRoundTripTest extends I bos.write4Bytes(4 + 4 + 16 * 16); for (int y = 0; y < 16; y++) { for (int x = 0; x < 16; x++) { - if (image[y][x] != 0) + if (image[y][x] != 0) { bos.write(0xff); - else + } else { bos.write(0x00); + } } } bos.flush(); @@ -244,10 +253,11 @@ public class IcnsRoundTripTest extends I // 8 BPP image for (int y = 0; y < 16; y++) { for (int x = 0; x < 16; x++) { - if (image[y][x] != 0) + if (image[y][x] != 0) { bos.write(0xff); - else + } else { bos.write(43); + } } } bos.flush(); @@ -270,10 +280,11 @@ public class IcnsRoundTripTest extends I // argb, a ignored bos.write(0); final int pixel; - if (image[y][x] != 0) + if (image[y][x] != 0) { pixel = foreground; - else + } else { pixel = background; + } bos.write(0xff & (pixel >> 16)); bos.write(0xff & (pixel >> 8)); bos.write(0xff & pixel); @@ -286,8 +297,9 @@ public class IcnsRoundTripTest extends I for (int x = 0; x < 16; x += 8) { int eightBits = 0; for (int pos = 0; pos < 8; pos++) { - if (image[y][x + pos] != 0) + if (image[y][x + pos] != 0) { eightBits |= (1 << (7 - pos)); + } } bos.write(eightBits); } @@ -297,8 +309,9 @@ public class IcnsRoundTripTest extends I for (int x = 0; x < 16; x += 8) { int eightBits = 0; for (int pos = 0; pos < 8; pos++) { - if (image[y][x + pos] != 0) + if (image[y][x + pos] != 0) { eightBits |= (1 << (7 - pos)); + } } bos.write(eightBits); } @@ -323,10 +336,11 @@ public class IcnsRoundTripTest extends I // argb, a ignored bos.write(0); final int pixel; - if (image[y][x] != 0) + if (image[y][x] != 0) { pixel = foreground; - else + } else { pixel = background; + } bos.write(0xff & (pixel >> 16)); bos.write(0xff & (pixel >> 8)); bos.write(0xff & pixel); @@ -339,8 +353,9 @@ public class IcnsRoundTripTest extends I for (int x = 0; x < 16; x += 8) { int eightBits = 0; for (int pos = 0; pos < 8; pos++) { - if (image[y][x + pos] != 0) + if (image[y][x + pos] != 0) { eightBits |= (1 << (7 - pos)); + } } bos.write(eightBits); } @@ -373,10 +388,11 @@ public class IcnsRoundTripTest extends I // argb, a ignored bos.write(0); final int pixel; - if (image[y][x] != 0) + if (image[y][x] != 0) { pixel = foreground; - else + } else { pixel = background; + } bos.write(0xff & (pixel >> 16)); bos.write(0xff & (pixel >> 8)); bos.write(0xff & pixel); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java Tue Dec 4 15:16:02 2012 @@ -35,8 +35,9 @@ public class IcoReadTest extends IcoBase List images = getIcoImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java Tue Dec 4 15:16:02 2012 @@ -80,8 +80,9 @@ public class IcoRoundtripTest extends Ic bos.write(0); bos.write3Bytes(foreground); bos.write(0); - for (int i = 2; i < paletteSize; i++) + for (int i = 2; i < paletteSize; i++) { bos.write4Bytes(0); + } // Image for (int y = 15; y >= 0; y--) { for (int x = 0; x < 16; x += 8) { @@ -122,8 +123,9 @@ public class IcoRoundtripTest extends Ic bos.write(0); bos.write3Bytes(foreground); bos.write(0); - for (int i = 2; i < paletteSize; i++) + for (int i = 2; i < paletteSize; i++) { bos.write4Bytes(0); + } // Image for (int y = 15; y >= 0; y--) { for (int x = 0; x < 16; x += 2) { @@ -155,8 +157,9 @@ public class IcoRoundtripTest extends Ic bos.write(0); bos.write3Bytes(foreground); bos.write(0); - for (int i = 2; i < paletteSize; i++) + for (int i = 2; i < paletteSize; i++) { bos.write4Bytes(0); + } // Image for (int y = 15; y >= 0; y--) { for (int x = 0; x < 16; x++) { @@ -183,19 +186,21 @@ public class IcoRoundtripTest extends Ic BinaryOutputStream bos = new BinaryOutputStream(byteArrayStream, ByteOrder.LITTLE_ENDIAN); // Palette - for (int i = 0; i < paletteSize; i++) + for (int i = 0; i < paletteSize; i++) { bos.write4Bytes(0); + } // Image for (int y = 15; y >= 0; y--) { for (int x = 0; x < 16; x++) { - if (image[y][x] == 1) + if (image[y][x] == 1) { bos.write2Bytes((0x1f & (foreground >> 3)) | ((0x1f & (foreground >> 11)) << 5) | ((0x1f & (foreground >> 19)) << 10)); - else + } else { bos.write2Bytes((0x1f & (background >> 3)) | ((0x1f & (background >> 11)) << 5) | ((0x1f & (background >> 19)) << 10)); + } } } // Mask @@ -218,15 +223,17 @@ public class IcoRoundtripTest extends Ic BinaryOutputStream bos = new BinaryOutputStream(byteArrayStream, ByteOrder.LITTLE_ENDIAN); // Palette - for (int i = 0; i < paletteSize; i++) + for (int i = 0; i < paletteSize; i++) { bos.write4Bytes(0); + } // Image for (int y = 15; y >= 0; y--) { for (int x = 0; x < 16; x++) { - if (image[y][x] == 1) + if (image[y][x] == 1) { bos.write3Bytes(0xffffff & foreground); - else + } else { bos.write3Bytes(0xffffff & background); + } } } // Mask @@ -255,15 +262,17 @@ public class IcoRoundtripTest extends Ic BinaryOutputStream bos = new BinaryOutputStream(byteArrayStream, ByteOrder.LITTLE_ENDIAN); // Palette - for (int i = 0; i < paletteSize; i++) + for (int i = 0; i < paletteSize; i++) { bos.write4Bytes(0); + } // Image for (int y = 15; y >= 0; y--) { for (int x = 0; x < 16; x++) { - if (image[y][x] == 1) + if (image[y][x] == 1) { bos.write4Bytes(foreground); - else + } else { bos.write4Bytes(background); + } } } // Mask Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java Tue Dec 4 15:16:02 2012 @@ -34,8 +34,9 @@ public class JpegReadTest extends JpegBa public void test() throws Exception { List images = getJpegImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile.getAbsoluteFile()); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java Tue Dec 4 15:16:02 2012 @@ -45,8 +45,9 @@ public class AsciiFieldTest extends Exif // note that exif might be null if no Exif metadata is found. TiffImageMetadata exif = jpegMetadata.getExif(); - if (null == exif) + if (null == exif) { return; + } List fields = exif.getAllFields(); Map fieldMap = new Hashtable(); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java Tue Dec 4 15:16:02 2012 @@ -37,10 +37,12 @@ public abstract class ExifBaseTest exten // Debug.debug("hasExifData file", file.getAbsoluteFile()); if (!file.getName().toLowerCase().endsWith(".jpg")) + { return false; // ImageFormat format = Sanselan.guessFormat(file); // if (format != ImageFormat.IMAGE_FORMAT_JPEG) // return false; + } // Debug.debug("possible file", file); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java Tue Dec 4 15:16:02 2012 @@ -38,8 +38,9 @@ public class ExifDumpTest extends ExifBa public void test() throws Exception { List images = getImagesWithExifData(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); @@ -56,8 +57,10 @@ public class ExifDumpTest extends ExifBa JpegImageMetadata metadata = (JpegImageMetadata) Imaging .getMetadata(imageFile, params); if (null == metadata) + { continue; // assertNotNull(metadata.getExif()); + } metadata.dump(); } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java Tue Dec 4 15:16:02 2012 @@ -55,15 +55,17 @@ public class ExifRewriteTest extends Exi public void testRemove() throws Exception { List images = getImagesWithExifData(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - if (ignoreImageData) + if (ignoreImageData) { continue; + } ByteSource byteSource = new ByteSourceFile(imageFile); Debug.debug("Source Segments:"); @@ -94,15 +96,17 @@ public class ExifRewriteTest extends Exi public void testInsert() throws Exception { List images = getImagesWithExifData(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - if (ignoreImageData) + if (ignoreImageData) { continue; + } ByteSource byteSource = new ByteSourceFile(imageFile); Debug.debug("Source Segments:"); @@ -173,8 +177,9 @@ public class ExifRewriteTest extends Exi ImageReadException, ImageWriteException { List images = getImagesWithExifData(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); @@ -183,8 +188,9 @@ public class ExifRewriteTest extends Exi Debug.debug("imageFile", imageFile); boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - if (ignoreImageData) + if (ignoreImageData) { continue; + } ByteSource byteSource = new ByteSourceFile(imageFile); Debug.debug("Source Segments:"); @@ -192,13 +198,15 @@ public class ExifRewriteTest extends Exi JpegImageMetadata oldMetadata = (JpegImageMetadata) Imaging .getMetadata(imageFile); - if (null == oldMetadata) + if (null == oldMetadata) { continue; + } assertNotNull(oldMetadata); TiffImageMetadata oldExifMetadata = oldMetadata.getExif(); - if (null == oldExifMetadata) + if (null == oldExifMetadata) { continue; + } assertNotNull(oldExifMetadata); oldMetadata.dump(); @@ -292,8 +300,9 @@ public class ExifRewriteTest extends Exi for (int i = 0; i < items.size(); i++) { TiffImageMetadata.Item item = (TiffImageMetadata.Item) items.get(i); TiffField field = item.getTiffField(); - if (!fieldMap.containsKey(field.tag)) + if (!fieldMap.containsKey(field.tag)) { fieldMap.put(field.tag, field); + } } return fieldMap; } @@ -407,8 +416,9 @@ public class ExifRewriteTest extends Exi break; } } - if (hasInvalidByte) + if (hasInvalidByte) { continue; + } } assertEquals(oldField.length, newField.length); @@ -445,9 +455,9 @@ public class ExifRewriteTest extends Exi String label = imageFile.getName() + ", dirType[" + i + "]=" + dirType + ", fieldTag[" + j + "]=" + fieldTag; - if (oldField.tag == 0x116 || oldField.tag == 0x117) + if (oldField.tag == 0x116 || oldField.tag == 0x117) { compare(label, oldField, newField); - else { + } else { compare(label, oldField.valueOffsetBytes, newField.valueOffsetBytes, oldField.getBytesLength(), @@ -524,7 +534,8 @@ public class ExifRewriteTest extends Exi assertNotNull(a); assertNotNull(b); assertEquals(a.length, b.length); - for (int i = 0; i < a.length; i++) + for (int i = 0; i < a.length; i++) { assertEquals(a[i], b[i]); + } } } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java Tue Dec 4 15:16:02 2012 @@ -34,8 +34,9 @@ public class GpsTest extends ExifBaseTes List images = getImagesWithExifData(300); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); @@ -43,8 +44,9 @@ public class GpsTest extends ExifBaseTes // Debug.debug("imageFile", imageFile); if (imageFile.getParentFile().getName().toLowerCase() - .equals("@broken")) + .equals("@broken")) { continue; + } try { Map params = new HashMap(); @@ -54,16 +56,19 @@ public class GpsTest extends ExifBaseTes JpegImageMetadata metadata = (JpegImageMetadata) Imaging .getMetadata(imageFile, params); - if (null == metadata) + if (null == metadata) { continue; + } TiffImageMetadata exifMetadata = metadata.getExif(); - if (null == exifMetadata) + if (null == exifMetadata) { continue; + } TiffImageMetadata.GPSInfo gpsInfo = exifMetadata.getGPS(); - if (null == gpsInfo) + if (null == gpsInfo) { continue; + } Debug.debug("imageFile", imageFile); Debug.debug("gpsInfo", gpsInfo); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java Tue Dec 4 15:16:02 2012 @@ -48,13 +48,15 @@ public abstract class SpecificExifTagTes public void testAllImages() throws Exception { List images = getImagesWithExifData(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); if (imageFile.getParentFile().getName().toLowerCase() - .equals("@broken")) + .equals("@broken")) { continue; + } checkImage(imageFile); } } @@ -72,14 +74,16 @@ public abstract class SpecificExifTagTes // note that metadata might be null if no metadata is found. IImageMetadata metadata = Imaging.getMetadata(imageFile, params); - if (null == metadata) + if (null == metadata) { return; + } JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata; // note that exif might be null if no Exif metadata is found. TiffImageMetadata exif = jpegMetadata.getExif(); - if (null == exif) + if (null == exif) { return; + } List fields = exif.getAllFields(); for (int i = 0; i < fields.size(); i++) { Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.java Tue Dec 4 15:16:02 2012 @@ -51,8 +51,9 @@ public class TextFieldTest extends Speci * do * nothing */ - } else + } else { return; + } // Debug.debug("field", field); // Debug.debug("field", Debug.getType(field)); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java Tue Dec 4 15:16:02 2012 @@ -35,8 +35,9 @@ public class WriteExifMetadataExampleTes public void test() throws Exception { List images = getJpegImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile.getAbsoluteFile()); @@ -46,8 +47,9 @@ public class WriteExifMetadataExampleTes try { boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - if (ignoreImageData) + if (ignoreImageData) { continue; + } new WriteExifMetadataExample().changeExifMetadata(imageFile, tempFile); } catch (ExifRewriter.ExifOverflowException e) { @@ -60,8 +62,9 @@ public class WriteExifMetadataExampleTes public void testInsert() throws Exception { List images = getJpegImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile.getAbsoluteFile()); @@ -71,8 +74,9 @@ public class WriteExifMetadataExampleTes try { boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - if (ignoreImageData) + if (ignoreImageData) { continue; + } new WriteExifMetadataExample().changeExifMetadata(imageFile, tempFile); } catch (ExifRewriter.ExifOverflowException e) { Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java Tue Dec 4 15:16:02 2012 @@ -32,10 +32,12 @@ public abstract class IptcBaseTest exten // Debug.debug("hasIptcData file", file.getAbsoluteFile()); if (!file.getName().toLowerCase().endsWith(".jpg")) + { return false; // ImageFormat format = Sanselan.guessFormat(file); // if (format != ImageFormat.IMAGE_FORMAT_JPEG) // return false; + } try { ByteSource byteSource = new ByteSourceFile(file); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java Tue Dec 4 15:16:02 2012 @@ -33,8 +33,9 @@ public class IptcDumpTest extends IptcBa public void test() throws Exception { List images = getImagesWithIptcData(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); @@ -65,10 +66,11 @@ public class IptcDumpTest extends IptcBa Debug.debug(); for (int j = 0; j < oldRecords.size(); j++) { IptcRecord record = oldRecords.get(j); - if (record.iptcType != IptcTypes.CITY) + if (record.iptcType != IptcTypes.CITY) { Debug.debug("Key: " + record.iptcType.getName() + " (0x" + Integer.toHexString(record.iptcType.getType()) + "), value: " + record.value); + } } Debug.debug(); } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java Tue Dec 4 15:16:02 2012 @@ -58,8 +58,9 @@ public class IptcUpdateTest extends Iptc public void testRemove() throws Exception { List images = imagesWithIptcData; for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); // Debug.debug("imageFile", imageFile); @@ -106,8 +107,9 @@ public class IptcUpdateTest extends Iptc public void testRemoveInsertUpdate() throws Exception { List images = imagesWithIptcData; for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); @@ -163,8 +165,9 @@ public class IptcUpdateTest extends Iptc for (int j = 0; j < oldRecords.size(); j++) { IptcRecord record = oldRecords.get(j); if (record.iptcType != IptcTypes.CITY - && record.iptcType != IptcTypes.CREDIT) + && record.iptcType != IptcTypes.CREDIT) { newRecords.add(record); + } } newRecords.add(new IptcRecord(IptcTypes.CITY, "Albany, NY")); @@ -301,8 +304,9 @@ public class IptcUpdateTest extends Iptc public void testAddIptcData() throws Exception { List images = getJpegImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); // Debug.debug("imageFile", imageFile); @@ -326,9 +330,10 @@ public class IptcUpdateTest extends Iptc if (null != metadata) { boolean keepOldIptcNonTextValues = true; - if (keepOldIptcNonTextValues) + if (keepOldIptcNonTextValues) { newBlocks.addAll(metadata.photoshopApp13Data .getNonIptcBlocks()); + } boolean keepOldIptcTextValues = true; if (keepOldIptcTextValues) { List oldRecords = metadata.photoshopApp13Data @@ -338,8 +343,9 @@ public class IptcUpdateTest extends Iptc for (int j = 0; j < oldRecords.size(); j++) { IptcRecord record = oldRecords.get(j); if (record.iptcType != IptcTypes.CITY - && record.iptcType != IptcTypes.CREDIT) + && record.iptcType != IptcTypes.CREDIT) { newRecords.add(record); + } } } } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java Tue Dec 4 15:16:02 2012 @@ -31,10 +31,12 @@ public abstract class JpegXmpBaseTest ex protected static boolean hasJpegXmpData(File file) { if (!file.getName().toLowerCase().endsWith(".jpg")) + { return false; // ImageFormat format = Sanselan.guessFormat(file); // if (format != ImageFormat.IMAGE_FORMAT_JPEG) // return false; + } // Debug.debug("possible file", file); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java Tue Dec 4 15:16:02 2012 @@ -32,8 +32,9 @@ public class JpegXmpDumpTest extends Jpe public void test() throws Exception { List images = getImagesWithXmpData(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java Tue Dec 4 15:16:02 2012 @@ -36,8 +36,9 @@ public class JpegXmpRewriteTest extends public void testRemoveInsertUpdate() throws Exception { List images = getImagesWithXmpData(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java Tue Dec 4 15:16:02 2012 @@ -35,8 +35,9 @@ public class PamReadTest extends PamBase List images = getPamImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java Tue Dec 4 15:16:02 2012 @@ -35,8 +35,9 @@ public class PcxReadTest extends PcxBase List images = getPcxImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java Tue Dec 4 15:16:02 2012 @@ -32,14 +32,17 @@ public class ConvertPngToGifTest extends List images = getPngImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); if (isInvalidPNGTestFile(imageFile)) + { continue; // Debug.debug("imageFile", imageFile); // Debug.debug(); + } Hashtable params = new Hashtable(); // params.put(SanselanConstants.PARAM_KEY_VERBOSE, Boolean.TRUE); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java Tue Dec 4 15:16:02 2012 @@ -38,10 +38,12 @@ public class PngMultipleRoundtripTest ex File files[] = imagesFolder.listFiles(); for (File file : files) { File imageFile = file; - if (!imageFile.isFile()) + if (!imageFile.isFile()) { continue; - if (!imageFile.getName().toLowerCase().endsWith(".png")) + } + if (!imageFile.getName().toLowerCase().endsWith(".png")) { continue; + } Debug.debug(); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java Tue Dec 4 15:16:02 2012 @@ -33,8 +33,9 @@ public class PngReadTest extends PngBase List images = getPngImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java Tue Dec 4 15:16:02 2012 @@ -78,14 +78,15 @@ public class PngTextTest extends PngBase assertEquals(readTexts.size(), 3); for (int i = 0; i < readTexts.size(); i++) { PngText text = readTexts.get(i); - if (text.keyword.equals("a")) + if (text.keyword.equals("a")) { assertEquals(text.text, "b"); - else if (text.keyword.equals("c")) + } else if (text.keyword.equals("c")) { assertEquals(text.text, "d"); - else if (text.keyword.equals("e")) + } else if (text.keyword.equals("e")) { assertEquals(text.text, "f"); - else + } else { fail("unknown text chunk."); + } } } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java Tue Dec 4 15:16:02 2012 @@ -34,13 +34,15 @@ public class PngWriteForceTrueColorText List images = getPngImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); try { - if (isInvalidPNGTestFile(imageFile)) + if (isInvalidPNGTestFile(imageFile)) { continue; + } Debug.debug("imageFile", imageFile); // Debug.debug(); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java Tue Dec 4 15:16:02 2012 @@ -39,15 +39,17 @@ public class PngWriteReadTest extends Im private int[][] getSimpleRawData(int width, int height, int value) { int[][] result = new int[height][width]; - for (int y = 0; y < height; y++) - for (int x = 0; x < width; x++) + for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) { result[y][x] = value; + } + } return result; } private int[][] getAscendingRawData(int width, int height) { int[][] result = new int[height][width]; - for (int y = 0; y < height; y++) + for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { int alpha = (x + y) % 256; int value = (x + y) % 256; @@ -56,17 +58,19 @@ public class PngWriteReadTest extends Im result[y][x] = argb; } + } return result; } private int[][] randomRawData(int width, int height) { Random random = new Random(); int[][] result = new int[height][width]; - for (int y = 0; y < height; y++) + for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { int argb = random.nextInt(); result[y][x] = argb; } + } return result; } @@ -101,10 +105,11 @@ public class PngWriteReadTest extends Im int height = rawData.length; BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); - for (int y = 0; y < height; y++) + for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { image.setRGB(x, y, rawData[y][x]); } + } return image; } @@ -113,10 +118,11 @@ public class PngWriteReadTest extends Im int height = image.getHeight(); int[][] result = new int[height][width]; - for (int y = 0; y < height; y++) + for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { result[y][x] = image.getRGB(x, y); } + } return result; } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java Tue Dec 4 15:16:02 2012 @@ -17,8 +17,9 @@ public class PsdReadTest extends PsdBase List images = getPsdImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java Tue Dec 4 15:16:02 2012 @@ -319,7 +319,7 @@ public class TiffCcittTest extends TiffB assertEquals(a.getWidth(), b.getWidth()); assertEquals(a.getHeight(), b.getHeight()); - for (int x = 0; x < a.getWidth(); x++) + for (int x = 0; x < a.getWidth(); x++) { for (int y = 0; y < a.getHeight(); y++) { int a_argb = a.getRGB(x, y); int b_argb = b.getRGB(x, y); @@ -335,5 +335,6 @@ public class TiffCcittTest extends TiffB } assertEquals(a_argb, b_argb); } + } } } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java Tue Dec 4 15:16:02 2012 @@ -39,8 +39,9 @@ public class TiffLzwTest extends TiffBas int LENGTH = 1024 * 32; byte bytes[] = new byte[LENGTH]; for (int modulator = 1; modulator < 255; modulator += 3) { - for (int i = 0; i < LENGTH; i++) + for (int i = 0; i < LENGTH; i++) { bytes[i] = (byte) (0xff & (i % modulator)); + } compressRoundtripAndValidate(bytes); } @@ -153,8 +154,9 @@ public class TiffLzwTest extends TiffBas byte decompressed[] = decompressor.decompress(is, src.length); assertEquals(src.length, decompressed.length); - for (int i = 0; i < src.length; i++) + for (int i = 0; i < src.length; i++) { assertEquals(src[i], decompressed[i]); + } } private void decompressRoundtripAndValidate(byte src[]) throws IOException { @@ -246,8 +248,9 @@ public class TiffLzwTest extends TiffBas byte compressed[] = compressor.compress(decompressed); assertEquals(src.length, compressed.length); - for (int i = 0; i < src.length; i++) + for (int i = 0; i < src.length; i++) { assertEquals(src[i], compressed[i]); + } } } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java Tue Dec 4 15:16:02 2012 @@ -31,8 +31,9 @@ public class TiffReadTest extends TiffBa public void test() throws Exception { List images = getTiffImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java Tue Dec 4 15:16:02 2012 @@ -34,8 +34,9 @@ public class TiffRoundtripTest extends T public void test() throws Exception { List images = getTiffImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java Tue Dec 4 15:16:02 2012 @@ -33,8 +33,9 @@ public class WbmpReadTest extends WbmpBa List images = getWbmpImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java Tue Dec 4 15:16:02 2012 @@ -33,8 +33,9 @@ public class XbmReadTest extends XbmBase List images = getXbmImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); Debug.debug("imageFile", imageFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java?rev=1416984&r1=1416983&r2=1416984&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java Tue Dec 4 15:16:02 2012 @@ -29,21 +29,24 @@ public class XmpDumpTest extends Imaging public void test() throws Exception { List images = getTestImages(); for (int i = 0; i < images.size(); i++) { - if (i % 10 == 0) + if (i % 10 == 0) { Debug.purgeMemory(); + } File imageFile = images.get(i); if (imageFile.getName().toLowerCase().endsWith(".png") - && isInvalidPNGTestFile(imageFile)) + && isInvalidPNGTestFile(imageFile)) { continue; + } Debug.debug("imageFile", imageFile); Debug.debug(); String xmpXml = Imaging.getXmpXml(imageFile); - if (null == xmpXml) + if (null == xmpXml) { continue; + } assertNotNull(xmpXml);