You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by vh...@apache.org on 2014/02/11 19:33:57 UTC
svn commit: r1567277 [2/2] - in
/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics:
image/ image/codec/png/ image/codec/tiff/ image/codec/util/ image/rendered/
java2d/ util/io/
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=1567277&r1=1567276&r2=1567277&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:33:57 2014
@@ -136,8 +136,8 @@ public abstract class AbstractRed implem
ColorModel cm, SampleModel sm,
Map props) {
init(src, bounds, cm, sm,
- (src==null)?0:src.getTileGridXOffset(),
- (src==null)?0:src.getTileGridYOffset(),
+ (src == null) ? 0 : src.getTileGridXOffset(),
+ (src == null) ? 0 : src.getTileGridYOffset(),
props);
}
@@ -202,7 +202,7 @@ public abstract class AbstractRed implem
this.tileGridYOff = tileGridYOff;
this.props = new HashMap();
- if(props != null){
+ if (props != null) {
this.props.putAll(props);
}
@@ -305,7 +305,7 @@ public abstract class AbstractRed implem
int tileGridXOff, int tileGridYOff,
Map props) {
this.srcs = new Vector();
- if(srcs != null){
+ if (srcs != null) {
this.srcs.addAll(srcs);
}
@@ -320,7 +320,7 @@ public abstract class AbstractRed implem
this.tileGridXOff = tileGridXOff;
this.tileGridYOff = tileGridYOff;
this.props = new HashMap();
- if(props != null){
+ if (props != null) {
this.props.putAll(props);
}
@@ -357,13 +357,13 @@ public abstract class AbstractRed implem
minTileX = getXTile(bounds.x);
minTileY = getYTile(bounds.y);
- x1 = bounds.x + bounds.width-1; // Xloc of right edge
+ x1 = bounds.x + bounds.width - 1; // Xloc of right edge
maxTileX = getXTile(x1);
- numXTiles = maxTileX-minTileX+1;
+ numXTiles = maxTileX - minTileX + 1;
- y1 = bounds.y + bounds.height-1; // Yloc of right edge
+ y1 = bounds.y + bounds.height - 1; // Yloc of right edge
maxTileY = getYTile(y1);
- numYTiles = maxTileY-minTileY+1;
+ numYTiles = maxTileY - minTileY + 1;
}
@@ -455,7 +455,7 @@ public abstract class AbstractRed implem
RenderedImage ri = (RenderedImage)iter.next();
String[] srcProps = ri.getPropertyNames();
if (srcProps.length != 0) {
- String[] tmp = new String[ret.length+srcProps.length];
+ String[] tmp = new String[ret.length + srcProps.length];
System.arraycopy(ret, 0, tmp, 0, ret.length);
System.arraycopy(srcProps, 0, tmp, ret.length, srcProps.length);
ret = tmp;
@@ -527,12 +527,12 @@ public abstract class AbstractRed implem
* @return The tile index under xloc (may be outside tile grid).
*/
public final int getXTile(int xloc) {
- int tgx = xloc-tileGridXOff;
+ int tgx = xloc - tileGridXOff;
// We need to round to -infinity...
- if (tgx>=0)
- return tgx/tileWidth;
+ if (tgx >= 0)
+ return tgx / tileWidth;
else
- return (tgx-tileWidth+1)/tileWidth;
+ return (tgx - tileWidth + 1) / tileWidth;
}
/**
@@ -541,12 +541,12 @@ public abstract class AbstractRed implem
* @return The tile index under yloc (may be outside tile grid).
*/
public final int getYTile(int yloc) {
- int tgy = yloc-tileGridYOff;
+ int tgy = yloc - tileGridYOff;
// We need to round to -infinity...
- if (tgy>=0)
- return tgy/tileHeight;
+ if (tgy >= 0)
+ return tgy / tileHeight;
else
- return (tgy-tileHeight+1)/tileHeight;
+ return (tgy - tileHeight + 1) / tileHeight;
}
/**
@@ -558,20 +558,20 @@ public abstract class AbstractRed implem
public void copyToRaster(WritableRaster wr) {
int tx0 = getXTile(wr.getMinX());
int ty0 = getYTile(wr.getMinY());
- int tx1 = getXTile(wr.getMinX()+wr.getWidth() -1);
- int ty1 = getYTile(wr.getMinY()+wr.getHeight()-1);
+ int tx1 = getXTile(wr.getMinX() + wr.getWidth() - 1);
+ int ty1 = getYTile(wr.getMinY() + wr.getHeight() - 1);
if (tx0 < minTileX) tx0 = minTileX;
if (ty0 < minTileY) ty0 = minTileY;
- if (tx1 >= minTileX+numXTiles) tx1 = minTileX+numXTiles-1;
- if (ty1 >= minTileY+numYTiles) ty1 = minTileY+numYTiles-1;
+ if (tx1 >= minTileX + numXTiles) tx1 = minTileX + numXTiles - 1;
+ if (ty1 >= minTileY + numYTiles) ty1 = minTileY + numYTiles - 1;
final boolean isIntPack =
GraphicsUtil.is_INT_PACK_Data(getSampleModel(), false);
- for (int y=ty0; y<=ty1; y++)
- for (int x=tx0; x<=tx1; x++) {
+ for (int y = ty0; y <= ty1; y++)
+ for (int x = tx0; x <= tx1; x++) {
Raster r = getTile(x, y);
if (isIntPack)
GraphicsUtil.copyData_INT_PACK(r, wr);
@@ -594,14 +594,14 @@ public abstract class AbstractRed implem
* falles outside of the bounds of the tile grid for the image.
*/
public WritableRaster makeTile(int tileX, int tileY) {
- if ((tileX < minTileX) || (tileX >= minTileX+numXTiles)
- || (tileY < minTileY) || (tileY >= minTileY+numYTiles))
+ if ((tileX < minTileX) || (tileX >= minTileX + numXTiles)
+ || (tileY < minTileY) || (tileY >= minTileY + numYTiles))
throw new IndexOutOfBoundsException
("Requested Tile (" + tileX + ',' + tileY
+ ") lies outside the bounds of image");
- Point pt = new Point(tileGridXOff+tileX*tileWidth,
- tileGridYOff+tileY*tileHeight);
+ Point pt = new Point(tileGridXOff + tileX * tileWidth,
+ tileGridYOff + tileY * tileHeight);
WritableRaster wr;
wr = Raster.createWritableRaster(sm, pt);
@@ -625,19 +625,19 @@ public abstract class AbstractRed implem
int x0 = wr.getMinX();
int y0 = wr.getMinY();
- int x1 = x0+wr.getWidth() -1;
- int y1 = y0+wr.getHeight()-1;
+ int x1 = x0 + wr.getWidth() - 1;
+ int y1 = y0 + wr.getHeight() - 1;
- if ((x0 < bounds.x) || (x1 >= (bounds.x+bounds.width))
- || (y0 < bounds.y) || (y1 >= (bounds.y+bounds.height))) {
+ if ((x0 < bounds.x) || (x1 >= (bounds.x + bounds.width))
+ || (y0 < bounds.y) || (y1 >= (bounds.y + bounds.height))) {
// Part of this raster lies outside our bounds so subset
// it so it only advertises the stuff inside our bounds.
if (x0 < bounds.x) x0 = bounds.x;
if (y0 < bounds.y) y0 = bounds.y;
- if (x1 >= (bounds.x+bounds.width)) x1 = bounds.x+bounds.width-1;
- if (y1 >= (bounds.y+bounds.height)) y1 = bounds.y+bounds.height-1;
+ if (x1 >= (bounds.x + bounds.width)) x1 = bounds.x + bounds.width - 1;
+ if (y1 >= (bounds.y + bounds.height)) y1 = bounds.y + bounds.height - 1;
- wr = wr.createWritableChild(x0, y0, x1-x0+1, y1-y0+1,
+ wr = wr.createWritableChild(x0, y0, x1 - x0 + 1, y1 - y0 + 1,
x0, y0, null);
}
return wr;
@@ -653,7 +653,7 @@ public abstract class AbstractRed implem
Rectangle cpR = srcR.intersection(dstR);
int [] samples = null;
- for (int y=cpR.y; y< cpR.y+cpR.height; y++) {
+ for (int y = cpR.y; y < cpR.y + cpR.height; y++) {
samples = src.getSamples(cpR.x, y, cpR.width, 1, srcBand, samples);
dst.setSamples(cpR.x, y, cpR.width, 1, dstBand, samples);
}
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=1567277&r1=1567276&r2=1567277&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:33:57 2014
@@ -76,13 +76,13 @@ public class Any2LsRGBRed extends Abstra
* Gamma for linear to sRGB convertion
*/
private static final double GAMMA = 2.4;
- private static final double LFACT = 1.0/12.92;
+ private static final double LFACT = 1.0 / 12.92;
public static final double sRGBToLsRGB(double value) {
- if(value <= 0.003928)
- return value*LFACT;
- return Math.pow((value+0.055)/1.055, GAMMA);
+ if (value <= 0.003928)
+ return value * LFACT;
+ return Math.pow((value + 0.055) / 1.055, GAMMA);
}
/**
@@ -93,12 +93,12 @@ public class Any2LsRGBRed extends Abstra
*/
private static final int[] sRGBToLsRGBLut = new int[256];
static {
- final double scale = 1.0/255;
+ final double scale = 1.0 / 255;
// System.out.print("S2L: ");
- for(int i=0; i<256; i++){
- double value = sRGBToLsRGB(i*scale);
- sRGBToLsRGBLut[i] = (int)Math.round(value*255.0);
+ for (int i = 0; i < 256; i++) {
+ double value = sRGBToLsRGB(i * scale);
+ sRGBToLsRGBLut[i] = (int)Math.round(value * 255.0);
// System.out.print(sRGBToLsRGBLut[i] + ",");
}
// System.out.println("");
@@ -185,8 +185,8 @@ public class Any2LsRGBRed extends Abstra
wr.getDataBuffer(),
new Point(0,0));
dstWr = dstWr.createWritableChild
- (wr.getMinX()-wr.getSampleModelTranslateX(),
- wr.getMinY()-wr.getSampleModelTranslateY(),
+ (wr.getMinX() - wr.getSampleModelTranslateX(),
+ wr.getMinY() - wr.getSampleModelTranslateY(),
wr.getWidth(), wr.getHeight(),
0, 0, null);
@@ -229,8 +229,8 @@ public class Any2LsRGBRed extends Abstra
op.filter(srcBI, dstBI);
if (dstCM.hasAlpha())
- copyBand(srcWr, srcSM.getNumBands()-1,
- wr, getSampleModel().getNumBands()-1);
+ copyBand(srcWr, srcSM.getNumBands() - 1,
+ wr, getSampleModel().getNumBands() - 1);
}
return wr;
}
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=1567277&r1=1567276&r2=1567277&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:33:57 2014
@@ -75,19 +75,19 @@ public class Any2sRGBRed extends Abstrac
}
public static boolean is_INT_PACK_COMP(SampleModel sm) {
- if(!(sm instanceof SinglePixelPackedSampleModel)) return false;
+ if (!(sm instanceof SinglePixelPackedSampleModel)) return false;
// Check transfer types
- if(sm.getDataType() != DataBuffer.TYPE_INT) return false;
+ if (sm.getDataType() != DataBuffer.TYPE_INT) return false;
SinglePixelPackedSampleModel sppsm;
sppsm = (SinglePixelPackedSampleModel)sm;
int [] masks = sppsm.getBitMasks();
if ((masks.length != 3) && (masks.length != 4)) return false;
- if(masks[0] != 0x00ff0000) return false;
- if(masks[1] != 0x0000ff00) return false;
- if(masks[2] != 0x000000ff) return false;
+ if (masks[0] != 0x00ff0000) return false;
+ if (masks[1] != 0x0000ff00) return false;
+ if (masks[2] != 0x000000ff) return false;
if ((masks.length == 4) &&
(masks[3] != 0xff000000)) return false;
@@ -107,17 +107,17 @@ public class Any2sRGBRed extends Abstrac
*/
private static final int[] linearToSRGBLut = new int[256];
static {
- final double scale = 1.0/255;
- final double exp = 1.0/GAMMA;
+ final double scale = 1.0 / 255;
+ final double exp = 1.0 / GAMMA;
// System.out.print("L2S: ");
- for(int i=0; i<256; i++){
- double value = i*scale;
- if(value <= 0.0031308)
+ for (int i = 0; i < 256; i++) {
+ double value = i * scale;
+ if (value <= 0.0031308)
value *= 12.92;
else
value = 1.055 * Math.pow(value, exp) - 0.055;
- linearToSRGBLut[i] = (int)Math.round(value*255.);
+ linearToSRGBLut[i] = (int)Math.round(value * 255.);
// System.out.print(linearToSRGBLut[i] + ",");
}
// System.out.println("");
@@ -131,8 +131,8 @@ public class Any2sRGBRed extends Abstrac
final int srcBase
= (db.getOffset() +
- sm.getOffset(wr.getMinX()-wr.getSampleModelTranslateX(),
- wr.getMinY()-wr.getSampleModelTranslateY()));
+ sm.getOffset(wr.getMinX() - wr.getSampleModelTranslateX(),
+ wr.getMinY() - wr.getSampleModelTranslateY()));
// Access the pixel data array
final int[] pixels = db.getBankData()[0];
final int width = wr.getWidth();
@@ -142,17 +142,17 @@ public class Any2sRGBRed extends Abstrac
int end, pix;
// For alpha premult we need to multiply all comps.
- for (int y=0; y<height; y++) {
- int sp = srcBase + y*scanStride;
+ for (int y = 0; y < height; y++) {
+ int sp = srcBase + y * scanStride;
end = sp + width;
- while (sp<end) {
+ while (sp < end) {
pix = pixels[sp];
pixels[sp] =
- (( pix &0xFF000000)|
- (lut[(pix>>>16)&0xFF]<<16) |
- (lut[(pix>>> 8)&0xFF]<< 8) |
- (lut[(pix )&0xFF] ));
+ (( pix & 0xFF000000) |
+ (lut[(pix >>> 16) & 0xFF] << 16) |
+ (lut[(pix >>> 8) & 0xFF] << 8) |
+ (lut[(pix ) & 0xFF] ));
sp++;
}
}
@@ -290,12 +290,12 @@ public class Any2sRGBRed extends Abstrac
// System.out.println("After filter:");
WritableRaster wr00 = wr.createWritableTranslatedChild(0,0);
- for (int i=0; i<dstCM.getColorSpace().getNumComponents(); i++)
+ for (int i = 0; i < dstCM.getColorSpace().getNumComponents(); i++)
copyBand(dstBI.getRaster(), i, wr00, i);
if (dstCM.hasAlpha())
- copyBand(srcWr, srcSM.getNumBands()-1,
- wr, getSampleModel().getNumBands()-1);
+ copyBand(srcWr, srcSM.getNumBands() - 1,
+ wr, getSampleModel().getNumBands() - 1);
return wr;
}
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=1567277&r1=1567276&r2=1567277&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:33:57 2014
@@ -106,14 +106,14 @@ public class BufferedImageCachableRed ex
r.translate(-getMinX(), - getMinY());
Raster ret = bi.getData(r);
- return ret.createTranslatedChild(ret.getMinX()+getMinX(),
- ret.getMinY()+getMinY());
+ return ret.createTranslatedChild(ret.getMinX() + getMinX(),
+ ret.getMinY() + getMinY());
}
public WritableRaster copyData(WritableRaster wr) {
WritableRaster wr2 = wr.createWritableTranslatedChild
- (wr.getMinX()-getMinX(),
- wr.getMinY()-getMinY());
+ (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=1567277&r1=1567276&r2=1567277&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:33:57 2014
@@ -146,27 +146,27 @@ public class FormatRed extends AbstractR
int bits;
int dt = sm.getDataType();
switch (dt) {
- case DataBuffer.TYPE_BYTE: bits=8; break;
- case DataBuffer.TYPE_SHORT: bits=16; break;
- case DataBuffer.TYPE_USHORT: bits=16; break;
- case DataBuffer.TYPE_INT: bits=32; break;
+ case DataBuffer.TYPE_BYTE: bits = 8; break;
+ case DataBuffer.TYPE_SHORT: bits = 16; break;
+ case DataBuffer.TYPE_USHORT: bits = 16; break;
+ case DataBuffer.TYPE_INT: bits = 32; break;
default:
throw new IllegalArgumentException
("Unsupported DataBuffer type: " + dt);
}
boolean hasAlpha = srcCM.hasAlpha();
- if (hasAlpha){
+ if (hasAlpha) {
// if Src has Alpha then our out bands must
// either be one less than the source (no out alpha)
// or equal (still has alpha)
- if (bands == srcCM.getNumComponents()-1)
+ if (bands == srcCM.getNumComponents() - 1)
hasAlpha = false;
else if (bands != srcCM.getNumComponents())
throw new IllegalArgumentException
("Incompatible number of bands in and out");
} else {
- if (bands == srcCM.getNumComponents()+1)
+ if (bands == srcCM.getNumComponents() + 1)
hasAlpha = true;
else if (bands != srcCM.getNumComponents())
throw new IllegalArgumentException
@@ -179,7 +179,7 @@ public class FormatRed extends AbstractR
if (sm instanceof ComponentSampleModel) {
int [] bitsPer = new int[bands];
- for (int i=0; i<bands; i++)
+ for (int i = 0; i < bands; i++)
bitsPer[i] = bits;
return new ComponentColorModel
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=1567277&r1=1567276&r2=1567277&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:33:57 2014
@@ -56,7 +56,7 @@ public class RenderedImageCachableRed im
private Vector srcs = new Vector(0);
public RenderedImageCachableRed(RenderedImage src) {
- if(src == null){
+ if (src == null) {
throw new NullPointerException();
}
this.src = src;
Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/AbstractGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/AbstractGraphics2D.java?rev=1567277&r1=1567276&r2=1567277&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/AbstractGraphics2D.java (original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/AbstractGraphics2D.java Tue Feb 11 18:33:57 2014
@@ -119,7 +119,7 @@ public abstract class AbstractGraphics2D
* @param x the <i>x</i> coordinate.
* @param y the <i>y</i> coordinate.
*/
- public void translate(int x, int y){
+ public void translate(int x, int y) {
gc.translate(x, y);
}
@@ -129,7 +129,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Color
* @see java.awt.Graphics#setColor
*/
- public Color getColor(){
+ public Color getColor() {
return gc.getColor();
}
@@ -141,7 +141,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Color
* @see java.awt.Graphics#getColor
*/
- public void setColor(Color c){
+ public void setColor(Color c) {
gc.setColor(c);
}
@@ -152,7 +152,7 @@ public abstract class AbstractGraphics2D
* overwrite mode. All subsequent rendering operations will
* overwrite the destination with the current color.
*/
- public void setPaintMode(){
+ public void setPaintMode() {
gc.setComposite(AlphaComposite.SrcOver);
}
@@ -162,7 +162,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Font
* @see java.awt.Graphics#setFont
*/
- public Font getFont(){
+ public Font getFont() {
return gc.getFont();
}
@@ -173,7 +173,7 @@ public abstract class AbstractGraphics2D
* @param font the font.
* @see java.awt.Graphics#getFont
*/
- public void setFont(Font font){
+ public void setFont(Font font) {
gc.setFont(font);
}
@@ -194,7 +194,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#setClip(Shape)
* @since JDK1.1
*/
- public Rectangle getClipBounds(){
+ public Rectangle getClipBounds() {
return gc.getClipBounds();
}
@@ -218,7 +218,7 @@ public abstract class AbstractGraphics2D
* @see #setClip(int, int, int, int)
* @see #setClip(Shape)
*/
- public void clipRect(int x, int y, int width, int height){
+ public void clipRect(int x, int y, int width, int height) {
gc.clipRect(x, y, width, height);
}
@@ -237,7 +237,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#setClip(Shape)
* @since JDK1.1
*/
- public void setClip(int x, int y, int width, int height){
+ public void setClip(int x, int y, int width, int height) {
gc.setClip(x, y, width, height);
}
@@ -258,7 +258,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#setClip(Shape)
* @since JDK1.1
*/
- public Shape getClip(){
+ public Shape getClip() {
return gc.getClip();
}
@@ -279,7 +279,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#setClip(int, int, int, int)
* @since JDK1.1
*/
- public void setClip(Shape clip){
+ public void setClip(Shape clip) {
gc.setClip(clip);
}
@@ -293,7 +293,7 @@ public abstract class AbstractGraphics2D
* @param x2 the second point's <i>x</i> coordinate.
* @param y2 the second point's <i>y</i> coordinate.
*/
- public void drawLine(int x1, int y1, int x2, int y2){
+ public void drawLine(int x1, int y1, int x2, int y2) {
Line2D line = new Line2D.Float(x1, y1, x2, y2);
draw(line);
}
@@ -318,12 +318,12 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#clearRect
* @see java.awt.Graphics#drawRect
*/
- public void fillRect(int x, int y, int width, int height){
+ public void fillRect(int x, int y, int width, int height) {
Rectangle rect = new Rectangle(x, y, width, height);
fill(rect);
}
- public void drawRect(int x, int y, int width, int height){
+ public void drawRect(int x, int y, int width, int height) {
Rectangle rect = new Rectangle(x, y, width, height);
draw(rect);
}
@@ -349,7 +349,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#setPaintMode
* @see java.awt.Graphics#setXORMode(java.awt.Color)
*/
- public void clearRect(int x, int y, int width, int height){
+ public void clearRect(int x, int y, int width, int height) {
Paint paint = gc.getPaint();
gc.setColor(gc.getBackground());
fillRect(x, y, width, height);
@@ -373,7 +373,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#fillRoundRect
*/
public void drawRoundRect(int x, int y, int width, int height,
- int arcWidth, int arcHeight){
+ int arcWidth, int arcHeight) {
RoundRectangle2D rect = new RoundRectangle2D.Float(x, y, width, height, arcWidth, arcHeight);
draw(rect);
}
@@ -396,7 +396,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#drawRoundRect
*/
public void fillRoundRect(int x, int y, int width, int height,
- int arcWidth, int arcHeight){
+ int arcWidth, int arcHeight) {
RoundRectangle2D rect = new RoundRectangle2D.Float(x, y, width, height, arcWidth, arcHeight);
fill(rect);
}
@@ -419,7 +419,7 @@ public abstract class AbstractGraphics2D
* @param height the height of the oval to be drawn.
* @see java.awt.Graphics#fillOval
*/
- public void drawOval(int x, int y, int width, int height){
+ public void drawOval(int x, int y, int width, int height) {
Ellipse2D oval = new Ellipse2D.Float(x, y, width, height);
draw(oval);
}
@@ -436,7 +436,7 @@ public abstract class AbstractGraphics2D
* @param height the height of the oval to be filled.
* @see java.awt.Graphics#drawOval
*/
- public void fillOval(int x, int y, int width, int height){
+ public void fillOval(int x, int y, int width, int height) {
Ellipse2D oval = new Ellipse2D.Float(x, y, width, height);
fill(oval);
}
@@ -480,7 +480,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#fillArc
*/
public void drawArc(int x, int y, int width, int height,
- int startAngle, int arcAngle){
+ int startAngle, int arcAngle) {
Arc2D arc = new Arc2D.Float(x, y, width, height, startAngle, arcAngle, Arc2D.OPEN);
draw(arc);
}
@@ -523,7 +523,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#drawArc
*/
public void fillArc(int x, int y, int width, int height,
- int startAngle, int arcAngle){
+ int startAngle, int arcAngle) {
Arc2D arc = new Arc2D.Float(x, y, width, height, startAngle, arcAngle, Arc2D.PIE);
fill(arc);
}
@@ -542,11 +542,11 @@ public abstract class AbstractGraphics2D
* @since JDK1.1
*/
public void drawPolyline(int[] xPoints, int[] yPoints,
- int nPoints){
- if(nPoints > 0){
+ int nPoints) {
+ if (nPoints > 0) {
GeneralPath path = new GeneralPath();
path.moveTo(xPoints[0], yPoints[0]);
- for(int i=1; i<nPoints; i++)
+ for (int i = 1; i < nPoints; i++)
path.lineTo(xPoints[i], yPoints[i]);
draw(path);
@@ -573,7 +573,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#drawPolyline
*/
public void drawPolygon(int[] xPoints, int[] yPoints,
- int nPoints){
+ int nPoints) {
Polygon polygon = new Polygon(xPoints, yPoints, nPoints);
draw(polygon);
}
@@ -600,7 +600,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#drawPolygon(int[], int[], int)
*/
public void fillPolygon(int[] xPoints, int[] yPoints,
- int nPoints){
+ int nPoints) {
Polygon polygon = new Polygon(xPoints, yPoints, nPoints);
fill(polygon);
}
@@ -616,7 +616,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#drawBytes
* @see java.awt.Graphics#drawChars
*/
- public void drawString(String str, int x, int y){
+ public void drawString(String str, int x, int y) {
drawString(str, (float)x, (float)y);
}
@@ -653,7 +653,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#drawChars
*/
public void drawString(AttributedCharacterIterator iterator,
- int x, int y){
+ int x, int y) {
drawString(iterator, (float)x, (float)y);
}
@@ -689,7 +689,7 @@ public abstract class AbstractGraphics2D
*/
public boolean drawImage(Image img, int x, int y,
Color bgcolor,
- ImageObserver observer){
+ ImageObserver observer) {
return drawImage(img, x, y, img.getWidth(null), img.getHeight(null),
bgcolor, observer);
}
@@ -736,7 +736,7 @@ public abstract class AbstractGraphics2D
public boolean drawImage(Image img, int x, int y,
int width, int height,
Color bgcolor,
- ImageObserver observer){
+ ImageObserver observer) {
Paint paint = gc.getPaint();
gc.setPaint(bgcolor);
fillRect(x, y, width, height);
@@ -796,15 +796,15 @@ public abstract class AbstractGraphics2D
public boolean drawImage(Image img,
int dx1, int dy1, int dx2, int dy2,
int sx1, int sy1, int sx2, int sy2,
- ImageObserver observer){
+ ImageObserver observer) {
BufferedImage src = new BufferedImage(img.getWidth(null), img.getHeight(null), BufferedImage.TYPE_INT_ARGB);
Graphics2D g = src.createGraphics();
g.drawImage(img, 0, 0, null);
g.dispose();
- src = src.getSubimage(sx1, sy1, sx2-sx1, sy2-sy1);
+ src = src.getSubimage(sx1, sy1, sx2 - sx1, sy2 - sy1);
- return drawImage(src, dx1, dy1, dx2-dx1, dy2-dy1, observer);
+ return drawImage(src, dx1, dy1, dx2 - dx1, dy2 - dy1, observer);
}
@@ -865,10 +865,10 @@ public abstract class AbstractGraphics2D
int dx1, int dy1, int dx2, int dy2,
int sx1, int sy1, int sx2, int sy2,
Color bgcolor,
- ImageObserver observer){
+ ImageObserver observer) {
Paint paint = gc.getPaint();
gc.setPaint(bgcolor);
- fillRect(dx1, dy1, dx2-dx1, dy2-dy1);
+ fillRect(dx1, dy1, dx2 - dx1, dy2 - dy1);
gc.setPaint(paint);
return drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, observer);
}
@@ -901,14 +901,14 @@ public abstract class AbstractGraphics2D
*/
public boolean drawImage(Image img,
AffineTransform xform,
- ImageObserver obs){
+ ImageObserver obs) {
boolean retVal = true;
- if(xform.getDeterminant() != 0){
+ if (xform.getDeterminant() != 0) {
AffineTransform inverseTransform = null;
- try{
+ try {
inverseTransform = xform.createInverse();
- } catch(NoninvertibleTransformException e){
+ } catch (NoninvertibleTransformException e) {
// Should never happen since we checked the
// matrix determinant
throw new RuntimeException(e);
@@ -953,7 +953,7 @@ public abstract class AbstractGraphics2D
public void drawImage(BufferedImage img,
BufferedImageOp op,
int x,
- int y){
+ int y) {
img = op.filter(img, null);
drawImage(img, x, y, null);
}
@@ -986,7 +986,7 @@ public abstract class AbstractGraphics2D
* @see #setComposite
* @see #setClip(Shape)
*/
- public void drawGlyphVector(GlyphVector g, float x, float y){
+ public void drawGlyphVector(GlyphVector g, float x, float y) {
Shape glyphOutline = g.getOutline(x, y);
fill(glyphOutline);
}
@@ -1022,7 +1022,7 @@ public abstract class AbstractGraphics2D
*/
public boolean hit(Rectangle rect,
Shape s,
- boolean onStroke){
+ boolean onStroke) {
if (onStroke) {
s = gc.getStroke().createStrokedShape(s);
}
@@ -1056,7 +1056,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.Graphics#setPaintMode
* @see java.awt.AlphaComposite
*/
- public void setComposite(Composite comp){
+ public void setComposite(Composite comp) {
gc.setComposite(comp);
}
@@ -1081,7 +1081,7 @@ public abstract class AbstractGraphics2D
* @param s the <code>Stroke</code> object to be used to stroke a
* <code>Shape</code> during the rendering process
*/
- public void setStroke(Stroke s){
+ public void setStroke(Stroke s) {
gc.setStroke(s);
}
@@ -1097,7 +1097,7 @@ public abstract class AbstractGraphics2D
* hint category.
* @see RenderingHints
*/
- public void setRenderingHint(RenderingHints.Key hintKey, Object hintValue){
+ public void setRenderingHint(RenderingHints.Key hintKey, Object hintValue) {
gc.setRenderingHint(hintKey, hintValue);
}
@@ -1114,7 +1114,7 @@ public abstract class AbstractGraphics2D
* <code>RenderingHints</code> class.
* @see RenderingHints
*/
- public Object getRenderingHint(RenderingHints.Key hintKey){
+ public Object getRenderingHint(RenderingHints.Key hintKey) {
return gc.getRenderingHint(hintKey);
}
@@ -1132,7 +1132,7 @@ public abstract class AbstractGraphics2D
* @param hints the rendering hints to be set
* @see RenderingHints
*/
- public void setRenderingHints(Map hints){
+ public void setRenderingHints(Map hints) {
gc.setRenderingHints(hints);
}
@@ -1151,7 +1151,7 @@ public abstract class AbstractGraphics2D
* @param hints the rendering hints to be set
* @see RenderingHints
*/
- public void addRenderingHints(Map hints){
+ public void addRenderingHints(Map hints) {
gc.addRenderingHints(hints);
}
@@ -1168,7 +1168,7 @@ public abstract class AbstractGraphics2D
* that contains the current preferences.
* @see RenderingHints
*/
- public RenderingHints getRenderingHints(){
+ public RenderingHints getRenderingHints() {
return gc.getRenderingHints();
}
@@ -1188,7 +1188,7 @@ public abstract class AbstractGraphics2D
* @param tx the distance to translate along the x-axis
* @param ty the distance to translate along the y-axis
*/
- public void translate(double tx, double ty){
+ public void translate(double tx, double ty) {
gc.translate(tx, ty);
}
@@ -1209,7 +1209,7 @@ public abstract class AbstractGraphics2D
* x axis toward the positive y axis.
* @param theta the angle of rotation in radians
*/
- public void rotate(double theta){
+ public void rotate(double theta) {
gc.rotate(theta);
}
@@ -1233,7 +1233,7 @@ public abstract class AbstractGraphics2D
* @param x the x coordinate of the origin of the rotation
* @param y the y coordinate of the origin of the rotation
*/
- public void rotate(double theta, double x, double y){
+ public void rotate(double theta, double x, double y) {
gc.rotate(theta, x, y);
}
@@ -1257,7 +1257,7 @@ public abstract class AbstractGraphics2D
* rendering operations are multiplied relative to previous
* rendering operations.
*/
- public void scale(double sx, double sy){
+ public void scale(double sx, double sy) {
gc.scale(sx, sy);
}
@@ -1279,7 +1279,7 @@ public abstract class AbstractGraphics2D
* @param shy the multiplier by which coordinates are shifted in
* the positive Y axis direction as a function of their X coordinate
*/
- public void shear(double shx, double shy){
+ public void shear(double shx, double shy) {
gc.shear(shx, shy);
}
@@ -1300,7 +1300,7 @@ public abstract class AbstractGraphics2D
* @see #setTransform
* @see AffineTransform
*/
- public void transform(AffineTransform Tx){
+ public void transform(AffineTransform Tx) {
gc.transform(Tx);
}
@@ -1312,7 +1312,7 @@ public abstract class AbstractGraphics2D
* @see #transform
* @see AffineTransform
*/
- public void setTransform(AffineTransform Tx){
+ public void setTransform(AffineTransform Tx) {
gc.setTransform(Tx);
}
@@ -1325,7 +1325,7 @@ public abstract class AbstractGraphics2D
* @see #transform
* @see #setTransform
*/
- public AffineTransform getTransform(){
+ public AffineTransform getTransform() {
return gc.getTransform();
}
@@ -1338,7 +1338,7 @@ public abstract class AbstractGraphics2D
* @see #setPaint
* @see java.awt.Graphics#setColor
*/
- public Paint getPaint(){
+ public Paint getPaint() {
return gc.getPaint();
}
@@ -1350,7 +1350,7 @@ public abstract class AbstractGraphics2D
* which defines a compositing style.
* @see #setComposite
*/
- public Composite getComposite(){
+ public Composite getComposite() {
return gc.getComposite();
}
@@ -1371,7 +1371,7 @@ public abstract class AbstractGraphics2D
* @see #getBackground
* @see java.awt.Graphics#clearRect
*/
- public void setBackground(Color color){
+ public void setBackground(Color color) {
gc.setBackground(color);
}
@@ -1382,7 +1382,7 @@ public abstract class AbstractGraphics2D
* which defines the background color.
* @see #setBackground
*/
- public Color getBackground(){
+ public Color getBackground() {
return gc.getBackground();
}
@@ -1394,7 +1394,7 @@ public abstract class AbstractGraphics2D
* which defines the line style.
* @see #setStroke
*/
- public Stroke getStroke(){
+ public Stroke getStroke() {
return gc.getStroke();
}
@@ -1418,7 +1418,7 @@ public abstract class AbstractGraphics2D
* <code>Clip</code>. If <code>s</code> is <code>null</code>,
* this method clears the current <code>Clip</code>.
*/
- public void clip(Shape s){
+ public void clip(Shape s) {
gc.clip(s);
}
@@ -1444,7 +1444,7 @@ public abstract class AbstractGraphics2D
* @see java.awt.font.TextLayout
* @since JDK1.2
*/
- public FontRenderContext getFontRenderContext(){
+ public FontRenderContext getFontRenderContext() {
return gc.getFontRenderContext();
}
Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/DefaultGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/DefaultGraphics2D.java?rev=1567277&r1=1567276&r2=1567277&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/DefaultGraphics2D.java (original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/DefaultGraphics2D.java Tue Feb 11 18:33:57 2014
@@ -53,14 +53,14 @@ public class DefaultGraphics2D extends A
/**
* Default constructor
*/
- public DefaultGraphics2D(boolean textAsShapes){
+ public DefaultGraphics2D(boolean textAsShapes) {
super(textAsShapes);
}
/**
* This constructor supports the create method
*/
- public DefaultGraphics2D(DefaultGraphics2D g){
+ public DefaultGraphics2D(DefaultGraphics2D g) {
super(g);
}
@@ -70,7 +70,7 @@ public class DefaultGraphics2D extends A
* @return a new graphics context that is a copy of
* this graphics context.
*/
- public Graphics create(){
+ public Graphics create() {
return new DefaultGraphics2D(this);
}
@@ -98,7 +98,7 @@ public class DefaultGraphics2D extends A
* @see java.awt.image.ImageObserver
* @see java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
*/
- public boolean drawImage(Image img, int x, int y, ImageObserver observer){
+ public boolean drawImage(Image img, int x, int y, ImageObserver observer) {
System.err.println("drawImage");
return true;
}
@@ -170,7 +170,7 @@ public class DefaultGraphics2D extends A
* @see java.awt.Component#getGraphics
* @see java.awt.Graphics#create()
*/
- public void dispose(){
+ public void dispose() {
System.out.println("dispose");
}
@@ -188,7 +188,7 @@ public class DefaultGraphics2D extends A
* @see #setClip(Shape)
* @see #setComposite(java.awt.Composite)
*/
- public void draw(Shape s){
+ public void draw(Shape s) {
System.out.println("draw(Shape)");
}
@@ -245,7 +245,7 @@ public class DefaultGraphics2D extends A
* @see #drawRenderedImage
*/
public void drawRenderableImage(RenderableImage img,
- AffineTransform xform){
+ AffineTransform xform) {
System.out.println("drawRenderableImage");
}
@@ -273,7 +273,7 @@ public class DefaultGraphics2D extends A
* @see #setComposite(java.awt.Composite)
* @see #setClip(Shape)
*/
- public void drawString(String s, float x, float y){
+ public void drawString(String s, float x, float y) {
System.out.println("drawString(String)");
}
@@ -319,7 +319,7 @@ public class DefaultGraphics2D extends A
* @see #setComposite(java.awt.Composite)
* @see #setClip(Shape)
*/
- public void fill(Shape s){
+ public void fill(Shape s) {
System.err.println("fill");
}
@@ -327,7 +327,7 @@ public class DefaultGraphics2D extends A
* Returns the device configuration associated with this
* <code>Graphics2D</code>.
*/
- public GraphicsConfiguration getDeviceConfiguration(){
+ public GraphicsConfiguration getDeviceConfiguration() {
System.out.println("getDeviceConviguration");
return null;
}
@@ -352,7 +352,7 @@ public class DefaultGraphics2D extends A
* @see java.awt.FontMetrics
* @see java.awt.Graphics#getFontMetrics()
*/
- public FontMetrics getFontMetrics(Font f){
+ public FontMetrics getFontMetrics(Font f) {
return fmg.getFontMetrics(f);
}
@@ -371,7 +371,7 @@ public class DefaultGraphics2D extends A
* drawn twice, then all pixels are restored to their original values.
* @param c1 the XOR alternation color
*/
- public void setXORMode(Color c1){
+ public void setXORMode(Color c1) {
System.out.println("setXORMode");
}
@@ -396,7 +396,7 @@ public class DefaultGraphics2D extends A
* @param dy the vertical distance to copy the pixels.
*/
public void copyArea(int x, int y, int width, int height,
- int dx, int dy){
+ int dx, int dy) {
System.out.println("copyArea");
}
Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java?rev=1567277&r1=1567276&r2=1567277&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java (original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java Tue Feb 11 18:33:57 2014
@@ -56,7 +56,7 @@ import java.util.Map;
*
* Originally authored by Vincent Hardy and Christophe Jolif.
*/
-public class GraphicContext implements Cloneable{
+public class GraphicContext implements Cloneable {
/**
* Default Transform to be used for creating FontRenderContext.
*/
@@ -204,7 +204,7 @@ public class GraphicContext implements C
/**
* @return a deep copy of this context
*/
- public Object clone(){
+ public Object clone() {
return new GraphicContext(this);
}
@@ -214,7 +214,7 @@ public class GraphicContext implements C
* @see java.awt.Color
* @see java.awt.Graphics#setColor
*/
- public Color getColor(){
+ public Color getColor() {
return foreground;
}
@@ -226,12 +226,12 @@ public class GraphicContext implements C
* @see java.awt.Color
* @see java.awt.Graphics#getColor
*/
- public void setColor(Color c){
- if(c == null) {
+ public void setColor(Color c) {
+ if (c == null) {
return;
}
- if(paint != c) {
+ if (paint != c) {
setPaint(c);
}
}
@@ -242,7 +242,7 @@ public class GraphicContext implements C
* @see java.awt.Font
* @see java.awt.Graphics#setFont
*/
- public Font getFont(){
+ public Font getFont() {
return font;
}
@@ -253,8 +253,8 @@ public class GraphicContext implements C
* @param font the font.
* @see java.awt.Graphics#getFont
*/
- public void setFont(Font font){
- if(font != null) {
+ public void setFont(Font font) {
+ if (font != null) {
this.font = font;
}
}
@@ -276,9 +276,9 @@ public class GraphicContext implements C
* @see java.awt.Graphics#setClip(Shape)
* @since JDK1.1
*/
- public Rectangle getClipBounds(){
+ public Rectangle getClipBounds() {
Shape c = getClip();
- if(c==null) {
+ if (c == null) {
return null;
} else {
return c.getBounds();
@@ -305,7 +305,7 @@ public class GraphicContext implements C
* @see #setClip(int, int, int, int)
* @see #setClip(Shape)
*/
- public void clipRect(int x, int y, int width, int height){
+ public void clipRect(int x, int y, int width, int height) {
clip(new Rectangle(x, y, width, height));
}
@@ -324,7 +324,7 @@ public class GraphicContext implements C
* @see java.awt.Graphics#setClip(Shape)
* @since JDK1.1
*/
- public void setClip(int x, int y, int width, int height){
+ public void setClip(int x, int y, int width, int height) {
setClip(new Rectangle(x, y, width, height));
}
@@ -345,10 +345,10 @@ public class GraphicContext implements C
* @see java.awt.Graphics#setClip(Shape)
* @since JDK1.1
*/
- public Shape getClip(){
- try{
+ public Shape getClip() {
+ try {
return transform.createInverse().createTransformedShape(clip);
- }catch(NoninvertibleTransformException e){
+ } catch (NoninvertibleTransformException e) {
return null;
}
}
@@ -403,7 +403,7 @@ public class GraphicContext implements C
* @see java.awt.Graphics#setPaintMode
* @see java.awt.AlphaComposite
*/
- public void setComposite(Composite comp){
+ public void setComposite(Composite comp) {
this.composite = comp;
}
@@ -421,12 +421,12 @@ public class GraphicContext implements C
* @see java.awt.TexturePaint
*/
public void setPaint(Paint paint) {
- if(paint == null) {
+ if (paint == null) {
return;
}
this.paint = paint;
- if(paint instanceof Color) {
+ if (paint instanceof Color) {
foreground = (Color)paint;
} else {
// use default; otherwise the previous Color will be used
@@ -441,7 +441,7 @@ public class GraphicContext implements C
* <code>Shape</code> during the rendering process
* @see BasicStroke
*/
- public void setStroke(Stroke s){
+ public void setStroke(Stroke s) {
stroke = s;
}
@@ -456,7 +456,7 @@ public class GraphicContext implements C
* hint category.
* @see RenderingHints
*/
- public void setRenderingHint(RenderingHints.Key hintKey, Object hintValue){
+ public void setRenderingHint(RenderingHints.Key hintKey, Object hintValue) {
hints.put(hintKey, hintValue);
}
@@ -473,7 +473,7 @@ public class GraphicContext implements C
* <code>RenderingHints</code> class.
* @see RenderingHints
*/
- public Object getRenderingHint(RenderingHints.Key hintKey){
+ public Object getRenderingHint(RenderingHints.Key hintKey) {
return hints.get(hintKey);
}
@@ -491,7 +491,7 @@ public class GraphicContext implements C
* @param hints the rendering hints to be set
* @see RenderingHints
*/
- public void setRenderingHints(Map hints){
+ public void setRenderingHints(Map hints) {
this.hints = new RenderingHints(hints);
}
@@ -510,7 +510,7 @@ public class GraphicContext implements C
* @param hints the rendering hints to be set
* @see RenderingHints
*/
- public void addRenderingHints(Map hints){
+ public void addRenderingHints(Map hints) {
this.hints.putAll(hints);
}
@@ -527,7 +527,7 @@ public class GraphicContext implements C
* that contains the current preferences.
* @see RenderingHints
*/
- public RenderingHints getRenderingHints(){
+ public RenderingHints getRenderingHints() {
return hints;
}
@@ -542,8 +542,8 @@ public class GraphicContext implements C
* @param x the <i>x</i> coordinate.
* @param y the <i>y</i> coordinate.
*/
- public void translate(int x, int y){
- if(x!=0 || y!=0){
+ public void translate(int x, int y) {
+ if (x != 0 || y != 0) {
transform.translate(x, y);
transformStack.add(TransformStackElement.createTranslateElement(x, y));
}
@@ -566,7 +566,7 @@ public class GraphicContext implements C
* @param tx the distance to translate along the x-axis
* @param ty the distance to translate along the y-axis
*/
- public void translate(double tx, double ty){
+ public void translate(double tx, double ty) {
transform.translate(tx, ty);
transformStack.add(TransformStackElement.createTranslateElement(tx, ty));
}
@@ -587,7 +587,7 @@ public class GraphicContext implements C
* x axis toward the positive y axis.
* @param theta the angle of rotation in radians
*/
- public void rotate(double theta){
+ public void rotate(double theta) {
transform.rotate(theta);
transformStack.add(TransformStackElement.createRotateElement(theta));
}
@@ -611,7 +611,7 @@ public class GraphicContext implements C
* @param x x coordinate of the origin of the rotation
* @param y y coordinate of the origin of the rotation
*/
- public void rotate(double theta, double x, double y){
+ public void rotate(double theta, double x, double y) {
transform.rotate(theta, x, y);
transformStack.add(TransformStackElement.createTranslateElement(x, y));
transformStack.add(TransformStackElement.createRotateElement(theta));
@@ -637,7 +637,7 @@ public class GraphicContext implements C
* rendering operations are multiplied relative to previous
* rendering operations.
*/
- public void scale(double sx, double sy){
+ public void scale(double sx, double sy) {
transform.scale(sx, sy);
transformStack.add(TransformStackElement.createScaleElement(sx, sy));
}
@@ -660,7 +660,7 @@ public class GraphicContext implements C
* @param shy the multiplier by which coordinates are shifted in
* the positive Y axis direction as a function of their X coordinate
*/
- public void shear(double shx, double shy){
+ public void shear(double shx, double shy) {
transform.shear(shx, shy);
transformStack.add(TransformStackElement.createShearElement(shx, shy));
}
@@ -682,7 +682,7 @@ public class GraphicContext implements C
* @see #setTransform
* @see AffineTransform
*/
- public void transform(AffineTransform Tx){
+ public void transform(AffineTransform Tx) {
transform.concatenate(Tx);
transformStack.add(TransformStackElement.createGeneralTransformElement(Tx));
}
@@ -695,10 +695,10 @@ public class GraphicContext implements C
* @see #transform
* @see AffineTransform
*/
- public void setTransform(AffineTransform Tx){
+ public void setTransform(AffineTransform Tx) {
transform = new AffineTransform(Tx);
invalidateTransformStack();
- if(!Tx.isIdentity()) {
+ if (!Tx.isIdentity()) {
transformStack.add(TransformStackElement.createGeneralTransformElement(Tx));
}
}
@@ -709,7 +709,7 @@ public class GraphicContext implements C
* has not been reset. Only the setTransform method can
* override this memento.
*/
- public void validateTransformStack(){
+ public void validateTransformStack() {
transformStackValid = true;
}
@@ -717,7 +717,7 @@ public class GraphicContext implements C
* Checks the status of the transform stack.
* @return true if the transform stack is valid
*/
- public boolean isTransformStackValid(){
+ public boolean isTransformStackValid() {
return transformStackValid;
}
@@ -725,7 +725,7 @@ public class GraphicContext implements C
* @return array containing the successive transforms that
* were concatenated with the original one.
*/
- public TransformStackElement[] getTransformStack(){
+ public TransformStackElement[] getTransformStack() {
TransformStackElement[] stack = new TransformStackElement[transformStack.size()];
transformStack.toArray(stack);
return stack;
@@ -737,7 +737,7 @@ public class GraphicContext implements C
* since it was last read. Only validateTransformStack
* can override this memento
*/
- protected void invalidateTransformStack(){
+ protected void invalidateTransformStack() {
transformStack.clear();
transformStackValid = false;
}
@@ -750,7 +750,7 @@ public class GraphicContext implements C
* @see #transform
* @see #setTransform
*/
- public AffineTransform getTransform(){
+ public AffineTransform getTransform() {
return new AffineTransform(transform);
}
@@ -762,7 +762,7 @@ public class GraphicContext implements C
* @see #setPaint
* @see java.awt.Graphics#setColor
*/
- public Paint getPaint(){
+ public Paint getPaint() {
return paint;
}
@@ -774,7 +774,7 @@ public class GraphicContext implements C
* which defines a compositing style.
* @see #setComposite
*/
- public Composite getComposite(){
+ public Composite getComposite() {
return composite;
}
@@ -794,8 +794,8 @@ public class GraphicContext implements C
* @see #getBackground
* @see java.awt.Graphics#clearRect
*/
- public void setBackground(Color color){
- if(color == null) {
+ public void setBackground(Color color) {
+ if (color == null) {
return;
}
@@ -809,7 +809,7 @@ public class GraphicContext implements C
* which defines the background color.
* @see #setBackground
*/
- public Color getBackground(){
+ public Color getBackground() {
return background;
}
@@ -820,7 +820,7 @@ public class GraphicContext implements C
* which defines the line style.
* @see #setStroke
*/
- public Stroke getStroke(){
+ public Stroke getStroke() {
return stroke;
}
@@ -844,7 +844,7 @@ public class GraphicContext implements C
* <code>Clip</code>. If <code>s</code> is <code>null</code>,
* this method clears the current <code>Clip</code>.
*/
- public void clip(Shape s){
+ public void clip(Shape s) {
if (s != null) {
s = transform.createTransformedShape(s);
}
@@ -879,26 +879,26 @@ public class GraphicContext implements C
* @see java.awt.font.TextLayout
* @since JDK1.2
*/
- public FontRenderContext getFontRenderContext(){
+ public FontRenderContext getFontRenderContext() {
//
// Find if antialiasing should be used.
//
Object antialiasingHint = hints.get(RenderingHints.KEY_TEXT_ANTIALIASING);
boolean isAntialiased = true;
- if(antialiasingHint != RenderingHints.VALUE_TEXT_ANTIALIAS_ON &&
- antialiasingHint != RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT){
+ if (antialiasingHint != RenderingHints.VALUE_TEXT_ANTIALIAS_ON &&
+ antialiasingHint != RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT) {
// If antialias was not turned off, then use the general rendering
// hint.
- if(antialiasingHint != RenderingHints.VALUE_TEXT_ANTIALIAS_OFF){
+ if (antialiasingHint != RenderingHints.VALUE_TEXT_ANTIALIAS_OFF) {
antialiasingHint = hints.get(RenderingHints.KEY_ANTIALIASING);
// Test general hint
- if(antialiasingHint != RenderingHints.VALUE_ANTIALIAS_ON &&
- antialiasingHint != RenderingHints.VALUE_ANTIALIAS_DEFAULT){
+ if (antialiasingHint != RenderingHints.VALUE_ANTIALIAS_ON &&
+ antialiasingHint != RenderingHints.VALUE_ANTIALIAS_DEFAULT) {
// Antialiasing was not requested. However, if it was not turned
// off explicitly, use it.
- if(antialiasingHint == RenderingHints.VALUE_ANTIALIAS_OFF) {
+ if (antialiasingHint == RenderingHints.VALUE_ANTIALIAS_OFF) {
isAntialiased = false;
}
}
@@ -912,7 +912,7 @@ public class GraphicContext implements C
// Find out whether fractional metrics should be used.
//
boolean useFractionalMetrics = true;
- if(hints.get(RenderingHints.KEY_FRACTIONALMETRICS)
+ if (hints.get(RenderingHints.KEY_FRACTIONALMETRICS)
== RenderingHints.VALUE_FRACTIONALMETRICS_OFF) {
useFractionalMetrics = false;
}
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=1567277&r1=1567276&r2=1567277&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:33:57 2014
@@ -35,7 +35,7 @@ import java.awt.geom.AffineTransform;
*
* Originally authored by Vincent Hardy and Paul Evenblij.
*/
-public abstract class TransformStackElement implements Cloneable{
+public abstract class TransformStackElement implements Cloneable {
/**
* Transform type
@@ -52,7 +52,7 @@ public abstract class TransformStackElem
* @param transformParameters parameters for transform
*/
protected TransformStackElement(TransformType type,
- double[] transformParameters){
+ double[] transformParameters) {
this.type = type;
this.transformParameters = transformParameters;
}
@@ -66,7 +66,7 @@ public abstract class TransformStackElem
// start with a shallow copy to get our implementations right
try {
newElement = (TransformStackElement) super.clone();
- } catch(java.lang.CloneNotSupportedException ex) {}
+ } catch (java.lang.CloneNotSupportedException ex) { }
// now deep copy the parameter array
double[] transformParameters = new double[this.transformParameters.length];
@@ -80,7 +80,7 @@ public abstract class TransformStackElem
*/
public static TransformStackElement createTranslateElement(double tx,
- double ty){
+ double ty) {
return new TransformStackElement(TransformType.TRANSLATE,
new double[]{ tx, ty }) {
boolean isIdentity(double[] parameters) {
@@ -89,7 +89,7 @@ public abstract class TransformStackElem
};
}
- public static TransformStackElement createRotateElement(double theta){
+ public static TransformStackElement createRotateElement(double theta) {
return new TransformStackElement(TransformType.ROTATE,
new double[]{ theta }) {
boolean isIdentity(double[] parameters) {
@@ -99,7 +99,7 @@ public abstract class TransformStackElem
}
public static TransformStackElement createScaleElement(double scaleX,
- double scaleY){
+ double scaleY) {
return new TransformStackElement(TransformType.SCALE,
new double[]{ scaleX, scaleY }) {
boolean isIdentity(double[] parameters) {
@@ -109,7 +109,7 @@ public abstract class TransformStackElem
}
public static TransformStackElement createShearElement(double shearX,
- double shearY){
+ double shearY) {
return new TransformStackElement(TransformType.SHEAR,
new double[]{ shearX, shearY }) {
boolean isIdentity(double[] parameters) {
@@ -119,7 +119,7 @@ public abstract class TransformStackElem
}
public static TransformStackElement createGeneralTransformElement
- (AffineTransform txf){
+ (AffineTransform txf) {
double[] matrix = new double[6];
txf.getMatrix(matrix);
return new TransformStackElement(TransformType.GENERAL, matrix) {
@@ -146,14 +146,14 @@ public abstract class TransformStackElem
/**
* @return array of values containing this transform element's parameters
*/
- public double[] getTransformParameters(){
+ public double[] getTransformParameters() {
return transformParameters;
}
/**
* @return this transform type
*/
- public TransformType getType(){
+ public TransformType getType() {
return type;
}
@@ -168,12 +168,12 @@ public abstract class TransformStackElem
* @return true if the input stackElement was concatenated with
* this one. False otherwise.
*/
- public boolean concatenate(TransformStackElement stackElement){
+ public boolean concatenate(TransformStackElement stackElement) {
boolean canConcatenate = false;
- if(type.toInt() == stackElement.type.toInt()){
+ if (type.toInt() == stackElement.type.toInt()) {
canConcatenate = true;
- switch(type.toInt()){
+ switch(type.toInt()) {
case TransformType.TRANSFORM_TRANSLATE:
transformParameters[0] += stackElement.transformParameters[0];
transformParameters[1] += stackElement.transformParameters[1];
Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/TransformType.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/TransformType.java?rev=1567277&r1=1567276&r2=1567277&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/TransformType.java (original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/java2d/TransformType.java Tue Feb 11 18:33:57 2014
@@ -27,7 +27,7 @@ package org.apache.xmlgraphics.java2d;
* @version $Id$
* Originally authored by Vincent Hardy.
*/
-public final class TransformType{
+public final class TransformType {
/*
* Transform type constants
*/
@@ -63,7 +63,7 @@ public final class TransformType{
* the ones in the enumeration can be created.
* @see #readResolve
*/
- private TransformType(int val, String desc){
+ private TransformType(int val, String desc) {
this.desc = desc;
this.val = val;
}
@@ -71,7 +71,7 @@ public final class TransformType{
/**
* @return description
*/
- public String toString(){
+ public String toString() {
return desc;
}
@@ -85,7 +85,7 @@ public final class TransformType{
* case TransformType.TRANSFORM_ROTATE:
* </pre>
*/
- public int toInt(){
+ public int toInt() {
return val;
}
@@ -95,7 +95,7 @@ public final class TransformType{
* is replaced by its static equivalent
*/
public Object readResolve() {
- switch(val){
+ switch(val) {
case TRANSFORM_TRANSLATE:
return TransformType.TRANSLATE;
case TRANSFORM_ROTATE:
Modified: xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/util/io/Base64DecodeStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/util/io/Base64DecodeStream.java?rev=1567277&r1=1567276&r2=1567277&view=diff
==============================================================================
--- xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/util/io/Base64DecodeStream.java (original)
+++ xmlgraphics/commons/branches/Temp_Checkstyle/src/java/org/apache/xmlgraphics/util/io/Base64DecodeStream.java Tue Feb 11 18:33:57 2014
@@ -64,18 +64,18 @@ public class Base64DecodeStream extends
private static final byte[] pem_array = new byte[256];
static {
- for (int i=0; i<pem_array.length; i++)
+ for (int i = 0; i < pem_array.length; i++)
pem_array[i] = -1;
int idx = 0;
- for (char c='A'; c<='Z'; c++) {
+ for (char c = 'A'; c <= 'Z'; c++) {
pem_array[c] = (byte)idx++;
}
- for (char c='a'; c<='z'; c++) {
+ for (char c = 'a'; c <= 'z'; c++) {
pem_array[c] = (byte)idx++;
}
- for (char c='0'; c<='9'; c++) {
+ for (char c = '0'; c <= '9'; c++) {
pem_array[c] = (byte)idx++;
}
@@ -92,7 +92,7 @@ public class Base64DecodeStream extends
public int available()
throws IOException {
- return 3-out_offset;
+ return 3 - out_offset;
}
byte[] decode_buffer = new byte[4];
@@ -109,7 +109,7 @@ public class Base64DecodeStream extends
}
}
- return ((int)out_buffer[out_offset++])&0xFF;
+ return ((int)out_buffer[out_offset++]) & 0xFF;
}
public int read(byte []out, int offset, int len)
@@ -125,7 +125,7 @@ public class Base64DecodeStream extends
}
}
- out[offset+idx] = out_buffer[out_offset++];
+ out[offset + idx] = out_buffer[out_offset++];
idx++;
}
@@ -136,13 +136,13 @@ public class Base64DecodeStream extends
int count, a, b, c, d;
int off = 0;
- while(off != 4) {
- count = src.read(decode_buffer, off, 4-off);
+ while (off != 4) {
+ count = src.read(decode_buffer, off, 4 - off);
if (count == -1)
return true;
- int in=off, out=off;
- while(in < off+count) {
+ int in = off, out = off;
+ while (in < off + count) {
if ((decode_buffer[in] != '\n') &&
(decode_buffer[in] != '\r') &&
(decode_buffer[in] != ' '))
@@ -153,29 +153,29 @@ public class Base64DecodeStream extends
off = out;
}
- a = pem_array[((int)decode_buffer[0])&0xFF];
- b = pem_array[((int)decode_buffer[1])&0xFF];
- c = pem_array[((int)decode_buffer[2])&0xFF];
- d = pem_array[((int)decode_buffer[3])&0xFF];
-
- out_buffer[0] = (byte)((a<<2) | (b>>>4));
- out_buffer[1] = (byte)((b<<4) | (c>>>2));
- out_buffer[2] = (byte)((c<<6) | d );
+ a = pem_array[((int)decode_buffer[0]) & 0xFF];
+ b = pem_array[((int)decode_buffer[1]) & 0xFF];
+ c = pem_array[((int)decode_buffer[2]) & 0xFF];
+ d = pem_array[((int)decode_buffer[3]) & 0xFF];
+
+ out_buffer[0] = (byte)((a << 2) | (b >>> 4));
+ out_buffer[1] = (byte)((b << 4) | (c >>> 2));
+ out_buffer[2] = (byte)((c << 6) | d );
if (decode_buffer[3] != '=') {
// All three bytes are good.
- out_offset=0;
+ out_offset = 0;
} else if (decode_buffer[2] == '=') {
// Only one byte of output.
out_buffer[2] = out_buffer[0];
out_offset = 2;
- EOF=true;
+ EOF = true;
} else {
// Only two bytes of output.
out_buffer[2] = out_buffer[1];
out_buffer[1] = out_buffer[0];
out_offset = 1;
- EOF=true;
+ EOF = true;
}
return false;
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=1567277&r1=1567276&r2=1567277&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:33:57 2014
@@ -82,7 +82,7 @@ public class Base64EncodeStream extends
out.flush();
if (closeOutOnClose)
out.close();
- out=null;
+ out = null;
}
}
@@ -161,7 +161,7 @@ public class Base64EncodeStream extends
* padding characters.
*/
void encodeFromArray(byte[] data, int offset, int len)
- throws IOException{
+ throws IOException {
byte a, b, c;
if (len == 0)
return;
@@ -185,7 +185,7 @@ public class Base64EncodeStream extends
encodeAtom();
}
- while (len >=3) {
+ while (len >= 3) {
a = data[offset++];
b = data[offset++];
c = data[offset++];
@@ -202,7 +202,7 @@ public class Base64EncodeStream extends
lineLen = 0;
}
- len -=3;
+ len -= 3;
}
switch (len) {
@@ -211,7 +211,7 @@ public class Base64EncodeStream extends
break;
case 2:
atom[0] = data[offset];
- atom[1] = data[offset+1];
+ atom[1] = data[offset + 1];
break;
default:
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org