You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2010/09/10 02:34:41 UTC
svn commit: r995616 - in
/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan: ./
formats/bmp/ formats/gif/ formats/jpeg/ formats/jpeg/exif/
formats/jpeg/iptc/ formats/jpeg/xmp/ formats/png/ formats/tiff/
formats/xmp/ sampleUsage/
Author: sebb
Date: Fri Sep 10 00:34:40 2010
New Revision: 995616
URL: http://svn.apache.org/viewvc?rev=995616&view=rev
Log:
Remove unthrown Exceptions
Modified:
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/SanselanGuessFormatTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/bmp/BmpReadTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/gif/GifReadTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegReadTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifBaseTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcBaseTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcDumpTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpBaseTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpDumpTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/png/PngReadTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/tiff/TiffReadTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/xmp/XmpDumpTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/sampleUsage/MetadataExample.java
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/SanselanGuessFormatTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/SanselanGuessFormatTest.java?rev=995616&r1=995615&r2=995616&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/SanselanGuessFormatTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/SanselanGuessFormatTest.java Fri Sep 10 00:34:40 2010
@@ -35,8 +35,7 @@ public class SanselanGuessFormatTest ext
public static final String PPM_IMAGE_FILE = "pxm\\1\\Oregon Scientific DS6639 - DSC_0307 - small.ppm";
public static final String TGA_IMAGE_FILE = "tga\\1\\Oregon Scientific DS6639 - DSC_0307 - small.tga";
- public void testGuess_all() throws IOException, ImageReadException,
- ImageWriteException {
+ public void testGuess_all() throws IOException, ImageReadException {
testGuess(ImageFormat.IMAGE_FORMAT_PNG, PNG_IMAGE_FILE);
testGuess(ImageFormat.IMAGE_FORMAT_GIF, GIF_IMAGE_FILE);
// TODO(cmchen): add ability to sniff ICOs if possible.
@@ -57,13 +56,12 @@ public class SanselanGuessFormatTest ext
public static final String UNKNOWN_IMAGE_FILE = "jpg\\1\\info.txt";
- public void testGuess_unknown() throws IOException, ImageReadException,
- ImageWriteException {
+ public void testGuess_unknown() throws IOException, ImageReadException {
testGuess(ImageFormat.IMAGE_FORMAT_UNKNOWN, UNKNOWN_IMAGE_FILE);
}
public void testGuess(ImageFormat expectedFormat, String imagePath)
- throws IOException, ImageReadException, ImageWriteException {
+ throws IOException, ImageReadException {
imagePath = FilenameUtils.separatorsToSystem(imagePath);
File imageFile = new File(TEST_IMAGE_FOLDER, imagePath);
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/bmp/BmpReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/bmp/BmpReadTest.java?rev=995616&r1=995615&r2=995616&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/bmp/BmpReadTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/bmp/BmpReadTest.java Fri Sep 10 00:34:40 2010
@@ -26,7 +26,6 @@ import java.util.Map;
import org.apache.sanselan.ImageInfo;
import org.apache.sanselan.ImageReadException;
-import org.apache.sanselan.ImageWriteException;
import org.apache.sanselan.Sanselan;
import org.apache.sanselan.common.IImageMetadata;
import org.apache.sanselan.util.Debug;
@@ -34,8 +33,7 @@ import org.apache.sanselan.util.Debug;
public class BmpReadTest extends BmpBaseTest
{
- public void test() throws IOException, ImageReadException,
- ImageWriteException
+ public void test() throws IOException, ImageReadException
{
Debug.debug("start");
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/gif/GifReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/gif/GifReadTest.java?rev=995616&r1=995615&r2=995616&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/gif/GifReadTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/gif/GifReadTest.java Fri Sep 10 00:34:40 2010
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.sanselan.ImageInfo;
import org.apache.sanselan.ImageReadException;
-import org.apache.sanselan.ImageWriteException;
import org.apache.sanselan.Sanselan;
import org.apache.sanselan.common.IImageMetadata;
import org.apache.sanselan.util.Debug;
@@ -32,8 +31,7 @@ import org.apache.sanselan.util.Debug;
public class GifReadTest extends GifBaseTest
{
- public void test() throws IOException, ImageReadException,
- ImageWriteException
+ public void test() throws IOException, ImageReadException
{
Debug.debug("start");
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegReadTest.java?rev=995616&r1=995615&r2=995616&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegReadTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegReadTest.java Fri Sep 10 00:34:40 2010
@@ -25,7 +25,6 @@ import java.util.Map;
import org.apache.sanselan.ImageInfo;
import org.apache.sanselan.ImageReadException;
-import org.apache.sanselan.ImageWriteException;
import org.apache.sanselan.Sanselan;
import org.apache.sanselan.common.IImageMetadata;
import org.apache.sanselan.util.Debug;
@@ -33,8 +32,7 @@ import org.apache.sanselan.util.Debug;
public class JpegReadTest extends JpegBaseTest
{
- public void test() throws IOException, ImageReadException,
- ImageWriteException
+ public void test() throws IOException, ImageReadException
{
List images = getJpegImages();
for (int i = 0; i < images.size(); i++)
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifBaseTest.java?rev=995616&r1=995615&r2=995616&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifBaseTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifBaseTest.java Fri Sep 10 00:34:40 2010
@@ -34,8 +34,7 @@ public abstract class ExifBaseTest exten
// super(name);
// }
- protected static boolean hasExifData(File file) throws IOException,
- ImageReadException
+ protected static boolean hasExifData(File file)
{
// Debug.debug("hasExifData file", file.getAbsoluteFile());
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcBaseTest.java?rev=995616&r1=995615&r2=995616&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcBaseTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcBaseTest.java Fri Sep 10 00:34:40 2010
@@ -29,8 +29,7 @@ import org.apache.sanselan.formats.jpeg.
public abstract class IptcBaseTest extends SanselanTest
{
- protected static boolean hasIptcData(File file) throws IOException,
- ImageReadException
+ protected static boolean hasIptcData(File file)
{
// Debug.debug("hasIptcData file", file.getAbsoluteFile());
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcDumpTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcDumpTest.java?rev=995616&r1=995615&r2=995616&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcDumpTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/iptc/IptcDumpTest.java Fri Sep 10 00:34:40 2010
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import org.apache.sanselan.ImageReadException;
-import org.apache.sanselan.ImageWriteException;
import org.apache.sanselan.Sanselan;
import org.apache.sanselan.formats.jpeg.JpegImageMetadata;
import org.apache.sanselan.formats.jpeg.JpegPhotoshopMetadata;
@@ -33,8 +32,7 @@ import org.apache.sanselan.util.Debug;
public class IptcDumpTest extends IptcBaseTest
{
- public void test() throws IOException, ImageReadException,
- ImageWriteException
+ public void test() throws IOException, ImageReadException
{
List images = getImagesWithIptcData();
for (int i = 0; i < images.size(); i++)
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpBaseTest.java?rev=995616&r1=995615&r2=995616&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpBaseTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpBaseTest.java Fri Sep 10 00:34:40 2010
@@ -30,8 +30,7 @@ import org.apache.sanselan.formats.jpeg.
public abstract class JpegXmpBaseTest extends SanselanTest
{
- protected static boolean hasJpegXmpData(File file) throws IOException,
- ImageReadException
+ protected static boolean hasJpegXmpData(File file)
{
if (!file.getName().toLowerCase().endsWith(".jpg"))
return false;
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpDumpTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpDumpTest.java?rev=995616&r1=995615&r2=995616&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpDumpTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/xmp/JpegXmpDumpTest.java Fri Sep 10 00:34:40 2010
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import org.apache.sanselan.ImageReadException;
-import org.apache.sanselan.ImageWriteException;
import org.apache.sanselan.common.byteSources.ByteSource;
import org.apache.sanselan.common.byteSources.ByteSourceFile;
import org.apache.sanselan.formats.jpeg.JpegImageParser;
@@ -33,8 +32,7 @@ import org.apache.sanselan.util.Debug;
public class JpegXmpDumpTest extends JpegXmpBaseTest
{
- public void test() throws IOException, ImageReadException,
- ImageWriteException
+ public void test() throws IOException, ImageReadException
{
List images = getImagesWithXmpData();
for (int i = 0; i < images.size(); i++)
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/png/PngReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/png/PngReadTest.java?rev=995616&r1=995615&r2=995616&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/png/PngReadTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/png/PngReadTest.java Fri Sep 10 00:34:40 2010
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.sanselan.ImageInfo;
import org.apache.sanselan.ImageReadException;
-import org.apache.sanselan.ImageWriteException;
import org.apache.sanselan.Sanselan;
import org.apache.sanselan.common.IImageMetadata;
import org.apache.sanselan.util.Debug;
@@ -34,8 +33,7 @@ public class PngReadTest extends PngBase
- public void test() throws IOException, ImageReadException,
- ImageWriteException
+ public void test() throws IOException, ImageReadException
{
Debug.debug("start");
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/tiff/TiffReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/tiff/TiffReadTest.java?rev=995616&r1=995615&r2=995616&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/tiff/TiffReadTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/tiff/TiffReadTest.java Fri Sep 10 00:34:40 2010
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.sanselan.ImageInfo;
import org.apache.sanselan.ImageReadException;
-import org.apache.sanselan.ImageWriteException;
import org.apache.sanselan.Sanselan;
import org.apache.sanselan.common.IImageMetadata;
import org.apache.sanselan.util.Debug;
@@ -32,8 +31,7 @@ import org.apache.sanselan.util.Debug;
public class TiffReadTest extends TiffBaseTest
{
- public void test() throws IOException, ImageReadException,
- ImageWriteException
+ public void test() throws IOException, ImageReadException
{
List images = getTiffImages();
for (int i = 0; i < images.size(); i++)
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/xmp/XmpDumpTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/xmp/XmpDumpTest.java?rev=995616&r1=995615&r2=995616&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/xmp/XmpDumpTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/xmp/XmpDumpTest.java Fri Sep 10 00:34:40 2010
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.util.List;
import org.apache.sanselan.ImageReadException;
-import org.apache.sanselan.ImageWriteException;
import org.apache.sanselan.Sanselan;
import org.apache.sanselan.SanselanTest;
import org.apache.sanselan.util.Debug;
@@ -30,8 +29,7 @@ import org.apache.sanselan.util.Debug;
public class XmpDumpTest extends SanselanTest
{
- public void test() throws IOException, ImageReadException,
- ImageWriteException
+ public void test() throws IOException, ImageReadException
{
List images = getTestImages();
for (int i = 0; i < images.size(); i++)
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/sampleUsage/MetadataExample.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/sampleUsage/MetadataExample.java?rev=995616&r1=995615&r2=995616&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/sampleUsage/MetadataExample.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/sampleUsage/MetadataExample.java Fri Sep 10 00:34:40 2010
@@ -151,7 +151,7 @@ public class MetadataExample
}
private static void printTagValue(JpegImageMetadata jpegMetadata,
- TagInfo tagInfo) throws ImageReadException, IOException
+ TagInfo tagInfo)
{
TiffField field = jpegMetadata.findEXIFValueWithExactMatch(tagInfo);
if (field == null)