commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1308075 [3/3] - in /commons/proper/sanselan/trunk/src: main/java/org/apache/commons/sanselan/ main/java/org/apache/commons/sanselan/color/ main/java/org/apache/commons/sanselan/common/ main/java/org/apache/commons/sanselan/common/bytesourc...
Date Sun, 01 Apr 2012 11:11:50 GMT
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/xbm/XbmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/xbm/XbmImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/xbm/XbmImageParser.java
(original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/xbm/XbmImageParser.java
Sun Apr  1 11:11:43 2012
@@ -51,11 +51,13 @@ public class XbmImageParser extends Imag
     {
     }
 
+    @Override
     public String getName()
     {
         return "Xbm-Custom";
     }
 
+    @Override
     public String getDefaultExtension()
     {
         return DEFAULT_EXTENSION;
@@ -66,11 +68,13 @@ public class XbmImageParser extends Imag
         ".xbm",
     };
 
+    @Override
     protected String[] getAcceptedExtensions()
     {
         return ACCEPTED_EXTENSIONS;
     }
 
+    @Override
     protected ImageFormat[] getAcceptedTypes()
     {
         return new ImageFormat[]
@@ -79,17 +83,20 @@ public class XbmImageParser extends Imag
         };
     }
 
+    @Override
     public boolean embedICCProfile(File src, File dst, byte profile[])
     {
         return false;
     }
 
+    @Override
     public IImageMetadata getMetadata(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {
         return null;
     }
 
+    @Override
     public ImageInfo getImageInfo(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {
@@ -104,6 +111,7 @@ public class XbmImageParser extends Imag
                 ImageInfo.COMPRESSION_ALGORITHM_NONE);
     }
 
+    @Override
     public Dimension getImageSize(ByteSource byteSource,
             Map params)
             throws ImageReadException, IOException
@@ -112,6 +120,7 @@ public class XbmImageParser extends Imag
         return new Dimension(xbmHeader.width, xbmHeader.height);
     }
 
+    @Override
     public byte[] getICCProfileBytes(ByteSource byteSource,
             Map params)
             throws ImageReadException, IOException
@@ -292,6 +301,7 @@ public class XbmImageParser extends Imag
         return image;
     }
 
+    @Override
     public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
             throws ImageReadException, IOException
     {
@@ -299,6 +309,7 @@ public class XbmImageParser extends Imag
         return true;
     }
 
+    @Override
     public final BufferedImage getBufferedImage(ByteSource byteSource,
             Map params) throws ImageReadException, IOException
     {
@@ -328,6 +339,7 @@ public class XbmImageParser extends Imag
         return "0x0" + s;
     }
 
+    @Override
     public void writeImage(BufferedImage src, OutputStream os, Map params)
             throws ImageWriteException, IOException
     {
@@ -413,6 +425,7 @@ public class XbmImageParser extends Imag
      *            Map of optional parameters, defined in SanselanConstants.
      * @return Xmp Xml as String, if present.  Otherwise, returns null.
      */
+    @Override
     public String getXmpXml(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/xpm/XpmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/xpm/XpmImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/xpm/XpmImageParser.java
(original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/xpm/XpmImageParser.java
Sun Apr  1 11:11:43 2012
@@ -114,11 +114,13 @@ public class XpmImageParser extends Imag
         }
     }
 
+    @Override
     public String getName()
     {
         return "Xpm-Custom";
     }
 
+    @Override
     public String getDefaultExtension()
     {
         return DEFAULT_EXTENSION;
@@ -129,11 +131,13 @@ public class XpmImageParser extends Imag
         ".xpm",
     };
 
+    @Override
     protected String[] getAcceptedExtensions()
     {
         return ACCEPTED_EXTENSIONS;
     }
 
+    @Override
     protected ImageFormat[] getAcceptedTypes()
     {
         return new ImageFormat[]
@@ -142,17 +146,20 @@ public class XpmImageParser extends Imag
         };
     }
 
+    @Override
     public boolean embedICCProfile(File src, File dst, byte profile[])
     {
         return false;
     }
 
+    @Override
     public IImageMetadata getMetadata(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {
         return null;
     }
 
+    @Override
     public ImageInfo getImageInfo(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {
@@ -181,6 +188,7 @@ public class XpmImageParser extends Imag
                 ImageInfo.COMPRESSION_ALGORITHM_NONE);
     }
 
+    @Override
     public Dimension getImageSize(ByteSource byteSource,
             Map params)
             throws ImageReadException, IOException
@@ -189,6 +197,7 @@ public class XpmImageParser extends Imag
         return new Dimension(xpmHeader.width, xpmHeader.height);
     }
 
+    @Override
     public byte[] getICCProfileBytes(ByteSource byteSource,
             Map params)
             throws ImageReadException, IOException
@@ -670,6 +679,7 @@ public class XpmImageParser extends Imag
         return image;
     }
 
+    @Override
     public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
             throws ImageReadException, IOException
     {
@@ -677,6 +687,7 @@ public class XpmImageParser extends Imag
         return true;
     }
 
+    @Override
     public final BufferedImage getBufferedImage(ByteSource byteSource,
             Map params) throws ImageReadException, IOException
     {
@@ -727,6 +738,7 @@ public class XpmImageParser extends Imag
             return "#" + hex;
     }
 
+    @Override
     public void writeImage(BufferedImage src, OutputStream os, Map params)
             throws ImageWriteException, IOException
     {
@@ -916,6 +928,7 @@ public class XpmImageParser extends Imag
      *            Map of optional parameters, defined in SanselanConstants.
      * @return Xmp Xml as String, if present.  Otherwise, returns null.
      */
+    @Override
     public String getXmpXml(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/icc/IccProfileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/icc/IccProfileInfo.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/icc/IccProfileInfo.java
(original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/icc/IccProfileInfo.java
Sun Apr  1 11:11:43 2012
@@ -88,6 +88,7 @@ public class IccProfileInfo implements I
         System.out.print(toString());
     }
 
+    @Override
     public String toString()
     {
         try

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java
(original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java
Sun Apr  1 11:11:43 2012
@@ -54,11 +54,13 @@ public class MedianCutQuantizer
             //            super.hashCode();
         }
 
+        @Override
         public int hashCode()
         {
             return argb;
         }
 
+        @Override
         public boolean equals(Object o)
         {
             if (o instanceof ColorCount) {
@@ -170,6 +172,7 @@ public class MedianCutQuantizer
             return (alpha << 24) | (red << 16) | (green << 8) | blue;
         }
 
+        @Override
         public String toString()
         {
             return "{ColorGroup. min_red: " + Integer.toHexString(min_red)
@@ -496,6 +499,7 @@ public class MedianCutQuantizer
             this.root = root;
         }
 
+        @Override
         public int getPaletteIndex(int rgb)
         {
             ColorGroup cg = root;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/QuantizedPalette.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/QuantizedPalette.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/QuantizedPalette.java
(original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/QuantizedPalette.java
Sun Apr  1 11:11:43 2012
@@ -53,6 +53,7 @@ public class QuantizedPalette extends Pa
 
     }
 
+    @Override
     public int getPaletteIndex(int rgb) throws ImageWriteException
     {
         int precisionMask = (1 << precision) - 1;
@@ -64,6 +65,7 @@ public class QuantizedPalette extends Pa
         return straight[index].index;
     }
 
+    @Override
     public void dump()
     {
         //        System.out.println("ColorSpaceSubset.compares: "
@@ -72,12 +74,14 @@ public class QuantizedPalette extends Pa
         //        System.out.println("avg. distance: " + (distance / converted));
     }
 
+    @Override
     public int getEntry(int index)
     {
         ColorSpaceSubset subset = subsets.get(index);
         return subset.rgb;
     }
 
+    @Override
     public int length()
     {
         return subsets.size();

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/SimplePalette.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/SimplePalette.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/SimplePalette.java
(original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/SimplePalette.java
Sun Apr  1 11:11:43 2012
@@ -27,11 +27,13 @@ public class SimplePalette extends Palet
         this.palette = palette;
     }
 
+    @Override
     public int getPaletteIndex(int rgb)
     {
         return getPaletteIndex(palette, rgb);
     }
 
+    @Override
     public int getEntry(int index)
     {
         return palette[index];
@@ -56,6 +58,7 @@ public class SimplePalette extends Palet
         return -1;
     }
 
+    @Override
     public void dump()
     {
         for (int i = 0; i < palette.length; i++)
@@ -65,6 +68,7 @@ public class SimplePalette extends Palet
         }
     }
 
+    @Override
     public int length()
     {
         return palette.length;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/CachingInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/CachingInputStream.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/CachingInputStream.java
(original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/CachingInputStream.java
Sun Apr  1 11:11:43 2012
@@ -36,6 +36,7 @@ public class CachingInputStream extends 
         return baos.toByteArray();
     }
 
+    @Override
     public int read() throws IOException
     {
         int result = is.read();
@@ -43,11 +44,13 @@ public class CachingInputStream extends 
         return result;
     }
 
+    @Override
     public int available() throws IOException
     {
         return is.available();
     }
 
+    @Override
     public void close() throws IOException
     {
         is.close();

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/CachingOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/CachingOutputStream.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/CachingOutputStream.java
(original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/CachingOutputStream.java
Sun Apr  1 11:11:43 2012
@@ -31,6 +31,7 @@ public class CachingOutputStream extends
         this.os = os;
     }
 
+    @Override
     public void write(int b) throws IOException
     {
         os.write(b);
@@ -42,11 +43,13 @@ public class CachingOutputStream extends
         return baos.toByteArray();
     }
 
+    @Override
     public void close() throws IOException
     {
         os.close();
     }
 
+    @Override
     public void flush() throws IOException
     {
         os.flush();

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/DebugInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/DebugInputStream.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/DebugInputStream.java
(original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/DebugInputStream.java
Sun Apr  1 11:11:43 2012
@@ -31,6 +31,7 @@ public class DebugInputStream extends In
 
     private long bytes_read = 0;
 
+    @Override
     public int read() throws IOException
     {
         int result = is.read();
@@ -38,6 +39,7 @@ public class DebugInputStream extends In
         return result;
     }
 
+    @Override
     public long skip(long n) throws IOException
     {
         long result = is.skip(n);
@@ -45,11 +47,13 @@ public class DebugInputStream extends In
         return result;
     }
 
+    @Override
     public int available() throws IOException
     {
         return is.available();
     }
 
+    @Override
     public void close() throws IOException
     {
         is.close();

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/DebugOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/DebugOutputStream.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/DebugOutputStream.java
(original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/DebugOutputStream.java
Sun Apr  1 11:11:43 2012
@@ -31,29 +31,34 @@ public class DebugOutputStream extends O
         this.os = os;
     }
 
+    @Override
     public void write(int b) throws IOException
     {
         os.write(b);
         count++;
     }
 
+    @Override
     public void write(byte b[]) throws IOException
     {
         os.write(b);
         count += b.length;
     }
 
+    @Override
     public void write(byte b[], int off, int len) throws IOException
     {
         os.write(b, off, len);
         count += len;
     }
 
+    @Override
     public void flush() throws IOException
     {
         os.flush();
     }
 
+    @Override
     public void close() throws IOException
     {
         os.close();

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/UnicodeUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/UnicodeUtils.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/UnicodeUtils.java
(original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/UnicodeUtils.java
Sun Apr  1 11:11:43 2012
@@ -230,6 +230,7 @@ public abstract class UnicodeUtils imple
 
     private static class UnicodeMetricsASCII extends UnicodeUtils
     {
+        @Override
         public int findEnd(byte bytes[], int index, boolean includeTerminator)
                 throws UnicodeException
         {
@@ -261,6 +262,7 @@ public abstract class UnicodeUtils imple
     private static class UnicodeMetricsUTF8 extends UnicodeUtils
     {
 
+        @Override
         public int findEnd(byte bytes[], int index, boolean includeTerminator)
                 throws UnicodeException
         {
@@ -384,6 +386,7 @@ public abstract class UnicodeUtils imple
             }
         }
 
+        @Override
         public int findEnd(byte bytes[], int index, boolean includeTerminator)
                 throws UnicodeException
         {
@@ -437,6 +440,7 @@ public abstract class UnicodeUtils imple
             super(BYTE_ORDER_BIG_ENDIAN);
         }
 
+        @Override
         public int findEnd(byte bytes[], int index, boolean includeTerminator)
                 throws UnicodeException
         {

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/MakerNoteFieldTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/MakerNoteFieldTest.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/MakerNoteFieldTest.java
(original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/MakerNoteFieldTest.java
Sun Apr  1 11:11:43 2012
@@ -33,6 +33,7 @@ public class MakerNoteFieldTest extends 
     //        super(name);
     //    }
 
+    @Override
     protected void checkField(File imageFile, TiffField field)
             throws IOException, ImageReadException, ImageWriteException
     {

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/TextFieldTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/TextFieldTest.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/TextFieldTest.java
(original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/TextFieldTest.java
Sun Apr  1 11:11:43 2012
@@ -35,6 +35,7 @@ public class TextFieldTest extends Speci
     //        super(name);
     //    }
 
+    @Override
     protected void checkField(File imageFile, TiffField field)
             throws IOException, ImageReadException, ImageWriteException
     {

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
(original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
Sun Apr  1 11:11:43 2012
@@ -40,6 +40,7 @@ public class IptcUpdateTest extends Iptc
 {
     private List imagesWithIptcData;
 
+    @Override
     public void setUp() throws Exception
     {
         super.setUp();
@@ -47,6 +48,7 @@ public class IptcUpdateTest extends Iptc
         imagesWithIptcData = getImagesWithIptcData();
     }
 
+    @Override
     public void tearDown() throws Exception
     {
         super.tearDown();



Mime
View raw message