xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r1567281 - in /xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics: image/ image/codec/tiff/ image/codec/util/ image/loader/impl/ image/rendered/ java2d/ util/io/
Date Tue, 11 Feb 2014 18:40:22 GMT
Author: vhennebert
Date: Tue Feb 11 18:40:21 2014
New Revision: 1567281

URL: http://svn.apache.org/r1567281
Log:
Fix MethodParamPad

Modified:
    xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java
    xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java
    xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/codec/util/PropertyUtil.java
    xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderInternalTIFF.java
    xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/AbstractRed.java
    xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/Any2LsRGBRed.java
    xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/Any2sRGBRed.java
    xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/BufferedImageCachableRed.java
    xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/FormatRed.java
    xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/RenderedImageCachableRed.java
    xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/TransformStackElement.java
    xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/util/io/Base64EncodeStream.java

Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java?rev=1567281&r1=1567280&r2=1567281&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java
(original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/GraphicsUtil.java
Tue Feb 11 18:40:21 2014
@@ -74,8 +74,8 @@ public final class GraphicsUtil {
     /**
      * Standard prebuilt Linear_sRGB color model with no alpha */
     public static final ColorModel Linear_sRGB =
-        new DirectColorModel(ColorSpace.getInstance
-                             (ColorSpace.CS_LINEAR_RGB), 24,
+        new DirectColorModel(ColorSpace.getInstance(
+                             ColorSpace.CS_LINEAR_RGB), 24,
                              0x00FF0000, 0x0000FF00,
                              0x000000FF, 0x0, false,
                              DataBuffer.TYPE_INT);
@@ -83,8 +83,8 @@ public final class GraphicsUtil {
      * Standard prebuilt Linear_sRGB color model with premultiplied alpha.
      */
     public static final ColorModel Linear_sRGB_Pre =
-        new DirectColorModel(ColorSpace.getInstance
-                             (ColorSpace.CS_LINEAR_RGB), 32,
+        new DirectColorModel(ColorSpace.getInstance(
+                             ColorSpace.CS_LINEAR_RGB), 32,
                              0x00FF0000, 0x0000FF00,
                              0x000000FF, 0xFF000000, true,
                              DataBuffer.TYPE_INT);
@@ -92,8 +92,8 @@ public final class GraphicsUtil {
      * Standard prebuilt Linear_sRGB color model with unpremultiplied alpha.
      */
     public static final ColorModel Linear_sRGB_Unpre =
-        new DirectColorModel(ColorSpace.getInstance
-                             (ColorSpace.CS_LINEAR_RGB), 32,
+        new DirectColorModel(ColorSpace.getInstance(
+                             ColorSpace.CS_LINEAR_RGB), 32,
                              0x00FF0000, 0x0000FF00,
                              0x000000FF, 0xFF000000, false,
                              DataBuffer.TYPE_INT);
@@ -102,8 +102,8 @@ public final class GraphicsUtil {
      * Standard prebuilt sRGB color model with no alpha.
      */
     public static final ColorModel sRGB =
-        new DirectColorModel(ColorSpace.getInstance
-                             (ColorSpace.CS_sRGB), 24,
+        new DirectColorModel(ColorSpace.getInstance(
+                             ColorSpace.CS_sRGB), 24,
                              0x00FF0000, 0x0000FF00,
                              0x000000FF, 0x0, false,
                              DataBuffer.TYPE_INT);
@@ -111,8 +111,8 @@ public final class GraphicsUtil {
      * Standard prebuilt sRGB color model with premultiplied alpha.
      */
     public static final ColorModel sRGB_Pre =
-        new DirectColorModel(ColorSpace.getInstance
-                             (ColorSpace.CS_sRGB), 32,
+        new DirectColorModel(ColorSpace.getInstance(
+                             ColorSpace.CS_sRGB), 32,
                              0x00FF0000, 0x0000FF00,
                              0x000000FF, 0xFF000000, true,
                              DataBuffer.TYPE_INT);
@@ -120,8 +120,8 @@ public final class GraphicsUtil {
      * Standard prebuilt sRGB color model with unpremultiplied alpha.
      */
     public static final ColorModel sRGB_Unpre =
-        new DirectColorModel(ColorSpace.getInstance
-                             (ColorSpace.CS_sRGB), 32,
+        new DirectColorModel(ColorSpace.getInstance(
+                             ColorSpace.CS_sRGB), 32,
                              0x00FF0000, 0x0000FF00,
                              0x000000FF, 0xFF000000, false,
                              DataBuffer.TYPE_INT);
@@ -312,7 +312,7 @@ public final class GraphicsUtil {
 
         for (int y = y0; y <= y1; y++)  {
             data = src.getPixels(x0, y, width, 1, data);
-            dst.setPixels       (x0, y, width, 1, data);
+            dst.setPixels(x0, y, width, 1, data);
         }
     }
 
@@ -371,11 +371,11 @@ public final class GraphicsUtil {
      * @return    A writable copy of <tt>ras</tt>
      */
     public static WritableRaster copyRaster(Raster ras, int minX, int minY) {
-        WritableRaster ret = Raster.createWritableRaster
-            (ras.getSampleModel(),
+        WritableRaster ret = Raster.createWritableRaster(
+            ras.getSampleModel(),
              new Point(0, 0));
-        ret = ret.createWritableChild
-            (ras.getMinX() - ras.getSampleModelTranslateX(),
+        ret = ret.createWritableChild(
+            ras.getMinX() - ras.getSampleModelTranslateX(),
              ras.getMinY() - ras.getSampleModelTranslateY(),
              ras.getWidth(), ras.getHeight(),
              minX, minY, null);
@@ -384,8 +384,8 @@ public final class GraphicsUtil {
         DataBuffer srcDB = ras.getDataBuffer();
         DataBuffer retDB = ret.getDataBuffer();
         if (srcDB.getDataType() != retDB.getDataType()) {
-            throw new IllegalArgumentException
-                ("New DataBuffer doesn't match original");
+            throw new IllegalArgumentException(
+                "New DataBuffer doesn't match original");
         }
         int len   = srcDB.getSize();
         int banks = srcDB.getNumBanks();
@@ -477,12 +477,12 @@ public final class GraphicsUtil {
      */
     public static WritableRaster makeRasterWritable(Raster ras,
                                                     int minX, int minY) {
-        WritableRaster ret = Raster.createWritableRaster
-            (ras.getSampleModel(),
+        WritableRaster ret = Raster.createWritableRaster(
+            ras.getSampleModel(),
              ras.getDataBuffer(),
              new Point(0, 0));
-        ret = ret.createWritableChild
-            (ras.getMinX() - ras.getSampleModelTranslateX(),
+        ret = ret.createWritableChild(
+            ras.getMinX() - ras.getSampleModelTranslateX(),
              ras.getMinY() - ras.getSampleModelTranslateY(),
              ras.getWidth(), ras.getHeight(),
              minX, minY, null);

Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java?rev=1567281&r1=1567280&r2=1567281&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java
(original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java
Tue Feb 11 18:40:21 2014
@@ -135,14 +135,14 @@ public class TIFFImage extends AbstractR
         inflater.reset();
     }
 
-    private static SampleModel createPixelInterleavedSampleModel
-        (int dataType, int tileWidth, int tileHeight, int bands) {
+    private static SampleModel createPixelInterleavedSampleModel(
+        int dataType, int tileWidth, int tileHeight, int bands) {
         int [] bandOffsets = new int[bands];
         for (int i = 0; i < bands; i++) {
             bandOffsets[i] = i;
         }
-        return new PixelInterleavedSampleModel
-            (dataType, tileWidth, tileHeight, bands,
+        return new PixelInterleavedSampleModel(
+            dataType, tileWidth, tileHeight, bands,
              tileWidth * bands, bandOffsets);
     }
 
@@ -351,8 +351,8 @@ public class TIFFImage extends AbstractR
             }
 
             // Set basic image layout
-            Rectangle bounds = new Rectangle
-                (0, 0,
+            Rectangle bounds = new Rectangle(
+                0, 0,
                  (int)dir.getFieldAsLong(TIFFImageDecoder.TIFF_IMAGE_WIDTH),
                  (int)dir.getFieldAsLong(TIFFImageDecoder.TIFF_IMAGE_LENGTH));
 
@@ -557,18 +557,18 @@ public class TIFFImage extends AbstractR
                 for (int i = 0; i < numBands; i++) {
                     reverseOffsets[i] = numBands - 1 - i;
                 }
-                sampleModel = new PixelInterleavedSampleModel
-                    (dataType, tileWidth, tileHeight,
+                sampleModel = new PixelInterleavedSampleModel(
+                    dataType, tileWidth, tileHeight,
                      numBands, numBands * tileWidth, reverseOffsets);
 
                 if (imageType == TYPE_GRAY) {
-                  colorModel = new ComponentColorModel
-                    (ColorSpace.getInstance(ColorSpace.CS_GRAY),
+                  colorModel = new ComponentColorModel(
+                    ColorSpace.getInstance(ColorSpace.CS_GRAY),
                      new int[] {sampleSize}, false, false,
                      Transparency.OPAQUE, dataType);
                 } else if (imageType == TYPE_RGB) {
-                  colorModel = new ComponentColorModel
-                    (ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                  colorModel = new ComponentColorModel(
+                    ColorSpace.getInstance(ColorSpace.CS_sRGB),
                      new int[] {sampleSize, sampleSize, sampleSize},
                      false, false, Transparency.OPAQUE, dataType);
                 } else { // hasAlpha
@@ -602,8 +602,8 @@ public class TIFFImage extends AbstractR
                     bandOffsets[i] = i;
                 }
 
-                sampleModel = new PixelInterleavedSampleModel
-                    (dataType, tileWidth, tileHeight,
+                sampleModel = new PixelInterleavedSampleModel(
+                    dataType, tileWidth, tileHeight,
                      numBands, numBands * tileWidth, bandOffsets);
                 colorModel = null;
                 break;
@@ -634,11 +634,11 @@ public class TIFFImage extends AbstractR
                     // Data will have to be unpacked into a 3 band short image
                     // as we do not have a IndexColorModel that can deal with
                     // a colormodel whose entries are of short data type.
-                    sampleModel = createPixelInterleavedSampleModel
-                        (dataType, tileWidth, tileHeight, numBands);
+                    sampleModel = createPixelInterleavedSampleModel(
+                        dataType, tileWidth, tileHeight, numBands);
 
-                  colorModel = new ComponentColorModel
-                    (ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                  colorModel = new ComponentColorModel(
+                    ColorSpace.getInstance(ColorSpace.CS_sRGB),
                      new int[] {16, 16, 16}, false, false,
                      Transparency.OPAQUE, dataType);
 
@@ -650,13 +650,13 @@ public class TIFFImage extends AbstractR
                         // Pixel data will not be unpacked, will use
                         // MPPSM to store packed data and
                         // IndexColorModel to do the unpacking.
-                        sampleModel = new MultiPixelPackedSampleModel
-                            (DataBuffer.TYPE_BYTE, tileWidth, tileHeight,
+                        sampleModel = new MultiPixelPackedSampleModel(
+                            DataBuffer.TYPE_BYTE, tileWidth, tileHeight,
                              sampleSize);
                     } else if (sampleSize == 8) {
 
-                        sampleModel = createPixelInterleavedSampleModel
-                            (DataBuffer.TYPE_BYTE, tileWidth, tileHeight,
+                        sampleModel = createPixelInterleavedSampleModel(
+                            DataBuffer.TYPE_BYTE, tileWidth, tileHeight,
                              numBands);
                     } else if (sampleSize == 16) {
 
@@ -666,8 +666,8 @@ public class TIFFImage extends AbstractR
                         // actual palette entries are allowed to be
                         // negative.
                         dataType = DataBuffer.TYPE_USHORT;
-                        sampleModel = createPixelInterleavedSampleModel
-                            (DataBuffer.TYPE_USHORT, tileWidth, tileHeight,
+                        sampleModel = createPixelInterleavedSampleModel(
+                            DataBuffer.TYPE_USHORT, tileWidth, tileHeight,
                              numBands);
                     }
 
@@ -682,23 +682,23 @@ public class TIFFImage extends AbstractR
                     if (dataType == DataBuffer.TYPE_SHORT) {
 
                         for (int i = 0; i < bandLength; i++) {
-                            r[i] = param.decodeSigned16BitsTo8Bits
-                                ((short)colormap[i]);
-                            g[i] = param.decodeSigned16BitsTo8Bits
-                                ((short)colormap[gIndex + i]);
-                            b[i] = param.decodeSigned16BitsTo8Bits
-                                ((short)colormap[bIndex + i]);
+                            r[i] = param.decodeSigned16BitsTo8Bits(
+                                (short)colormap[i]);
+                            g[i] = param.decodeSigned16BitsTo8Bits(
+                                (short)colormap[gIndex + i]);
+                            b[i] = param.decodeSigned16BitsTo8Bits(
+                                (short)colormap[bIndex + i]);
                         }
 
                     } else {
 
                         for (int i = 0; i < bandLength; i++) {
-                            r[i] = param.decode16BitsTo8Bits
-                                (colormap[i] & 0xffff);
-                            g[i] = param.decode16BitsTo8Bits
-                                (colormap[gIndex + i] & 0xffff);
-                            b[i] = param.decode16BitsTo8Bits
-                                (colormap[bIndex + i] & 0xffff);
+                            r[i] = param.decode16BitsTo8Bits(
+                                colormap[i] & 0xffff);
+                            g[i] = param.decode16BitsTo8Bits(
+                                colormap[gIndex + i] & 0xffff);
+                            b[i] = param.decode16BitsTo8Bits(
+                                colormap[bIndex + i] & 0xffff);
                         }
 
                     }
@@ -1675,8 +1675,8 @@ public class TIFFImage extends AbstractR
 
     // Need a createColorModel().
     // Create ComponentColorModel for TYPE_RGB images
-    private ComponentColorModel createAlphaComponentColorModel
-    (int dataType, int numBands,
+    private ComponentColorModel createAlphaComponentColorModel(
+    int dataType, int numBands,
      boolean isAlphaPremultiplied, int transparency) {
 
         ComponentColorModel ccm = null;

Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/codec/util/PropertyUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/codec/util/PropertyUtil.java?rev=1567281&r1=1567280&r2=1567281&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/codec/util/PropertyUtil.java
(original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/codec/util/PropertyUtil.java
Tue Feb 11 18:40:21 2014
@@ -33,8 +33,8 @@ public final class PropertyUtil {
 
 
     protected static LocalizableSupport localizableSupport =
-        new LocalizableSupport
-        (RESOURCES, PropertyUtil.class.getClassLoader());
+        new LocalizableSupport(
+        RESOURCES, PropertyUtil.class.getClassLoader());
 
     public static String getString(String key) {
         try {

Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderInternalTIFF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderInternalTIFF.java?rev=1567281&r1=1567280&r2=1567281&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderInternalTIFF.java
(original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderInternalTIFF.java
Tue Feb 11 18:40:21 2014
@@ -67,8 +67,8 @@ public class ImageLoaderInternalTIFF ext
         SeekableStream seekStream = new ImageInputStreamSeekableStreamAdapter(imgStream);
         try {
             org.apache.xmlgraphics.image.codec.tiff.TIFFImage img
-                = new org.apache.xmlgraphics.image.codec.tiff.TIFFImage
-                    (seekStream, null, 0);
+                = new org.apache.xmlgraphics.image.codec.tiff.TIFFImage(
+                    seekStream, null, 0);
             // TODO: This may ignore ICC Profiles stored in TIFF images.
             return new ImageRendered(info, img, null);
         } catch (RuntimeException e) {

Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/AbstractRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/AbstractRed.java?rev=1567281&r1=1567280&r2=1567281&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/AbstractRed.java
(original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/AbstractRed.java
Tue Feb 11 18:40:21 2014
@@ -207,8 +207,8 @@ public abstract class AbstractRed implem
         }
 
         if (cm == null)
-            cm = new ComponentColorModel
-                (ColorSpace.getInstance(ColorSpace.CS_GRAY),
+            cm = new ComponentColorModel(
+                ColorSpace.getInstance(ColorSpace.CS_GRAY),
                  new int [] { 8 }, false, false, Transparency.OPAQUE,
                  DataBuffer.TYPE_BYTE);
 
@@ -325,8 +325,8 @@ public abstract class AbstractRed implem
         }
 
         if (cm == null)
-            cm = new ComponentColorModel
-                (ColorSpace.getInstance(ColorSpace.CS_GRAY),
+            cm = new ComponentColorModel(
+                ColorSpace.getInstance(ColorSpace.CS_GRAY),
                  new int [] { 8 }, false, false, Transparency.OPAQUE,
                  DataBuffer.TYPE_BYTE);
 
@@ -467,8 +467,8 @@ public abstract class AbstractRed implem
 
     public Shape getDependencyRegion(int srcIndex, Rectangle outputRgn) {
         if ((srcIndex < 0) || (srcIndex > srcs.size()))
-            throw new IndexOutOfBoundsException
-                ("Nonexistent source requested.");
+            throw new IndexOutOfBoundsException(
+                "Nonexistent source requested.");
 
         // Return empty rect if they don't intersect.
         if (!outputRgn.intersects(bounds))
@@ -481,8 +481,8 @@ public abstract class AbstractRed implem
 
     public Shape getDirtyRegion(int srcIndex, Rectangle inputRgn) {
         if (srcIndex != 0)
-            throw new IndexOutOfBoundsException
-                ("Nonexistent source requested.");
+            throw new IndexOutOfBoundsException(
+                "Nonexistent source requested.");
 
         // Return empty rect if they don't intersect.
         if (!inputRgn.intersects(bounds))
@@ -511,8 +511,8 @@ public abstract class AbstractRed implem
     }
 
     public Raster getData(Rectangle rect) {
-        SampleModel smRet = sm.createCompatibleSampleModel
-            (rect.width, rect.height);
+        SampleModel smRet = sm.createCompatibleSampleModel(
+            rect.width, rect.height);
 
         Point pt = new Point(rect.x, rect.y);
         WritableRaster wr = Raster.createWritableRaster(smRet, pt);
@@ -596,8 +596,8 @@ public abstract class AbstractRed implem
     public WritableRaster makeTile(int tileX, int tileY) {
         if ((tileX < minTileX) || (tileX >= minTileX + numXTiles)
             || (tileY < minTileY) || (tileY >= minTileY + numYTiles))
-            throw new IndexOutOfBoundsException
-                ("Requested Tile (" + tileX + ',' + tileY
+            throw new IndexOutOfBoundsException(
+                "Requested Tile (" + tileX + ',' + tileY
                  + ") lies outside the bounds of image");
 
         Point pt = new Point(tileGridXOff + tileX * tileWidth,

Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/Any2LsRGBRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/Any2LsRGBRed.java?rev=1567281&r1=1567280&r2=1567281&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/Any2LsRGBRed.java
(original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/Any2LsRGBRed.java
Tue Feb 11 18:40:21 2014
@@ -164,8 +164,8 @@ public class Any2LsRGBRed extends Abstra
             if (!dstCM.hasAlpha()) {
                 // No alpha ao we don't have to work around the bug
                 // in the color convert op.
-                dstBI = new BufferedImage
-                    (dstCM, wr.createWritableTranslatedChild(0, 0),
+                dstBI = new BufferedImage(
+                    dstCM, wr.createWritableTranslatedChild(0, 0),
                      dstCM.isAlphaPremultiplied(), null);
             } else {
                 // All this nonsense is to work around the fact that
@@ -174,8 +174,8 @@ public class Any2LsRGBRed extends Abstra
                 SinglePixelPackedSampleModel dstSM;
                 dstSM = (SinglePixelPackedSampleModel)wr.getSampleModel();
                 int [] masks = dstSM.getBitMasks();
-                SampleModel dstSMNoA = new SinglePixelPackedSampleModel
-                    (dstSM.getDataType(), dstSM.getWidth(), dstSM.getHeight(),
+                SampleModel dstSMNoA = new SinglePixelPackedSampleModel(
+                    dstSM.getDataType(), dstSM.getWidth(), dstSM.getHeight(),
                      dstSM.getScanlineStride(),
                      new int[] {masks[0], masks[1], masks[2]});
                 ColorModel dstCMNoA = GraphicsUtil.Linear_sRGB;
@@ -184,8 +184,8 @@ public class Any2LsRGBRed extends Abstra
                 dstWr = Raster.createWritableRaster(dstSMNoA,
                                                     wr.getDataBuffer(),
                                                     new Point(0, 0));
-                dstWr = dstWr.createWritableChild
-                    (wr.getMinX() - wr.getSampleModelTranslateX(),
+                dstWr = dstWr.createWritableChild(
+                    wr.getMinX() - wr.getSampleModelTranslateX(),
                      wr.getMinY() - wr.getSampleModelTranslateY(),
                      wr.getWidth(), wr.getHeight(),
                      0, 0, null);
@@ -200,11 +200,11 @@ public class Any2LsRGBRed extends Abstra
             WritableRaster srcWr;
             if (srcCM.hasAlpha() && srcCM.isAlphaPremultiplied()) {
                 Rectangle wrR = wr.getBounds();
-                SampleModel sm = srcCM.createCompatibleSampleModel
-                    (wrR.width, wrR.height);
+                SampleModel sm = srcCM.createCompatibleSampleModel(
+                    wrR.width, wrR.height);
 
-                srcWr = Raster.createWritableRaster
-                    (sm, new Point(wrR.x, wrR.y));
+                srcWr = Raster.createWritableRaster(
+                    sm, new Point(wrR.x, wrR.y));
                 src.copyData(srcWr);
                 srcBICM = GraphicsUtil.coerceData(srcWr, srcCM, false);
             } else {
@@ -293,14 +293,14 @@ public class Any2LsRGBRed extends Abstra
             }
         }
         if (alpha)
-            return new SinglePixelPackedSampleModel
-                (DataBuffer.TYPE_INT,
+            return new SinglePixelPackedSampleModel(
+                DataBuffer.TYPE_INT,
                  sm.getWidth(),
                  sm.getHeight(),
                  new int [] {0xFF0000, 0xFF00, 0xFF, 0xFF000000});
         else
-            return new SinglePixelPackedSampleModel
-                (DataBuffer.TYPE_INT,
+            return new SinglePixelPackedSampleModel(
+                DataBuffer.TYPE_INT,
                  sm.getWidth(),
                  sm.getHeight(),
                  new int [] {0xFF0000, 0xFF00, 0xFF});

Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/Any2sRGBRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/Any2sRGBRed.java?rev=1567281&r1=1567280&r2=1567281&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/Any2sRGBRed.java
(original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/Any2sRGBRed.java
Tue Feb 11 18:40:21 2014
@@ -357,14 +357,14 @@ public class Any2sRGBRed extends Abstrac
             }
         }
         if (alpha)
-            return new SinglePixelPackedSampleModel
-                (DataBuffer.TYPE_INT,
+            return new SinglePixelPackedSampleModel(
+                DataBuffer.TYPE_INT,
                  sm.getWidth(),
                  sm.getHeight(),
                  new int [] {0xFF0000, 0xFF00, 0xFF, 0xFF000000});
         else
-            return new SinglePixelPackedSampleModel
-                (DataBuffer.TYPE_INT,
+            return new SinglePixelPackedSampleModel(
+                DataBuffer.TYPE_INT,
                  sm.getWidth(),
                  sm.getHeight(),
                  new int [] {0xFF0000, 0xFF00, 0xFF});

Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/BufferedImageCachableRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/BufferedImageCachableRed.java?rev=1567281&r1=1567280&r2=1567281&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/BufferedImageCachableRed.java
(original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/BufferedImageCachableRed.java
Tue Feb 11 18:40:21 2014
@@ -111,8 +111,8 @@ public class BufferedImageCachableRed ex
     }
 
     public WritableRaster copyData(WritableRaster wr) {
-        WritableRaster wr2 = wr.createWritableTranslatedChild
-            (wr.getMinX() - getMinX(),
+        WritableRaster wr2 = wr.createWritableTranslatedChild(
+            wr.getMinX() - getMinX(),
              wr.getMinY() - getMinY());
 
         GraphicsUtil.copyData(bi.getRaster(), wr2);

Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/FormatRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/FormatRed.java?rev=1567281&r1=1567280&r2=1567281&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/FormatRed.java
(original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/FormatRed.java
Tue Feb 11 18:40:21 2014
@@ -58,8 +58,8 @@ public class FormatRed extends AbstractR
             return new FormatRed(src, cm);
 
         if (cm.getNumComponents() != srcCM.getNumComponents())
-            throw new IllegalArgumentException
-                ("Incompatible ColorModel given");
+            throw new IllegalArgumentException(
+                "Incompatible ColorModel given");
 
 
         if ((srcCM instanceof ComponentColorModel)
@@ -119,11 +119,11 @@ public class FormatRed extends AbstractR
                                                              wr.getMinY()));
         getSource().copyData(srcWR);
 
-        BufferedImage srcBI = new BufferedImage
-            (srcCM, srcWR.createWritableTranslatedChild(0, 0),
+        BufferedImage srcBI = new BufferedImage(
+            srcCM, srcWR.createWritableTranslatedChild(0, 0),
              srcCM.isAlphaPremultiplied(), null);
-        BufferedImage dstBI = new BufferedImage
-            (cm, wr.createWritableTranslatedChild(0, 0),
+        BufferedImage dstBI = new BufferedImage(
+            cm, wr.createWritableTranslatedChild(0, 0),
              cm.isAlphaPremultiplied(), null);
 
         GraphicsUtil.copyData(srcBI, dstBI);
@@ -151,8 +151,8 @@ public class FormatRed extends AbstractR
         case DataBuffer.TYPE_USHORT: bits = 16; break;
         case DataBuffer.TYPE_INT:    bits = 32; break;
         default:
-            throw new IllegalArgumentException
-                ("Unsupported DataBuffer type: " + dt);
+            throw new IllegalArgumentException(
+                "Unsupported DataBuffer type: " + dt);
         }
 
         boolean hasAlpha = srcCM.hasAlpha();
@@ -163,14 +163,14 @@ public class FormatRed extends AbstractR
             if (bands == srcCM.getNumComponents() - 1)
                 hasAlpha = false;
             else if (bands != srcCM.getNumComponents())
-                throw new IllegalArgumentException
-                    ("Incompatible number of bands in and out");
+                throw new IllegalArgumentException(
+                    "Incompatible number of bands in and out");
         } else {
             if (bands == srcCM.getNumComponents() + 1)
                 hasAlpha = true;
             else if (bands != srcCM.getNumComponents())
-                throw new IllegalArgumentException
-                    ("Incompatible number of bands in and out");
+                throw new IllegalArgumentException(
+                    "Incompatible number of bands in and out");
         }
 
         boolean preMult  = srcCM.isAlphaPremultiplied();
@@ -182,8 +182,8 @@ public class FormatRed extends AbstractR
             for (int i = 0; i < bands; i++)
                 bitsPer[i] = bits;
 
-            return new ComponentColorModel
-                (cs, bitsPer, hasAlpha, preMult,
+            return new ComponentColorModel(
+                cs, bitsPer, hasAlpha, preMult,
                  hasAlpha ? Transparency.TRANSLUCENT : Transparency.OPAQUE,
                  dt);
         } else if (sm instanceof SinglePixelPackedSampleModel) {
@@ -191,18 +191,18 @@ public class FormatRed extends AbstractR
             sppsm = (SinglePixelPackedSampleModel)sm;
             int[] masks  = sppsm.getBitMasks();
             if (bands == 4)
-                return new DirectColorModel
-                    (cs, bits, masks[0], masks[1], masks[2], masks[3],
+                return new DirectColorModel(
+                    cs, bits, masks[0], masks[1], masks[2], masks[3],
                      preMult, dt);
             else if (bands == 3)
-                return new DirectColorModel
-                    (cs, bits, masks[0], masks[1], masks[2], 0x0,
+                return new DirectColorModel(
+                    cs, bits, masks[0], masks[1], masks[2], 0x0,
                      preMult, dt);
             else
-                throw new IllegalArgumentException
-                    ("Incompatible number of bands out for ColorModel");
+                throw new IllegalArgumentException(
+                    "Incompatible number of bands out for ColorModel");
         }
-        throw new IllegalArgumentException
-            ("Unsupported SampleModel Type");
+        throw new IllegalArgumentException(
+            "Unsupported SampleModel Type");
     }
 }

Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/RenderedImageCachableRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/RenderedImageCachableRed.java?rev=1567281&r1=1567280&r2=1567281&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/RenderedImageCachableRed.java
(original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/image/rendered/RenderedImageCachableRed.java
Tue Feb 11 18:40:21 2014
@@ -149,12 +149,12 @@ public class RenderedImageCachableRed im
     }
 
     public Shape getDependencyRegion(int srcIndex, Rectangle outputRgn) {
-        throw new IndexOutOfBoundsException
-            ("Nonexistant source requested.");
+        throw new IndexOutOfBoundsException(
+            "Nonexistant source requested.");
     }
 
     public Shape getDirtyRegion(int srcIndex, Rectangle inputRgn) {
-        throw new IndexOutOfBoundsException
-            ("Nonexistant source requested.");
+        throw new IndexOutOfBoundsException(
+            "Nonexistant source requested.");
     }
 }

Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/TransformStackElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/TransformStackElement.java?rev=1567281&r1=1567280&r2=1567281&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/TransformStackElement.java
(original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/TransformStackElement.java
Tue Feb 11 18:40:21 2014
@@ -118,8 +118,8 @@ public abstract class TransformStackElem
             };
     }
 
-    public static TransformStackElement createGeneralTransformElement
-        (AffineTransform txf) {
+    public static TransformStackElement createGeneralTransformElement(
+        AffineTransform txf) {
         double[] matrix = new double[6];
         txf.getMatrix(matrix);
         return new TransformStackElement(TransformType.GENERAL, matrix) {

Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/util/io/Base64EncodeStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/util/io/Base64EncodeStream.java?rev=1567281&r1=1567280&r2=1567281&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/util/io/Base64EncodeStream.java
(original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/util/io/Base64EncodeStream.java
Tue Feb 11 18:40:21 2014
@@ -76,7 +76,7 @@ public class Base64EncodeStream extends 
         this.closeOutOnClose = closeOutOnClose;
     }
 
-    public void close () throws IOException {
+    public void close() throws IOException {
         if (out != null) {
             encodeAtom();
             out.flush();



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org


Mime
View raw message